jani Wed Jul 16 14:08:38 2008 UTC Added files: (Branch: PHP_5_3) /php-src/ext/sockets/tests unixloop.phpt
Modified files: /php-src/ext/sockets sockets.c /php-src/ext/sockets/tests ipv4loop.phpt ipv6loop.phpt /php-src/main/streams xp_socket.c Log: MFH:- Fixed bug #44127 (UNIX abstract namespace socket connect does not work) http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/sockets.c?r1=1.171.2.9.2.14.2.4&r2=1.171.2.9.2.14.2.5&diff_format=u Index: php-src/ext/sockets/sockets.c diff -u php-src/ext/sockets/sockets.c:1.171.2.9.2.14.2.4 php-src/ext/sockets/sockets.c:1.171.2.9.2.14.2.5 --- php-src/ext/sockets/sockets.c:1.171.2.9.2.14.2.4 Fri Jul 4 14:08:16 2008 +++ php-src/ext/sockets/sockets.c Wed Jul 16 14:08:38 2008 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sockets.c,v 1.171.2.9.2.14.2.4 2008/07/04 14:08:16 felipe Exp $ */ +/* $Id: sockets.c,v 1.171.2.9.2.14.2.5 2008/07/16 14:08:38 jani Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1328,8 +1328,8 @@ memset(&s_un, 0, sizeof(struct sockaddr_un)); s_un.sun_family = AF_UNIX; - snprintf(s_un.sun_path, 108, "%s", addr); - retval = connect(php_sock->bsd_socket, (struct sockaddr *) &s_un, SUN_LEN(&s_un)); + memcpy(&s_un.sun_path, addr, addr_len); + retval = connect(php_sock->bsd_socket, (struct sockaddr *) &s_un, (socklen_t) XtOffsetOf(struct sockaddr_un, sun_path) + addr_len); break; default: http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/tests/ipv4loop.phpt?r1=1.1&r2=1.1.8.1&diff_format=u Index: php-src/ext/sockets/tests/ipv4loop.phpt diff -u php-src/ext/sockets/tests/ipv4loop.phpt:1.1 php-src/ext/sockets/tests/ipv4loop.phpt:1.1.8.1 --- php-src/ext/sockets/tests/ipv4loop.phpt:1.1 Thu Apr 17 23:09:17 2003 +++ php-src/ext/sockets/tests/ipv4loop.phpt Wed Jul 16 14:08:38 2008 @@ -3,7 +3,7 @@ --SKIPIF-- <?php if (!extension_loaded('sockets')) { - die('skip sockets extenion not available.'); + die('skip sockets extension not available.'); } ?> --FILE-- http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/tests/ipv6loop.phpt?r1=1.2.6.1&r2=1.2.6.1.2.1&diff_format=u Index: php-src/ext/sockets/tests/ipv6loop.phpt diff -u php-src/ext/sockets/tests/ipv6loop.phpt:1.2.6.1 php-src/ext/sockets/tests/ipv6loop.phpt:1.2.6.1.2.1 --- php-src/ext/sockets/tests/ipv6loop.phpt:1.2.6.1 Mon Feb 12 14:49:04 2007 +++ php-src/ext/sockets/tests/ipv6loop.phpt Wed Jul 16 14:08:38 2008 @@ -3,7 +3,7 @@ --SKIPIF-- <?php if (!extension_loaded('sockets')) { - die('skip sockets extenion not available.'); + die('skip sockets extension not available.'); } if (!defined("AF_INET6")) { die('skip no IPv6 support'); http://cvs.php.net/viewvc.cgi/php-src/main/streams/xp_socket.c?r1=1.33.2.2.2.6.2.4&r2=1.33.2.2.2.6.2.5&diff_format=u Index: php-src/main/streams/xp_socket.c diff -u php-src/main/streams/xp_socket.c:1.33.2.2.2.6.2.4 php-src/main/streams/xp_socket.c:1.33.2.2.2.6.2.5 --- php-src/main/streams/xp_socket.c:1.33.2.2.2.6.2.4 Fri Jul 11 10:25:15 2008 +++ php-src/main/streams/xp_socket.c Wed Jul 16 14:08:38 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xp_socket.c,v 1.33.2.2.2.6.2.4 2008/07/11 10:25:15 tony2001 Exp $ */ +/* $Id: xp_socket.c,v 1.33.2.2.2.6.2.5 2008/07/16 14:08:38 jani Exp $ */ #include "php.h" #include "ext/standard/file.h" @@ -621,7 +621,7 @@ parse_unix_address(xparam, &unix_addr TSRMLS_CC); ret = php_network_connect_socket(sock->socket, - (const struct sockaddr *)&unix_addr, (socklen_t)sizeof(unix_addr), + (const struct sockaddr *)&unix_addr, (socklen_t) XtOffsetOf(struct sockaddr_un, sun_path) + xparam->inputs.namelen, xparam->op == STREAM_XPORT_OP_CONNECT_ASYNC, xparam->inputs.timeout, xparam->want_errortext ? &xparam->outputs.error_text : NULL, &err); http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/tests/unixloop.phpt?view=markup&rev=1.1 Index: php-src/ext/sockets/tests/unixloop.phpt +++ php-src/ext/sockets/tests/unixloop.phpt -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php