diff options
| author | Mark A. Hershberger <mah@debian.(none)> | 2009-03-25 00:35:48 -0400 |
|---|---|---|
| committer | Mark A. Hershberger <mah@debian.(none)> | 2009-03-25 00:35:48 -0400 |
| commit | a88a88d0986a4a32288c102cdbfebd78d7e91d99 (patch) | |
| tree | 96e2d12c750b8a77b35f14b88f79ab8fda4bc89c /sapi | |
| parent | ba50031707469046407a35b77a3cd81351e951b3 (diff) | |
| download | php-a88a88d0986a4a32288c102cdbfebd78d7e91d99.tar.gz | |
Imported Upstream version 5.1.6upstream/5.1.6
Diffstat (limited to 'sapi')
| -rw-r--r-- | sapi/cgi/fastcgi.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sapi/cgi/fastcgi.c b/sapi/cgi/fastcgi.c index 1e0a0d344..807df718d 100644 --- a/sapi/cgi/fastcgi.c +++ b/sapi/cgi/fastcgi.c @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: fastcgi.c,v 1.4.2.17 2006/06/07 14:28:26 stas Exp $ */ +/* $Id: fastcgi.c,v 1.4.2.18 2006/08/20 17:49:05 sas Exp $ */ #include "fastcgi.h" #include "php.h" @@ -258,7 +258,7 @@ int fcgi_listen(const char *path, int backlog) short port = 0; int listen_socket; sa_t sa; - socklen_t sa_len; + socklen_t sock_len; if ((s = strchr(path, ':'))) { port = atoi(s+1); @@ -274,7 +274,7 @@ int fcgi_listen(const char *path, int backlog) memset(&sa.sa_inet, 0, sizeof(sa.sa_inet)); sa.sa_inet.sin_family = AF_INET; sa.sa_inet.sin_port = htons(port); - sa_len = sizeof(sa.sa_inet); + sock_len = sizeof(sa.sa_inet); if (!*host || !strncmp(host, "*", sizeof("*")-1)) { sa.sa_inet.sin_addr.s_addr = htonl(INADDR_ANY); @@ -305,16 +305,16 @@ int fcgi_listen(const char *path, int backlog) memset(&sa.sa_unix, 0, sizeof(sa.sa_unix)); sa.sa_unix.sun_family = AF_UNIX; memcpy(sa.sa_unix.sun_path, path, path_len + 1); - sa_len = (size_t)(((struct sockaddr_un *)0)->sun_path) + path_len; + sock_len = (size_t)(((struct sockaddr_un *)0)->sun_path) + path_len; #ifdef HAVE_SOCKADDR_UN_SUN_LEN - sa.sa_unix.sun_len = sa_len; + sa.sa_unix.sun_len = sock_len; #endif unlink(path); } /* Create, bind socket and start listen on it */ if ((listen_socket = socket(sa.sa.sa_family, SOCK_STREAM, 0)) < 0 || - bind(listen_socket, (struct sockaddr *) &sa, sa_len) < 0 || + bind(listen_socket, (struct sockaddr *) &sa, sock_len) < 0 || listen(listen_socket, backlog) < 0) { fprintf(stderr, "Cannot bind/listen socket - [%d] %s.\n",errno, strerror(errno)); |