mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-24 18:34:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

MFB: Fixed Bug #44197 (socket array keys lost on socket_select)

Browse Source
This commit is contained in:
Felipe Pena 2008-02-21 02:56:57 +00:00
parent bc8a62f4b1
commit 079bfadbe7
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ext/sockets/sockets.c
View File

@ -584,7 +584,10 @@ static int php_sock_array_from_fd_set(zval *sock_array, fd_set *fds TSRMLS_DC) /
zval **dest_element;
php_socket *php_sock;
HashTable *new_hash;
char *key;
int num = 0;
ulong num_key;
uint key_len;
if (Z_TYPE_P(sock_array) != IS_ARRAY) return 0;
@ -599,7 +602,14 @@ static int php_sock_array_from_fd_set(zval *sock_array, fd_set *fds TSRMLS_DC) /
if (PHP_SAFE_FD_ISSET(php_sock->bsd_socket, fds)) {
/* Add fd to new array */
zend_hash_next_index_insert(new_hash, (void *)element, sizeof(zval *), (void **)&dest_element);
switch (zend_hash_get_current_key_ex(Z_ARRVAL_P(sock_array), &key, &key_len, &num_key, 0, NULL)) {
case HASH_KEY_IS_STRING:
zend_hash_add(new_hash, key, key_len, (void *)element, sizeof(zval *), (void **)&dest_element);
break;
case HASH_KEY_IS_LONG:
zend_hash_index_update(new_hash, num_key, (void *)element, sizeof(zval *), (void **)&dest_element);
break;
}
if (dest_element) zval_add_ref(dest_element);
}
num++;