jani Wed Jul 16 14:08:04 2008 UTC
Modified files:
/php-src/ext/phar config.m4
/php-src/ext/sockets sockets.c
/php-src/ext/sockets/tests ipv4loop.phpt ipv6loop.phpt
/php-src/main/streams xp_socket.c
Log:
- Fixed bug #44127 (UNIX abstract namespace socket connect does not work)
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/config.m4?r1=1.28&r2=1.29&diff_format=u
Index: php-src/ext/phar/config.m4
diff -u php-src/ext/phar/config.m4:1.28 php-src/ext/phar/config.m4:1.29
--- php-src/ext/phar/config.m4:1.28 Sat May 17 20:07:38 2008
+++ php-src/ext/phar/config.m4 Wed Jul 16 14:08:02 2008
@@ -1,8 +1,8 @@
-dnl $Id: config.m4,v 1.28 2008/05/17 20:07:38 cellog Exp $
+dnl $Id: config.m4,v 1.29 2008/07/16 14:08:02 jani Exp $
dnl config.m4 for extension phar
PHP_ARG_ENABLE(phar, for phar archive support,
-[ --enable-phar Enable phar support])
+[ --disable-phar Disable phar support], yes)
if test "$PHP_PHAR" != "no"; then
PHP_NEW_EXTENSION(phar, util.c tar.c zip.c stream.c func_interceptors.c
dirstream.c phar.c phar_object.c phar_path_check.c, $ext_shared)
http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/sockets.c?r1=1.198&r2=1.199&diff_format=u
Index: php-src/ext/sockets/sockets.c
diff -u php-src/ext/sockets/sockets.c:1.198 php-src/ext/sockets/sockets.c:1.199
--- php-src/ext/sockets/sockets.c:1.198 Fri Jul 4 14:10:24 2008
+++ php-src/ext/sockets/sockets.c Wed Jul 16 14:08:04 2008
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sockets.c,v 1.198 2008/07/04 14:10:24 felipe Exp $ */
+/* $Id: sockets.c,v 1.199 2008/07/16 14:08:04 jani Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1318,8 +1318,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.2&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.2
--- 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:04 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.3&r2=1.4&diff_format=u
Index: php-src/ext/sockets/tests/ipv6loop.phpt
diff -u php-src/ext/sockets/tests/ipv6loop.phpt:1.3
php-src/ext/sockets/tests/ipv6loop.phpt:1.4
--- php-src/ext/sockets/tests/ipv6loop.phpt:1.3 Mon Feb 12 14:48:52 2007
+++ php-src/ext/sockets/tests/ipv6loop.phpt Wed Jul 16 14:08:04 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.46&r2=1.47&diff_format=u
Index: php-src/main/streams/xp_socket.c
diff -u php-src/main/streams/xp_socket.c:1.46
php-src/main/streams/xp_socket.c:1.47
--- php-src/main/streams/xp_socket.c:1.46 Fri Jul 11 10:24:29 2008
+++ php-src/main/streams/xp_socket.c Wed Jul 16 14:08:04 2008
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: xp_socket.c,v 1.46 2008/07/11 10:24:29 tony2001 Exp $ */
+/* $Id: xp_socket.c,v 1.47 2008/07/16 14:08:04 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);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
