dmitry          Mon Sep 11 07:22:40 2006 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src/sapi/cgi   fastcgi.c 
  Log:
  Don't try to do safe connection close in case of FastCGI protocol error
  
  
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/fastcgi.c?r1=1.4.2.13.2.8&r2=1.4.2.13.2.9&diff_format=u
Index: php-src/sapi/cgi/fastcgi.c
diff -u php-src/sapi/cgi/fastcgi.c:1.4.2.13.2.8 
php-src/sapi/cgi/fastcgi.c:1.4.2.13.2.9
--- php-src/sapi/cgi/fastcgi.c:1.4.2.13.2.8     Mon Sep  4 07:26:48 2006
+++ php-src/sapi/cgi/fastcgi.c  Mon Sep 11 07:22:40 2006
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: fastcgi.c,v 1.4.2.13.2.8 2006/09/04 07:26:48 dmitry Exp $ */
+/* $Id: fastcgi.c,v 1.4.2.13.2.9 2006/09/11 07:22:40 dmitry Exp $ */
 
 #include "php.h"
 #include "fastcgi.h"
@@ -611,10 +611,12 @@
                        RevertToSelf();
                }
 #else
-               char buf[8];
+               if (!force) {
+                       char buf[8];
 
-               shutdown(req->fd, 1);
-               while (recv(req->fd, buf, sizeof(buf), 0) > 0) {}
+                       shutdown(req->fd, 1);
+                       while (recv(req->fd, buf, sizeof(buf), 0) > 0) {}
+               }
                close(req->fd);
 #endif
                req->fd = -1;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to