clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 10:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

MFH:

Browse Source 
[DOC] 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
This commit is contained in:
Kalle Sommer Nielsen 2009-01-01 05:24:29 +00:00
parent 455b551314
commit 2f2d910797
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -11,6 +11,7 @@ PHP NEWS
- Changed opendir(), dir() and scandir() to use default context when no context
argument is passed. (Sara)
- Changed open_basedir to allow tightening in runtime contexts. (Sara)
- Re-enabled socket_create_pair() on Windows (Kalle)
- Added json_last_error() to return any error information from json_decode().
(Scott)

2
ext/sockets/php_sockets.h
View File

@ -43,7 +43,7 @@ PHP_RSHUTDOWN_FUNCTION(sockets);
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);

6
ext/sockets/sockets.c
View File

@ -223,7 +223,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_socket_set_option, 0, 0, 4)
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 @@ const zend_function_entry sockets_functions[] = {
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)
@ -1867,7 +1867,7 @@ PHP_FUNCTION(socket_set_option)
}
/* }}} */
#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)