Integrate mainline.

p4raw-id: //depot/perlio@7859

1 files changed, 5 insertions, 1 deletions

diff --git a/perlio.c b/perlio.c
index 5674674bde..65b2358382 100644
--- a/perlio.c
+++ b/perlio.c
@@ -1449,8 +1449,12 @@ PerlIOStdio_tell(PerlIO *f)
 IV
 PerlIOStdio_close(PerlIO *f)
 {
+ int optval, optlen = sizeof(int);
  FILE *stdio = PerlIOSelf(f,PerlIOStdio)->stdio;
- return fclose(stdio);
+ return(
+   (getsockopt(PerlIO_fileno(f), SOL_SOCKET, SO_TYPE, (char *)&optval, &optlen) < 0) ? 
+       fclose(stdio) :
+       close(PerlIO_fileno(f)));
 }
 
 IV