]> granicus.if.org Git - php/commitdiff
- Reverted fix for #44197 (unsuitable for minor versions)
authorFelipe Pena <felipe@php.net>
Tue, 15 Jul 2008 11:20:06 +0000 (11:20 +0000)
committerFelipe Pena <felipe@php.net>
Tue, 15 Jul 2008 11:20:06 +0000 (11:20 +0000)
ext/sockets/sockets.c

index bd1d74be586029653ce2ee6296fa37805ca8f681..70214a2bc405e4d0257ba5c87332291d3b2f04ce 100644 (file)
@@ -584,10 +584,7 @@ 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;
 
@@ -602,14 +599,8 @@ 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 */
-                       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;
-                       }
+                       zend_hash_next_index_insert(new_hash, (void *)element, sizeof(zval *), (void **)&dest_element);
+
                        if (dest_element) zval_add_ref(dest_element);
                }
                num++;