summaryrefslogtreecommitdiff
path: root/sapi
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@php.net>2006-04-26 17:48:27 +0000
committerDmitry Stogov <dmitry@php.net>2006-04-26 17:48:27 +0000
commite0beb7fc717065ddca39a903cff825f48eef1bae (patch)
tree3dfb449ee7e8e59b38f07f441f53a0e420bffedb /sapi
parent0c54f6f72b75dca3c8db33da40df71a342a0bc34 (diff)
downloadphp-git-e0beb7fc717065ddca39a903cff825f48eef1bae.tar.gz
Revert wrong fix
Diffstat (limited to 'sapi')
-rw-r--r--sapi/cgi/fastcgi.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/sapi/cgi/fastcgi.c b/sapi/cgi/fastcgi.c
index afa5271d0e..152c8c1629 100644
--- a/sapi/cgi/fastcgi.c
+++ b/sapi/cgi/fastcgi.c
@@ -618,12 +618,8 @@ static inline void fcgi_close(fcgi_request *req, int force, int destroy)
RevertToSelf();
}
#else
-#if 1
- shutdown(req->fd, 2);
-#else
close(req->fd);
#endif
-#endif
req->fd = -1;
}
}
@@ -857,8 +853,10 @@ int fcgi_write(fcgi_request *req, fcgi_request_type type, const char *str, int l
int fcgi_finish_request(fcgi_request *req)
{
- fcgi_flush(req, 1);
- fcgi_close(req, 0, 1);
+ if (req->fd >= 0) {
+ fcgi_flush(req, 1);
+ fcgi_close(req, 0, 1);
+ }
return 1;
}