diff options
Diffstat (limited to 'ext/sockets/sockets.c')
| -rw-r--r-- | ext/sockets/sockets.c | 38 |
1 files changed, 14 insertions, 24 deletions
diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c index 16ad3e8013..c41123dd94 100644 --- a/ext/sockets/sockets.c +++ b/ext/sockets/sockets.c @@ -432,10 +432,7 @@ static PHP_MINIT_FUNCTION(sockets) ZEND_TSRMLS_CACHE_UPDATE(); #endif - zend_class_entry ce_socket; - INIT_CLASS_ENTRY(ce_socket, "Socket", class_Socket_methods); - socket_ce = zend_register_internal_class(&ce_socket); - socket_ce->ce_flags |= ZEND_ACC_FINAL | ZEND_ACC_NO_DYNAMIC_PROPERTIES; + socket_ce = register_class_Socket(); socket_ce->create_object = socket_create_object; socket_ce->serialize = zend_class_serialize_deny; socket_ce->unserialize = zend_class_unserialize_deny; @@ -448,10 +445,7 @@ static PHP_MINIT_FUNCTION(sockets) socket_object_handlers.get_gc = socket_get_gc; socket_object_handlers.compare = zend_objects_not_comparable; - zend_class_entry ce_address_info; - INIT_CLASS_ENTRY(ce_address_info, "AddressInfo", class_AddressInfo_methods); - address_info_ce = zend_register_internal_class(&ce_address_info); - address_info_ce->ce_flags |= ZEND_ACC_FINAL | ZEND_ACC_NO_DYNAMIC_PROPERTIES; + address_info_ce = register_class_AddressInfo(); address_info_ce->create_object = address_info_create_object; address_info_ce->serialize = zend_class_serialize_deny; address_info_ce->unserialize = zend_class_unserialize_deny; @@ -728,7 +722,7 @@ PHP_FUNCTION(socket_select) PHP_SOCKET max_fd = 0; int retval, sets = 0; zend_long sec, usec = 0; - zend_bool sec_is_null = 0; + bool sec_is_null = 0; if (zend_parse_parameters(ZEND_NUM_ARGS(), "a!a!a!l!|l", &r_array, &w_array, &e_array, &sec, &sec_is_null, &usec) == FAILURE) { RETURN_THROWS(); @@ -980,7 +974,7 @@ PHP_FUNCTION(socket_write) int retval; size_t str_len; zend_long length = 0; - zend_bool length_is_null = 1; + bool length_is_null = 1; char *str; if (zend_parse_parameters(ZEND_NUM_ARGS(), "Os|l!", &arg1, socket_ce, &str, &str_len, &length, &length_is_null) == FAILURE) { @@ -1046,11 +1040,7 @@ PHP_FUNCTION(socket_read) if (retval == -1) { /* if the socket is in non-blocking mode and there's no data to read, don't output any error, as this is a normal situation, and not an error */ - if (errno == EAGAIN -#ifdef EWOULDBLOCK - || errno == EWOULDBLOCK -#endif - ) { + if (PHP_IS_TRANSIENT_ERROR(errno)) { php_sock->error = errno; SOCKETS_G(last_error) = errno; } else { @@ -1271,7 +1261,7 @@ PHP_FUNCTION(socket_connect) int retval; size_t addr_len; zend_long port; - zend_bool port_is_null = 1; + bool port_is_null = 1; if (zend_parse_parameters(ZEND_NUM_ARGS(), "Os|l!", &resource_socket, socket_ce, &addr, &addr_len, &port, &port_is_null) == FAILURE) { RETURN_THROWS(); @@ -1647,7 +1637,7 @@ PHP_FUNCTION(socket_sendto) int retval; size_t buf_len, addr_len; zend_long len, flags, port; - zend_bool port_is_null = 1; + bool port_is_null = 1; char *buf, *addr; if (zend_parse_parameters(ZEND_NUM_ARGS(), "Oslls|l!", &arg1, socket_ce, &buf, &buf_len, &len, &flags, &addr, &addr_len, &port, &port_is_null) == FAILURE) { @@ -1883,7 +1873,7 @@ PHP_FUNCTION(socket_set_option) const char l_onoff_key[] = "l_onoff"; const char l_linger_key[] = "l_linger"; - convert_to_array_ex(arg4); + convert_to_array(arg4); opt_ht = Z_ARRVAL_P(arg4); if ((l_onoff = zend_hash_str_find(opt_ht, l_onoff_key, sizeof(l_onoff_key) - 1)) == NULL) { @@ -1895,8 +1885,8 @@ PHP_FUNCTION(socket_set_option) RETURN_THROWS(); } - convert_to_long_ex(l_onoff); - convert_to_long_ex(l_linger); + convert_to_long(l_onoff); + convert_to_long(l_linger); lv.l_onoff = (unsigned short)Z_LVAL_P(l_onoff); lv.l_linger = (unsigned short)Z_LVAL_P(l_linger); @@ -1911,7 +1901,7 @@ PHP_FUNCTION(socket_set_option) const char sec_key[] = "sec"; const char usec_key[] = "usec"; - convert_to_array_ex(arg4); + convert_to_array(arg4); opt_ht = Z_ARRVAL_P(arg4); if ((sec = zend_hash_str_find(opt_ht, sec_key, sizeof(sec_key) - 1)) == NULL) { @@ -1923,8 +1913,8 @@ PHP_FUNCTION(socket_set_option) RETURN_THROWS(); } - convert_to_long_ex(sec); - convert_to_long_ex(usec); + convert_to_long(sec); + convert_to_long(usec); #ifndef PHP_WIN32 tv.tv_sec = Z_LVAL_P(sec); tv.tv_usec = Z_LVAL_P(usec); @@ -1952,7 +1942,7 @@ PHP_FUNCTION(socket_set_option) default: default_case: - convert_to_long_ex(arg4); + convert_to_long(arg4); ov = Z_LVAL_P(arg4); optlen = sizeof(ov); |