dmitry Wed Apr 26 17:48:27 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/sapi/cgi fastcgi.c
Log:
Revert wrong fix
http://cvs.php.net/viewcvs.cgi/php-src/sapi/cgi/fastcgi.c?r1=1.4.2.8&r2=1.4.2.9&diff_format=u
Index: php-src/sapi/cgi/fastcgi.c
diff -u php-src/sapi/cgi/fastcgi.c:1.4.2.8 php-src/sapi/cgi/fastcgi.c:1.4.2.9
--- php-src/sapi/cgi/fastcgi.c:1.4.2.8 Wed Apr 26 11:08:10 2006
+++ php-src/sapi/cgi/fastcgi.c Wed Apr 26 17:48:27 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: fastcgi.c,v 1.4.2.8 2006/04/26 11:08:10 dmitry Exp $ */
+/* $Id: fastcgi.c,v 1.4.2.9 2006/04/26 17:48:27 dmitry Exp $ */
#include "fastcgi.h"
#include "php.h"
@@ -618,12 +618,8 @@
RevertToSelf();
}
#else
-#if 1
- shutdown(req->fd, 2);
-#else
close(req->fd);
#endif
-#endif
req->fd = -1;
}
}
@@ -857,8 +853,10 @@
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;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
