From 079bfadbe708873f40031a5a09b4206967ab9dc5 Mon Sep 17 00:00:00 2001 From: Felipe Pena Date: Thu, 21 Feb 2008 02:56:57 +0000 Subject: [PATCH] MFB: Fixed Bug #44197 (socket array keys lost on socket_select) --- ext/sockets/sockets.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c index ca0fd63005..ddcc070e97 100644 --- a/ext/sockets/sockets.c +++ b/ext/sockets/sockets.c @@ -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++; -- 2.40.0