dmitry Tue Apr 18 06:59:19 2006 UTC
Modified files: (Branch: PHP_5_1)
/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.4.2.5&r2=1.4.2.6&diff_format=u
Index: php-src/sapi/cgi/fastcgi.c
diff -u php-src/sapi/cgi/fastcgi.c:1.4.2.5 php-src/sapi/cgi/fastcgi.c:1.4.2.6
--- php-src/sapi/cgi/fastcgi.c:1.4.2.5 Sun Feb 26 10:49:50 2006
+++ php-src/sapi/cgi/fastcgi.c Tue Apr 18 06:59:19 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: fastcgi.c,v 1.4.2.5 2006/02/26 10:49:50 helly Exp $ */
+/* $Id: fastcgi.c,v 1.4.2.6 2006/04/18 06:59:19 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);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
