cvs: php-src /sapi/cgi fastcgi.c

dmitry Tue Apr 18 06:59:31 2006 UTC Modified files: /php-src/sapi/cgi fastcgi.c Log: Fixed SUN_LEN calculation http://cvs.php.net/viewcvs.cgi/php-src/sapi/cgi/fastcgi.c?r1=1.6&r2=1.7&diff_format=u Index: php-src/sapi/cgi/fastcgi.c diff -u php-src/sapi/cgi/fastcgi.c:1.6 php-src/sapi/cgi/fastcgi.c:1.7 --- php-src/sapi/cgi/fastcgi.c:1.6 Sat Feb 4 23:58:22 2006 +++ php-src/sapi/cgi/fastcgi.c Tue Apr 18 06:59:31 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: fastcgi.c,v 1.6 2006/02/04 23:58:22 fmk Exp $ */ +/* $Id: fastcgi.c,v 1.7 2006/04/18 06:59:31 dmitry Exp $ */ #include "fastcgi.h" #include "php.h" @@ -301,9 +301,8 @@ 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 = sizeof(sa.sa_unix.sun_family) + path_len; + sa_len = (size_t)(((struct sockaddr_un *)0)->sun_path) + path_len; #ifdef HAVE_SOCKADDR_UN_SUN_LEN - sa_len += sizeof(sa.sa_unix.sun_len) + 1; sa.sa_unix.sun_len = sa_len; #endif unlink(path);