kalle Thu Jan 1 05:22:55 2009 UTC
Modified files:
/php-src/ext/sockets php_sockets.h sockets.c
Log:
Renable socket_create_pair() on Windows
# ext/sockets have its own implementation of socketpair(), perhaps we should
move it
# to the core. This will make stream_socket_pair() available on Windows aswell
http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/php_sockets.h?r1=1.45&r2=1.46&diff_format=u
Index: php-src/ext/sockets/php_sockets.h
diff -u php-src/ext/sockets/php_sockets.h:1.45
php-src/ext/sockets/php_sockets.h:1.46
--- php-src/ext/sockets/php_sockets.h:1.45 Wed Dec 31 11:12:36 2008
+++ php-src/ext/sockets/php_sockets.h Thu Jan 1 05:22:54 2009
@@ -22,7 +22,7 @@
#ifndef PHP_SOCKETS_H
#define PHP_SOCKETS_H
-/* $Id: php_sockets.h,v 1.45 2008/12/31 11:12:36 sebastian Exp $ */
+/* $Id: php_sockets.h,v 1.46 2009/01/01 05:22:54 kalle Exp $ */
#if HAVE_SOCKETS
@@ -43,7 +43,7 @@
PHP_FUNCTION(socket_select);
PHP_FUNCTION(socket_create_listen);
-#ifdef HAVE_SOCKETPAIR
+#if defined(HAVE_SOCKETPAIR) || defined(PHP_WIN32)
PHP_FUNCTION(socket_create_pair);
#endif
PHP_FUNCTION(socket_accept);
http://cvs.php.net/viewvc.cgi/php-src/ext/sockets/sockets.c?r1=1.206&r2=1.207&diff_format=u
Index: php-src/ext/sockets/sockets.c
diff -u php-src/ext/sockets/sockets.c:1.206 php-src/ext/sockets/sockets.c:1.207
--- php-src/ext/sockets/sockets.c:1.206 Wed Dec 31 11:12:36 2008
+++ php-src/ext/sockets/sockets.c Thu Jan 1 05:22:54 2009
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sockets.c,v 1.206 2008/12/31 11:12:36 sebastian Exp $ */
+/* $Id: sockets.c,v 1.207 2009/01/01 05:22:54 kalle Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -223,7 +223,7 @@
ZEND_ARG_INFO(0, optval)
ZEND_END_ARG_INFO()
-#ifdef HAVE_SOCKETPAIR
+#if defined(HAVE_SOCKETPAIR) || defined(PHP_WIN32)
ZEND_BEGIN_ARG_INFO_EX(arginfo_socket_create_pair, 0, 0, 4)
ZEND_ARG_INFO(0, domain)
ZEND_ARG_INFO(0, type)
@@ -254,7 +254,7 @@
PHP_FE(socket_select, arginfo_socket_select)
PHP_FE(socket_create, arginfo_socket_create)
PHP_FE(socket_create_listen, arginfo_socket_create_listen)
-#ifdef HAVE_SOCKETPAIR
+#if defined(HAVE_SOCKETPAIR) || defined(PHP_WIN32)
PHP_FE(socket_create_pair, arginfo_socket_create_pair)
#endif
PHP_FE(socket_accept, arginfo_socket_accept)
@@ -1857,7 +1857,7 @@
}
/* }}} */
-#ifdef HAVE_SOCKETPAIR
+#if defined(HAVE_SOCKETPAIR) || defined(PHP_WIN32)
/* {{{ proto bool socket_create_pair(int domain, int type, int protocol, array
&fd) U
Creates a pair of indistinguishable sockets and stores them in fds. */
PHP_FUNCTION(socket_create_pair)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
