Skip to content
Snippets Groups Projects
Commit a3523870 authored by Henrik (Grubba) Grubbström's avatar Henrik (Grubba) Grubbström
Browse files

Applied socketpair_ultra fix from Pike 0.6.

Rev: src/modules/files/file.c:1.65
parent 420cd8a0
No related branches found
No related tags found
No related merge requests found
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#define READ_BUFFER 8192 #define READ_BUFFER 8192
#include "global.h" #include "global.h"
RCSID("$Id: file.c,v 1.64 1998/06/09 17:14:02 grubba Exp $"); RCSID("$Id: file.c,v 1.65 1998/07/21 17:13:28 grubba Exp $");
#include "interpret.h" #include "interpret.h"
#include "svalue.h" #include "svalue.h"
#include "stralloc.h" #include "stralloc.h"
...@@ -1087,14 +1087,14 @@ retry_connect: ...@@ -1087,14 +1087,14 @@ retry_connect:
retry_accept: retry_accept:
sv[0]=accept(fd,(struct sockaddr *)&addr,&len); sv[0]=accept(fd,(struct sockaddr *)&addr,&len);
set_nonblocking(sv[0],0);
if(sv[0] < 0) { if(sv[0] < 0) {
if(errno==EINTR) goto retry_accept; if(errno==EINTR) goto retry_accept;
close(sv[1]); close(sv[1]);
return -1; return -1;
} }
set_nonblocking(sv[0],0);
/* We do not trust accept */ /* We do not trust accept */
len=sizeof(addr); len=sizeof(addr);
if(getpeername(sv[0], (struct sockaddr *)&addr,&len)) return -1; if(getpeername(sv[0], (struct sockaddr *)&addr,&len)) return -1;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment