summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Clark <nick@ccl4.org>2001-03-03 21:41:33 +0000
committerJarkko Hietaniemi <jhi@iki.fi>2001-03-04 19:46:45 +0000
commit405b39414254316617f9eff6eba0472cb6c4cb70 (patch)
tree8589cc96c5f793f220f88eef0c5d87ec9888a5d4
parent185383183fe043d79004d6487b595ae089bb7b9e (diff)
downloadperl-405b39414254316617f9eff6eba0472cb6c4cb70.tar.gz
[ID 20010303.009] SOCKS5 work around breaks other sockets
Message-Id: <E14ZJmP-0000mE-00@Bagpuss.unfortu.net> Revert the workaround. p4raw-id: //depot/perl@9023
-rw-r--r--perlio.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/perlio.c b/perlio.c
index 9f12be6273..c8047f80d2 100644
--- a/perlio.c
+++ b/perlio.c
@@ -1825,12 +1825,12 @@ IV
PerlIOStdio_close(PerlIO *f)
{
dTHX;
-#ifdef HAS_SOCKET
+#ifdef HAS_SOCKS5_INIT
int optval, optlen = sizeof(int);
#endif
FILE *stdio = PerlIOSelf(f,PerlIOStdio)->stdio;
return(
-#ifdef HAS_SOCKET
+#ifdef HAS_SOCKS5_INIT
(getsockopt(PerlIO_fileno(f), SOL_SOCKET, SO_TYPE, (char *)&optval, &optlen) < 0) ?
PerlSIO_fclose(stdio) :
close(PerlIO_fileno(f))