iliaa Tue May 9 22:00:36 2006 UTC
Modified files:
/php-src/sapi/cgi fastcgi.c
Log:
MFB: 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.14&r2=1.15&diff_format=u
Index: php-src/sapi/cgi/fastcgi.c
diff -u php-src/sapi/cgi/fastcgi.c:1.14 php-src/sapi/cgi/fastcgi.c:1.15
--- php-src/sapi/cgi/fastcgi.c:1.14 Fri May 5 07:05:59 2006
+++ php-src/sapi/cgi/fastcgi.c Tue May 9 22:00:36 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: fastcgi.c,v 1.14 2006/05/05 07:05:59 dmitry Exp $ */
+/* $Id: fastcgi.c,v 1.15 2006/05/09 22:00:36 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)) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
