- gcc didn't like those changes

[m6w6/ext-http] / http_request_api.c

diff --git a/http_request_api.c b/http_request_api.c
index 260b1f4a89fa065f02a674fc0bf2c4e11d9ffbeb..6090bc15cf62e244a9b6deb55a1049fcbc7bbc90 100644 (file)
--- a/http_request_api.c
+++ b/http_request_api.c
@@ -495,37 +495,14 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
 
        /* cookies, array('name' => 'value') */
        if ((zoption = http_request_option(request, options, "cookies", IS_ARRAY))) {
-               char *cookie_key = NULL;
-               ulong cookie_idx = 0;
-               HashPosition pos;
-               
                phpstr_dtor(&request->_cache.cookies);
-
-               FOREACH_KEY(pos, zoption, cookie_key, cookie_idx) {
-                       if (cookie_key) {
-                               zval **cookie_val;
-                               if (SUCCESS == zend_hash_get_current_data_ex(Z_ARRVAL_P(zoption), (void **) &cookie_val, &pos)) {
-                                       zval *cpy, *val = convert_to_type_ex(IS_STRING, *cookie_val, &cpy);
-                                       
-                                       phpstr_appendf(&request->_cache.cookies, "%s=%s; ", cookie_key, Z_STRVAL_P(val));
-                                       
-                                       if (cpy) {
-                                               zval_ptr_dtor(&cpy);
-                                       }
-                               }
-
-                               /* reset */
-                               cookie_key = NULL;
-                       }
-               }
-
-               if (request->_cache.cookies.used) {
+               if (SUCCESS == http_urlencode_hash_recursive(HASH_OF(zoption), &request->_cache.cookies, "; ", sizeof("; ")-1, NULL, 0)) {
                        phpstr_fix(&request->_cache.cookies);
                        HTTP_CURL_OPT(COOKIE, request->_cache.cookies.data);
                }
        }
 
-#if LIBCURL_VERSIONNUM >= 0x070f01
+#if LIBCURL_VERSION_NUM >= 0x070f01
        /* reset cookies */
        if ((zoption = http_request_option(request, options, "resetcookies", IS_BOOL)) && Z_LVAL_P(zoption)) {
                HTTP_CURL_OPT(COOKIELIST, "ALL");