Fixed bug #37376 (fastcgi.c compile fail with gcc 2.95.4).

php · May 9, 2006 · 5718445 · 5718445
1 parent 5a8b4e7
commit 5718445
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/NEWS b/NEWS
@@ -6,6 +6,7 @@ PHP                                                                        NEWS
 - 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)

diff --git a/sapi/cgi/fastcgi.c b/sapi/cgi/fastcgi.c
@@ -669,12 +669,14 @@ int fcgi_accept_request(fcgi_request *req)
 				}
 				FCGI_UNLOCK(req->listen_socket);
 #else
-				sa_t sa;
-				socklen_t len = sizeof(sa);
+				{
+					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);
+					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)) {