iliaa           Tue May  9 22:00:08 2006 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src/sapi/cgi   fastcgi.c 
    /php-src    NEWS 
  Log:
  Fixed bug #37376 (fastcgi.c compile fail with gcc 2.95.4).
  
  
http://cvs.php.net/viewcvs.cgi/php-src/sapi/cgi/fastcgi.c?r1=1.4.2.13&r2=1.4.2.13.2.1&diff_format=u
Index: php-src/sapi/cgi/fastcgi.c
diff -u php-src/sapi/cgi/fastcgi.c:1.4.2.13 
php-src/sapi/cgi/fastcgi.c:1.4.2.13.2.1
--- php-src/sapi/cgi/fastcgi.c:1.4.2.13 Fri May  5 07:05:34 2006
+++ php-src/sapi/cgi/fastcgi.c  Tue May  9 22:00:08 2006
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: fastcgi.c,v 1.4.2.13 2006/05/05 07:05:34 dmitry Exp $ */
+/* $Id: fastcgi.c,v 1.4.2.13.2.1 2006/05/09 22:00:08 iliaa Exp $ */
 
 #include "fastcgi.h"
 #include "php.h"
@@ -669,12 +669,14 @@
                                }
                                FCGI_UNLOCK(req->listen_socket);
 #else
-                               sa_t sa;
-                               socklen_t len = sizeof(sa);
-
-                               FCGI_LOCK(req->listen_socket);
-                               req->fd = accept(req->listen_socket, (struct 
sockaddr *)&sa, &len);
-                               FCGI_UNLOCK(req->listen_socket);
+                               {
+                                       sa_t sa;
+                                       socklen_t len = sizeof(sa);
+
+                                       FCGI_LOCK(req->listen_socket);
+                                       req->fd = accept(req->listen_socket, 
(struct sockaddr *)&sa, &len);
+                                       FCGI_UNLOCK(req->listen_socket);
+                               }
 #endif
 
                                if (req->fd < 0 && (in_shutdown || errno != 
EINTR)) {
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.547.2.6&r2=1.2027.2.547.2.7&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.6 php-src/NEWS:1.2027.2.547.2.7
--- php-src/NEWS:1.2027.2.547.2.6       Tue May  9 19:37:00 2006
+++ php-src/NEWS        Tue May  9 22:00:08 2006
@@ -6,6 +6,7 @@
 - Added support for Apache 2.2 handler in the Windows distro. (Edin)
 - Added pg_field_table() function. (Edin)
 - Add implementation of curl_multi_info_read (Brian)
+- Fixed bug #37376 (fastcgi.c compile fail with gcc 2.95.4). (Ilia)
 - Fixed bug #37348 (make PEAR install ignore open_basedir). (Ilia)
 - Fixed bug #37313 (sigemptyset() used without including <signal.h>).
   (jdolecek)

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

Reply via email to