- fix hash keys

[m6w6/ext-http] / http_request_api.c

diff --git a/http_request_api.c b/http_request_api.c
index 289cac491d4ea003b0b082728dd960fd348a23b2..3396dba1d080f77e3488d920122a3caba0d1f4ef 100644 (file)
--- a/http_request_api.c
+++ b/http_request_api.c
@@ -6,7 +6,7 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2006, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2007, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -194,7 +194,7 @@ static curlioerr http_curl_ioctl_callback(CURL *, curliocmd, void *);
 #endif
 
 /* {{{ CURL *http_curl_init(http_request *) */
-PHP_HTTP_API CURL * _http_curl_init_ex(CURL *ch, http_request *request)
+PHP_HTTP_API CURL * _http_curl_init_ex(CURL *ch, http_request *request TSRMLS_DC)
 {
        if (ch || HTTP_CURL_HANDLE_CTOR(ch)) {
 #if defined(ZTS)
@@ -228,7 +228,7 @@ PHP_HTTP_API CURL * _http_curl_init_ex(CURL *ch, http_request *request)
 /* }}} */
 
 /* {{{ void http_curl_free(CURL **) */
-PHP_HTTP_API void _http_curl_free(CURL **ch)
+PHP_HTTP_API void _http_curl_free(CURL **ch TSRMLS_DC)
 {
        if (*ch) {
                curl_easy_setopt(*ch, CURLOPT_NOPROGRESS, 1L);
@@ -271,6 +271,8 @@ PHP_HTTP_API http_request *_http_request_init_ex(http_request *request, CURL *ch
 /* {{{ void http_request_dtor(http_request *) */
 PHP_HTTP_API void _http_request_dtor(http_request *request)
 {
+       TSRMLS_FETCH_FROM_CTX(request->tsrm_ls);
+       
        http_curl_free(&request->ch);
        http_request_reset(request);
        
@@ -1021,24 +1023,16 @@ static int http_curl_raw_callback(CURL *ch, curl_infotype type, char *data, size
 /* {{{ static inline zval *http_request_option(http_request *, HashTable *, char *, size_t, int) */
 static inline zval *_http_request_option_ex(http_request *r, HashTable *options, char *key, size_t keylen, int type TSRMLS_DC)
 {
-       zval **zoption;
-#ifdef ZEND_ENGINE_2
-       ulong h = zend_get_hash_value(key, keylen);
-#else
-       ulong h = 0;
-#endif
-       
-       if (!options || 
-#ifdef ZEND_ENGINE_2
-                       (SUCCESS != zend_hash_quick_find(options, key, keylen, h, (void *) &zoption))
-#else
-                       (SUCCESS != zend_hash_find(options, key, keylen, (void *) &zoption))
-#endif
-       ) {
-               return NULL;
+       if (options) {
+               zval **zoption;
+               ulong h = zend_hash_func(key, keylen);
+               
+               if (SUCCESS == zend_hash_quick_find(options, key, keylen, h, (void *) &zoption)) {
+                       return http_request_option_cache_ex(r, key, keylen, h, zval_copy(type, *zoption));
+               }
        }
        
-       return http_request_option_cache_ex(r, key, keylen, h, zval_copy(type, *zoption));
+       return NULL;
 }
 /* }}} */
 
@@ -1047,19 +1041,10 @@ static inline zval *_http_request_option_cache_ex(http_request *r, char *key, si
 {
        ZVAL_ADDREF(opt);
        
-#ifdef ZEND_ENGINE_2
        if (h) {
-               _zend_hash_quick_add_or_update(&r->_cache.options, key, keylen, h, &opt, sizeof(zval *), NULL, 
-                       zend_hash_quick_exists(&r->_cache.options, key, keylen, h)?HASH_UPDATE:HASH_ADD ZEND_FILE_LINE_CC);
-       }
-       else
-#endif
-       {
-               if (zend_hash_exists(&r->_cache.options, key, keylen)) {
-                       zend_hash_update(&r->_cache.options, key, keylen, &opt, sizeof(zval *), NULL);
-               } else {
-                       zend_hash_add(&r->_cache.options, key, keylen, &opt, sizeof(zval *), NULL);
-               }
+               zend_hash_quick_update(&r->_cache.options, key, keylen, h, &opt, sizeof(zval *), NULL);
+       } else {
+               zend_hash_update(&r->_cache.options, key, keylen, &opt, sizeof(zval *), NULL);
        }
        
        return opt;