diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2006-08-20 18:24:11 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2006-08-20 18:24:11 +0000 |
| commit | 672da2daeb60aad0a4c08b7784146dd997a59b45 (patch) | |
| tree | 91f6109e6336ebb669a4f0ff1c64dc253e54a409 /sapi/cgi/fastcgi.c | |
| parent | 2a41a50216fe7a4e7a2197dd4af7bafabbff54be (diff) | |
| download | php-git-672da2daeb60aad0a4c08b7784146dd997a59b45.tar.gz | |
MFH: sa_len compile fix for IRIX
# Patch by Sascha
Diffstat (limited to 'sapi/cgi/fastcgi.c')
| -rw-r--r-- | sapi/cgi/fastcgi.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sapi/cgi/fastcgi.c b/sapi/cgi/fastcgi.c index 15bceb93be..2427af15f7 100644 --- a/sapi/cgi/fastcgi.c +++ b/sapi/cgi/fastcgi.c @@ -252,7 +252,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); @@ -268,7 +268,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); @@ -299,16 +299,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)); |