mattwil         Sun Dec  7 10:55:47 2008 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src    NEWS 
    /php-src/sapi/cgi   fastcgi.c 
  Log:
  MFH: Fixed bug #46782 (fastcgi.c parse error)
  
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1348&r2=1.2027.2.547.2.1349&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1348 php-src/NEWS:1.2027.2.547.2.1349
--- php-src/NEWS:1.2027.2.547.2.1348    Thu Dec  4 13:17:28 2008
+++ php-src/NEWS        Sun Dec  7 10:55:47 2008
@@ -1,6 +1,7 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2009, PHP 5.2.8
+- Fixed bug #46782 (fastcgi.c parse error). (Matt)
 - Fixed bug #46739 (array returned by curl_getinfo should contain content_type 
key). 
   (Mikko)
 
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/fastcgi.c?r1=1.4.2.13.2.32&r2=1.4.2.13.2.33&diff_format=u
Index: php-src/sapi/cgi/fastcgi.c
diff -u php-src/sapi/cgi/fastcgi.c:1.4.2.13.2.32 
php-src/sapi/cgi/fastcgi.c:1.4.2.13.2.33
--- php-src/sapi/cgi/fastcgi.c:1.4.2.13.2.32    Tue Oct 21 16:43:59 2008
+++ php-src/sapi/cgi/fastcgi.c  Sun Dec  7 10:55:47 2008
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: fastcgi.c,v 1.4.2.13.2.32 2008/10/21 16:43:59 lbarnaud Exp $ */
+/* $Id: fastcgi.c,v 1.4.2.13.2.33 2008/12/07 10:55:47 mattwil Exp $ */
 
 #include "php.h"
 #include "fastcgi.h"
@@ -183,8 +183,14 @@
 int fcgi_init(void)
 {
        if (!is_initialized) {
+#ifndef _WIN32
+               sa_t sa;
+               socklen_t len = sizeof(sa);
+#endif
                zend_hash_init(&fcgi_mgmt_vars, 0, NULL, fcgi_free_mgmt_var_cb, 
1);
                fcgi_set_mgmt_var("FCGI_MPXS_CONNS", 
sizeof("FCGI_MPXS_CONNS")-1, "0", sizeof("0")-1);
+
+               is_initialized = 1;
 #ifdef _WIN32
 # if 0
                /* TODO: Support for TCP sockets */
@@ -195,8 +201,6 @@
                        return 0;
                }
 # endif
-               is_initialized = 1;
-
                if ((GetStdHandle(STD_OUTPUT_HANDLE) == INVALID_HANDLE_VALUE) &&
                    (GetStdHandle(STD_ERROR_HANDLE)  == INVALID_HANDLE_VALUE) &&
                    (GetStdHandle(STD_INPUT_HANDLE)  != INVALID_HANDLE_VALUE)) {
@@ -223,10 +227,6 @@
                        return is_fastcgi = 0;
                }
 #else
-               sa_t sa;
-               socklen_t len = sizeof(sa);
-
-               is_initialized = 1;
                errno = 0;
                if (getpeername(0, (struct sockaddr *)&sa, &len) != 0 && errno 
== ENOTCONN) {
                        fcgi_setup_signals();



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

Reply via email to