diff options
Diffstat (limited to 'ext/sockets/sockets.c')
| -rw-r--r-- | ext/sockets/sockets.c | 173 |
1 files changed, 91 insertions, 82 deletions
diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c index 584d98576f..8e3d37da9b 100644 --- a/ext/sockets/sockets.c +++ b/ext/sockets/sockets.c @@ -370,6 +370,9 @@ zend_module_entry sockets_module_entry = { #ifdef COMPILE_DL_SOCKETS +#ifdef ZTS + ZEND_TSRMLS_CACHE_DEFINE; +#endif ZEND_GET_MODULE(sockets) #endif @@ -398,7 +401,7 @@ PHP_SOCKETS_API php_socket *php_create_socket(void) /* {{{ */ } /* }}} */ -PHP_SOCKETS_API void php_destroy_socket(zend_resource *rsrc TSRMLS_DC) /* {{{ */ +PHP_SOCKETS_API void php_destroy_socket(zend_resource *rsrc) /* {{{ */ { php_socket *php_sock = rsrc->ptr; @@ -413,7 +416,7 @@ PHP_SOCKETS_API void php_destroy_socket(zend_resource *rsrc TSRMLS_DC) /* {{{ */ } /* }}} */ -static int php_open_listen_sock(php_socket **php_sock, int port, int backlog TSRMLS_DC) /* {{{ */ +static int php_open_listen_sock(php_socket **php_sock, int port, int backlog) /* {{{ */ { struct sockaddr_in la; struct hostent *hp; @@ -463,7 +466,7 @@ static int php_open_listen_sock(php_socket **php_sock, int port, int backlog TSR } /* }}} */ -static int php_accept_connect(php_socket *in_sock, php_socket **new_sock, struct sockaddr *la, socklen_t *la_len TSRMLS_DC) /* {{{ */ +static int php_accept_connect(php_socket *in_sock, php_socket **new_sock, struct sockaddr *la, socklen_t *la_len) /* {{{ */ { php_socket *out_sock = php_create_socket(); @@ -550,7 +553,7 @@ static int php_read(php_socket *sock, void *buf, size_t maxlen, int flags) } /* }}} */ -char *sockets_strerror(int error TSRMLS_DC) /* {{{ */ +char *sockets_strerror(int error) /* {{{ */ { const char *buf; @@ -600,6 +603,9 @@ char *sockets_strerror(int error TSRMLS_DC) /* {{{ */ /* {{{ PHP_GINIT_FUNCTION */ static PHP_GINIT_FUNCTION(sockets) { +#if defined(COMPILE_DL_SOCKETS) && defined(ZTS) + ZEND_TSRMLS_CACHE_UPDATE; +#endif sockets_globals->last_error = 0; sockets_globals->strerror_buf = NULL; } @@ -609,6 +615,9 @@ static PHP_GINIT_FUNCTION(sockets) */ static PHP_MINIT_FUNCTION(sockets) { +#if defined(COMPILE_DL_SOCKETS) && defined(ZTS) + ZEND_TSRMLS_CACHE_UPDATE; +#endif le_socket = zend_register_list_destructors_ex(php_destroy_socket, NULL, le_socket_name, module_number); REGISTER_LONG_CONSTANT("AF_UNIX", AF_UNIX, CONST_CS | CONST_PERSISTENT); @@ -763,7 +772,7 @@ static PHP_RSHUTDOWN_FUNCTION(sockets) } /* }}} */ -static int php_sock_array_to_fd_set(zval *sock_array, fd_set *fds, PHP_SOCKET *max_fd TSRMLS_DC) /* {{{ */ +static int php_sock_array_to_fd_set(zval *sock_array, fd_set *fds, PHP_SOCKET *max_fd) /* {{{ */ { zval *element; php_socket *php_sock; @@ -772,7 +781,7 @@ static int php_sock_array_to_fd_set(zval *sock_array, fd_set *fds, PHP_SOCKET *m if (Z_TYPE_P(sock_array) != IS_ARRAY) return 0; ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(sock_array), element) { - php_sock = (php_socket*) zend_fetch_resource(element TSRMLS_CC, -1, le_socket_name, NULL, 1, le_socket); + php_sock = (php_socket*) zend_fetch_resource(element, -1, le_socket_name, NULL, 1, le_socket); if (!php_sock) continue; /* If element is not a resource, skip it */ PHP_SAFE_FD_SET(php_sock->bsd_socket, fds); @@ -786,7 +795,7 @@ static int php_sock_array_to_fd_set(zval *sock_array, fd_set *fds, PHP_SOCKET *m } /* }}} */ -static int php_sock_array_from_fd_set(zval *sock_array, fd_set *fds TSRMLS_DC) /* {{{ */ +static int php_sock_array_from_fd_set(zval *sock_array, fd_set *fds) /* {{{ */ { zval *element; zval *dest_element; @@ -800,7 +809,7 @@ static int php_sock_array_from_fd_set(zval *sock_array, fd_set *fds TSRMLS_DC) / array_init(&new_hash); ZEND_HASH_FOREACH_KEY_VAL(Z_ARRVAL_P(sock_array), num_key, key, element) { - php_sock = (php_socket*) zend_fetch_resource(element TSRMLS_CC, -1, le_socket_name, NULL, 1, le_socket); + php_sock = (php_socket*) zend_fetch_resource(element, -1, le_socket_name, NULL, 1, le_socket); if (!php_sock) continue; /* If element is not a resource, skip it */ if (PHP_SAFE_FD_ISSET(php_sock->bsd_socket, fds)) { @@ -838,7 +847,7 @@ PHP_FUNCTION(socket_select) int retval, sets = 0; zend_long usec = 0; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a/!a/!a/!z!|l", &r_array, &w_array, &e_array, &sec, &usec) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "a/!a/!a/!z!|l", &r_array, &w_array, &e_array, &sec, &usec) == FAILURE) { return; } @@ -846,12 +855,12 @@ PHP_FUNCTION(socket_select) FD_ZERO(&wfds); FD_ZERO(&efds); - if (r_array != NULL) sets += php_sock_array_to_fd_set(r_array, &rfds, &max_fd TSRMLS_CC); - if (w_array != NULL) sets += php_sock_array_to_fd_set(w_array, &wfds, &max_fd TSRMLS_CC); - if (e_array != NULL) sets += php_sock_array_to_fd_set(e_array, &efds, &max_fd TSRMLS_CC); + if (r_array != NULL) sets += php_sock_array_to_fd_set(r_array, &rfds, &max_fd); + if (w_array != NULL) sets += php_sock_array_to_fd_set(w_array, &wfds, &max_fd); + if (e_array != NULL) sets += php_sock_array_to_fd_set(e_array, &efds, &max_fd); if (!sets) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "no resource arrays were passed to select"); + php_error_docref(NULL, E_WARNING, "no resource arrays were passed to select"); RETURN_FALSE; } @@ -888,13 +897,13 @@ PHP_FUNCTION(socket_select) if (retval == -1) { SOCKETS_G(last_error) = errno; - php_error_docref(NULL TSRMLS_CC, E_WARNING, "unable to select [%d]: %s", errno, sockets_strerror(errno TSRMLS_CC)); + php_error_docref(NULL, E_WARNING, "unable to select [%d]: %s", errno, sockets_strerror(errno)); RETURN_FALSE; } - if (r_array != NULL) php_sock_array_from_fd_set(r_array, &rfds TSRMLS_CC); - if (w_array != NULL) php_sock_array_from_fd_set(w_array, &wfds TSRMLS_CC); - if (e_array != NULL) php_sock_array_from_fd_set(e_array, &efds TSRMLS_CC); + if (r_array != NULL) php_sock_array_from_fd_set(r_array, &rfds); + if (w_array != NULL) php_sock_array_from_fd_set(w_array, &wfds); + if (e_array != NULL) php_sock_array_from_fd_set(e_array, &efds); RETURN_LONG(retval); } @@ -907,11 +916,11 @@ PHP_FUNCTION(socket_create_listen) php_socket *php_sock; zend_long port, backlog = 128; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l|l", &port, &backlog) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "l|l", &port, &backlog) == FAILURE) { return; } - if (!php_open_listen_sock(&php_sock, port, backlog TSRMLS_CC)) { + if (!php_open_listen_sock(&php_sock, port, backlog)) { RETURN_FALSE; } @@ -931,13 +940,13 @@ PHP_FUNCTION(socket_accept) php_sockaddr_storage sa; socklen_t php_sa_len = sizeof(sa); - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &arg1) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &arg1) == FAILURE) { return; } ZEND_FETCH_RESOURCE(php_sock, php_socket *, arg1, -1, le_socket_name, le_socket); - if (!php_accept_connect(php_sock, &new_sock, (struct sockaddr*)&sa, &php_sa_len TSRMLS_CC)) { + if (!php_accept_connect(php_sock, &new_sock, (struct sockaddr*)&sa, &php_sa_len)) { RETURN_FALSE; } @@ -952,7 +961,7 @@ PHP_FUNCTION(socket_set_nonblock) zval *arg1; php_socket *php_sock; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &arg1) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &arg1) == FAILURE) { return; } @@ -961,7 +970,7 @@ PHP_FUNCTION(socket_set_nonblock) if (!Z_ISUNDEF(php_sock->zstream)) { php_stream *stream; /* omit notice if resource doesn't exist anymore */ - stream = zend_fetch_resource(&php_sock->zstream TSRMLS_CC, -1, + stream = zend_fetch_resource(&php_sock->zstream, -1, NULL, NULL, 2, php_file_le_stream(), php_file_le_pstream()); if (stream != NULL) { if (php_stream_set_option(stream, PHP_STREAM_OPTION_BLOCKING, 0, @@ -972,7 +981,7 @@ PHP_FUNCTION(socket_set_nonblock) } } - if (php_set_sock_blocking(php_sock->bsd_socket, 0 TSRMLS_CC) == SUCCESS) { + if (php_set_sock_blocking(php_sock->bsd_socket, 0) == SUCCESS) { php_sock->blocking = 0; RETURN_TRUE; } else { @@ -989,7 +998,7 @@ PHP_FUNCTION(socket_set_block) zval *arg1; php_socket *php_sock; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &arg1) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &arg1) == FAILURE) { return; } @@ -1000,7 +1009,7 @@ PHP_FUNCTION(socket_set_block) * state */ if (!Z_ISUNDEF(php_sock->zstream)) { php_stream *stream; - stream = zend_fetch_resource(&php_sock->zstream TSRMLS_CC, -1, + stream = zend_fetch_resource(&php_sock->zstream, -1, NULL, NULL, 2, php_file_le_stream(), php_file_le_pstream()); if (stream != NULL) { if (php_stream_set_option(stream, PHP_STREAM_OPTION_BLOCKING, 1, @@ -1011,7 +1020,7 @@ PHP_FUNCTION(socket_set_block) } } - if (php_set_sock_blocking(php_sock->bsd_socket, 1 TSRMLS_CC) == SUCCESS) { + if (php_set_sock_blocking(php_sock->bsd_socket, 1) == SUCCESS) { php_sock->blocking = 1; RETURN_TRUE; } else { @@ -1029,7 +1038,7 @@ PHP_FUNCTION(socket_listen) php_socket *php_sock; zend_long backlog = 0; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|l", &arg1, &backlog) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "r|l", &arg1, &backlog) == FAILURE) { return; } @@ -1050,7 +1059,7 @@ PHP_FUNCTION(socket_close) zval *arg1; php_socket *php_sock; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &arg1) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &arg1) == FAILURE) { return; } @@ -1080,7 +1089,7 @@ PHP_FUNCTION(socket_write) zend_long length = 0; char *str; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs|l", &arg1, &str, &str_len, &length) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "rs|l", &arg1, &str, &str_len, &length) == FAILURE) { return; } @@ -1115,7 +1124,7 @@ PHP_FUNCTION(socket_read) int retval; zend_long length, type = PHP_BINARY_READ; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl|l", &arg1, &length, &type) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "rl|l", &arg1, &length, &type) == FAILURE) { return; } @@ -1180,7 +1189,7 @@ PHP_FUNCTION(socket_getsockname) char *addr_string; socklen_t salen = sizeof(php_sockaddr_storage); - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rz/|z/", &arg1, &addr, &port) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "rz/|z/", &arg1, &addr, &port) == FAILURE) { return; } @@ -1238,7 +1247,7 @@ PHP_FUNCTION(socket_getsockname) break; default: - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unsupported address family %d", sa->sa_family); + php_error_docref(NULL, E_WARNING, "Unsupported address family %d", sa->sa_family); RETURN_FALSE; } } @@ -1261,7 +1270,7 @@ PHP_FUNCTION(socket_getpeername) char *addr_string; socklen_t salen = sizeof(php_sockaddr_storage); - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rz/|z/", &arg1, &arg2, &arg3) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "rz/|z/", &arg1, &arg2, &arg3) == FAILURE) { return; } @@ -1317,7 +1326,7 @@ PHP_FUNCTION(socket_getpeername) break; default: - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unsupported address family %d", sa->sa_family); + php_error_docref(NULL, E_WARNING, "Unsupported address family %d", sa->sa_family); RETURN_FALSE; } } @@ -1330,7 +1339,7 @@ PHP_FUNCTION(socket_create) zend_long arg1, arg2, arg3; php_socket *php_sock = php_create_socket(); - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "lll", &arg1, &arg2, &arg3) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "lll", &arg1, &arg2, &arg3) == FAILURE) { efree(php_sock); return; } @@ -1340,12 +1349,12 @@ PHP_FUNCTION(socket_create) && arg1 != AF_INET6 #endif && arg1 != AF_INET) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid socket domain [%pd] specified for argument 1, assuming AF_INET", arg1); + php_error_docref(NULL, E_WARNING, "invalid socket domain [%pd] specified for argument 1, assuming AF_INET", arg1); arg1 = AF_INET; } if (arg2 > 10) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid socket type [%pd] specified for argument 2, assuming SOCK_STREAM", arg2); + php_error_docref(NULL, E_WARNING, "invalid socket type [%pd] specified for argument 2, assuming SOCK_STREAM", arg2); arg2 = SOCK_STREAM; } @@ -1354,7 +1363,7 @@ PHP_FUNCTION(socket_create) if (IS_INVALID_SOCKET(php_sock)) { SOCKETS_G(last_error) = errno; - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to create socket [%d]: %s", errno, sockets_strerror(errno TSRMLS_CC)); + php_error_docref(NULL, E_WARNING, "Unable to create socket [%d]: %s", errno, sockets_strerror(errno)); efree(php_sock); RETURN_FALSE; } @@ -1378,7 +1387,7 @@ PHP_FUNCTION(socket_connect) zend_long port = 0; int argc = ZEND_NUM_ARGS(); - if (zend_parse_parameters(argc TSRMLS_CC, "rs|l", &arg1, &addr, &addr_len, &port) == FAILURE) { + if (zend_parse_parameters(argc, "rs|l", &arg1, &addr, &addr_len, &port) == FAILURE) { return; } @@ -1390,7 +1399,7 @@ PHP_FUNCTION(socket_connect) struct sockaddr_in6 sin6 = {0}; if (argc != 3) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Socket of type AF_INET6 requires 3 arguments"); + php_error_docref(NULL, E_WARNING, "Socket of type AF_INET6 requires 3 arguments"); RETURN_FALSE; } @@ -1399,7 +1408,7 @@ PHP_FUNCTION(socket_connect) sin6.sin6_family = AF_INET6; sin6.sin6_port = htons((unsigned short int)port); - if (! php_set_inet6_addr(&sin6, addr, php_sock TSRMLS_CC)) { + if (! php_set_inet6_addr(&sin6, addr, php_sock)) { RETURN_FALSE; } @@ -1411,14 +1420,14 @@ PHP_FUNCTION(socket_connect) struct sockaddr_in sin = {0}; if (argc != 3) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Socket of type AF_INET requires 3 arguments"); + php_error_docref(NULL, E_WARNING, "Socket of type AF_INET requires 3 arguments"); RETURN_FALSE; } sin.sin_family = AF_INET; sin.sin_port = htons((unsigned short int)port); - if (! php_set_inet_addr(&sin, addr, php_sock TSRMLS_CC)) { + if (! php_set_inet_addr(&sin, addr, php_sock)) { RETURN_FALSE; } @@ -1430,7 +1439,7 @@ PHP_FUNCTION(socket_connect) struct sockaddr_un s_un = {0}; if (addr_len >= sizeof(s_un.sun_path)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Path too long"); + php_error_docref(NULL, E_WARNING, "Path too long"); RETURN_FALSE; } @@ -1442,7 +1451,7 @@ PHP_FUNCTION(socket_connect) } default: - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unsupported socket type %d", php_sock->type); + php_error_docref(NULL, E_WARNING, "Unsupported socket type %d", php_sock->type); RETURN_FALSE; } @@ -1461,11 +1470,11 @@ PHP_FUNCTION(socket_strerror) { zend_long arg1; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &arg1) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &arg1) == FAILURE) { return; } - RETURN_STRING(sockets_strerror(arg1 TSRMLS_CC)); + RETURN_STRING(sockets_strerror(arg1)); } /* }}} */ @@ -1482,7 +1491,7 @@ PHP_FUNCTION(socket_bind) zend_long port = 0; zend_long retval = 0; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs|l", &arg1, &addr, &addr_len, &port) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "rs|l", &arg1, &addr, &addr_len, &port) == FAILURE) { return; } @@ -1496,7 +1505,7 @@ PHP_FUNCTION(socket_bind) sa->sun_family = AF_UNIX; if (addr_len >= sizeof(sa->sun_path)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, + php_error_docref(NULL, E_WARNING, "Invalid path: too long (maximum size is %d)", (int)sizeof(sa->sun_path) - 1); RETURN_FALSE; @@ -1515,7 +1524,7 @@ PHP_FUNCTION(socket_bind) sa->sin_family = AF_INET; sa->sin_port = htons((unsigned short) port); - if (! php_set_inet_addr(sa, addr, php_sock TSRMLS_CC)) { + if (! php_set_inet_addr(sa, addr, php_sock)) { RETURN_FALSE; } @@ -1530,7 +1539,7 @@ PHP_FUNCTION(socket_bind) sa->sin6_family = AF_INET6; sa->sin6_port = htons((unsigned short) port); - if (! php_set_inet6_addr(sa, addr, php_sock TSRMLS_CC)) { + if (! php_set_inet6_addr(sa, addr, php_sock)) { RETURN_FALSE; } @@ -1539,7 +1548,7 @@ PHP_FUNCTION(socket_bind) } #endif default: - php_error_docref(NULL TSRMLS_CC, E_WARNING, "unsupported socket type '%d', must be AF_UNIX, AF_INET, or AF_INET6", php_sock->type); + php_error_docref(NULL, E_WARNING, "unsupported socket type '%d', must be AF_UNIX, AF_INET, or AF_INET6", php_sock->type); RETURN_FALSE; } @@ -1562,7 +1571,7 @@ PHP_FUNCTION(socket_recv) int retval; zend_long len, flags; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rz/ll", &php_sock_res, &buf, &len, &flags) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "rz/ll", &php_sock_res, &buf, &len, &flags) == FAILURE) { return; } @@ -1608,7 +1617,7 @@ PHP_FUNCTION(socket_send) zend_long len, flags; char *buf; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rsll", &arg1, &buf, &buf_len, &len, &flags) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "rsll", &arg1, &buf, &buf_len, &len, &flags) == FAILURE) { return; } @@ -1643,7 +1652,7 @@ PHP_FUNCTION(socket_recvfrom) char *address; zend_string *recv_buf; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rz/llz/|z/", &arg1, &arg2, &arg3, &arg4, &arg5, &arg6) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "rz/llz/|z/", &arg1, &arg2, &arg3, &arg4, &arg5, &arg6) == FAILURE) { return; } @@ -1741,7 +1750,7 @@ PHP_FUNCTION(socket_recvfrom) break; #endif default: - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unsupported socket type %d", php_sock->type); + php_error_docref(NULL, E_WARNING, "Unsupported socket type %d", php_sock->type); RETURN_FALSE; } @@ -1766,7 +1775,7 @@ PHP_FUNCTION(socket_sendto) char *buf, *addr; int argc = ZEND_NUM_ARGS(); - if (zend_parse_parameters(argc TSRMLS_CC, "rslls|l", &arg1, &buf, &buf_len, &len, &flags, &addr, &addr_len, &port) == FAILURE) { + if (zend_parse_parameters(argc, "rslls|l", &arg1, &buf, &buf_len, &len, &flags, &addr, &addr_len, &port) == FAILURE) { return; } @@ -1790,7 +1799,7 @@ PHP_FUNCTION(socket_sendto) sin.sin_family = AF_INET; sin.sin_port = htons((unsigned short) port); - if (! php_set_inet_addr(&sin, addr, php_sock TSRMLS_CC)) { + if (! php_set_inet_addr(&sin, addr, php_sock)) { RETURN_FALSE; } @@ -1806,7 +1815,7 @@ PHP_FUNCTION(socket_sendto) sin6.sin6_family = AF_INET6; sin6.sin6_port = htons((unsigned short) port); - if (! php_set_inet6_addr(&sin6, addr, php_sock TSRMLS_CC)) { + if (! php_set_inet6_addr(&sin6, addr, php_sock)) { RETURN_FALSE; } @@ -1814,7 +1823,7 @@ PHP_FUNCTION(socket_sendto) break; #endif default: - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unsupported socket type %d", php_sock->type); + php_error_docref(NULL, E_WARNING, "Unsupported socket type %d", php_sock->type); RETURN_FALSE; } @@ -1842,7 +1851,7 @@ PHP_FUNCTION(socket_get_option) int other_val; zend_long level, optname; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rll", &arg1, &level, &optname) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "rll", &arg1, &level, &optname) == FAILURE) { return; } @@ -1858,7 +1867,7 @@ PHP_FUNCTION(socket_get_option) PHP_SOCKET_ERROR(php_sock, "unable to retrieve socket option", errno); RETURN_FALSE; } - if (php_add4_to_if_index(&if_addr, php_sock, &if_index TSRMLS_CC) == SUCCESS) { + if (php_add4_to_if_index(&if_addr, php_sock, &if_index) == SUCCESS) { RETURN_LONG((zend_long) if_index); } else { RETURN_FALSE; @@ -1868,7 +1877,7 @@ PHP_FUNCTION(socket_get_option) } #if HAVE_IPV6 else if (level == IPPROTO_IPV6) { - int ret = php_do_getsockopt_ipv6_rfc3542(php_sock, level, optname, return_value TSRMLS_CC); + int ret = php_do_getsockopt_ipv6_rfc3542(php_sock, level, optname, return_value); if (ret == SUCCESS) { return; } else if (ret == FAILURE) { @@ -1955,7 +1964,7 @@ PHP_FUNCTION(socket_set_option) zval *sec, *usec; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rllz", &arg1, &level, &optname, &arg4) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "rllz", &arg1, &level, &optname, &arg4) == FAILURE) { return; } @@ -1972,15 +1981,15 @@ PHP_FUNCTION(socket_set_option) if (level == IPPROTO_IP) { - int res = php_do_setsockopt_ip_mcast(php_sock, level, optname, arg4 TSRMLS_CC); + int res = php_do_setsockopt_ip_mcast(php_sock, level, optname, arg4); HANDLE_SUBCALL(res); } #if HAVE_IPV6 else if (level == IPPROTO_IPV6) { - int res = php_do_setsockopt_ipv6_mcast(php_sock, level, optname, arg4 TSRMLS_CC); + int res = php_do_setsockopt_ipv6_mcast(php_sock, level, optname, arg4); if (res == 1) { - res = php_do_setsockopt_ipv6_rfc3542(php_sock, level, optname, arg4 TSRMLS_CC); + res = php_do_setsockopt_ipv6_rfc3542(php_sock, level, optname, arg4); } HANDLE_SUBCALL(res); } @@ -1995,11 +2004,11 @@ PHP_FUNCTION(socket_set_option) opt_ht = HASH_OF(arg4); if ((l_onoff = zend_hash_str_find(opt_ht, l_onoff_key, sizeof(l_onoff_key) - 1)) == NULL) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "no key \"%s\" passed in optval", l_onoff_key); + php_error_docref(NULL, E_WARNING, "no key \"%s\" passed in optval", l_onoff_key); RETURN_FALSE; } if ((l_linger = zend_hash_str_find(opt_ht, l_linger_key, sizeof(l_linger_key) - 1)) == NULL) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "no key \"%s\" passed in optval", l_linger_key); + php_error_docref(NULL, E_WARNING, "no key \"%s\" passed in optval", l_linger_key); RETURN_FALSE; } @@ -2023,11 +2032,11 @@ PHP_FUNCTION(socket_set_option) opt_ht = HASH_OF(arg4); if ((sec = zend_hash_str_find(opt_ht, sec_key, sizeof(sec_key) - 1)) == NULL) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "no key \"%s\" passed in optval", sec_key); + php_error_docref(NULL, E_WARNING, "no key \"%s\" passed in optval", sec_key); RETURN_FALSE; } if ((usec = zend_hash_str_find(opt_ht, usec_key, sizeof(usec_key) - 1)) == NULL) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "no key \"%s\" passed in optval", usec_key); + php_error_docref(NULL, E_WARNING, "no key \"%s\" passed in optval", usec_key); RETURN_FALSE; } @@ -2088,7 +2097,7 @@ PHP_FUNCTION(socket_create_pair) PHP_SOCKET fds_array[2]; zend_long domain, type, protocol; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "lllz/", &domain, &type, &protocol, &fds_array_zval) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "lllz/", &domain, &type, &protocol, &fds_array_zval) == FAILURE) { return; } @@ -2100,18 +2109,18 @@ PHP_FUNCTION(socket_create_pair) && domain != AF_INET6 #endif && domain != AF_UNIX) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid socket domain [%pd] specified for argument 1, assuming AF_INET", domain); + php_error_docref(NULL, E_WARNING, "invalid socket domain [%pd] specified for argument 1, assuming AF_INET", domain); domain = AF_INET; } if (type > 10) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid socket type [%pd] specified for argument 2, assuming SOCK_STREAM", type); + php_error_docref(NULL, E_WARNING, "invalid socket type [%pd] specified for argument 2, assuming SOCK_STREAM", type); type = SOCK_STREAM; } if (socketpair(domain, type, protocol, fds_array) != 0) { SOCKETS_G(last_error) = errno; - php_error_docref(NULL TSRMLS_CC, E_WARNING, "unable to create socket pair [%d]: %s", errno, sockets_strerror(errno TSRMLS_CC)); + php_error_docref(NULL, E_WARNING, "unable to create socket pair [%d]: %s", errno, sockets_strerror(errno)); efree(php_sock[0]); efree(php_sock[1]); RETURN_FALSE; @@ -2149,7 +2158,7 @@ PHP_FUNCTION(socket_shutdown) zend_long how_shutdown = 2; php_socket *php_sock; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|l", &arg1, &how_shutdown) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "r|l", &arg1, &how_shutdown) == FAILURE) { return; } @@ -2172,7 +2181,7 @@ PHP_FUNCTION(socket_last_error) zval *arg1 = NULL; php_socket *php_sock; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|r", &arg1) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "|r", &arg1) == FAILURE) { return; } @@ -2192,7 +2201,7 @@ PHP_FUNCTION(socket_clear_error) zval *arg1 = NULL; php_socket *php_sock; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|r", &arg1) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "|r", &arg1) == FAILURE) { return; } @@ -2207,7 +2216,7 @@ PHP_FUNCTION(socket_clear_error) } /* }}} */ -php_socket *socket_import_file_descriptor(PHP_SOCKET socket TSRMLS_DC) +php_socket *socket_import_file_descriptor(PHP_SOCKET socket) { #ifdef SO_DOMAIN int type; @@ -2263,7 +2272,7 @@ PHP_FUNCTION(socket_import_stream) php_socket *retsock = NULL; PHP_SOCKET socket; /* fd */ - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zstream) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "r", &zstream) == FAILURE) { return; } php_stream_from_zval(stream, zstream); @@ -2273,7 +2282,7 @@ PHP_FUNCTION(socket_import_stream) RETURN_FALSE; } - retsock = socket_import_file_descriptor(socket TSRMLS_CC); + retsock = socket_import_file_descriptor(socket); if (retsock == NULL) { RETURN_FALSE; } |