- prepare release 0.21.0

[m6w6/ext-http] / http_request_api.c

diff --git a/http_request_api.c b/http_request_api.c
index f7d308997f653d71275938f494cbb57bbd758d23..662c2ab7bc48311cff20747aa411f167fc3a2558 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-2005, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2006, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -239,10 +239,10 @@ PHP_HTTP_API void _http_request_dtor(http_request *request)
        
        if (request->ch) {
                /* avoid nasty segfaults with already cleaned up callbacks */
-               curl_easy_setopt(request->ch, CURLOPT_NOPROGRESS, 1);
-               curl_easy_setopt(request->ch, CURLOPT_PROGRESSFUNCTION, NULL);
-               curl_easy_setopt(request->ch, CURLOPT_VERBOSE, 0);
-               curl_easy_setopt(request->ch, CURLOPT_DEBUGFUNCTION, NULL);
+               HTTP_CURL_OPT(NOPROGRESS, 1);
+               HTTP_CURL_OPT(PROGRESSFUNCTION, NULL);
+               HTTP_CURL_OPT(VERBOSE, 0);
+               HTTP_CURL_OPT(DEBUGFUNCTION, NULL);
                curl_easy_cleanup(request->ch);
                request->ch = NULL;
        }
@@ -326,6 +326,9 @@ PHP_HTTP_API void _http_request_defaults(http_request *request)
                HTTP_CURL_OPT(USERAGENT, "PECL::HTTP/" PHP_EXT_HTTP_VERSION " (PHP/" PHP_VERSION ")");
                HTTP_CURL_OPT(HTTPHEADER, NULL);
                HTTP_CURL_OPT(COOKIE, NULL);
+#if LIBCURL_VERSION_NUM >= 0x070e01
+               HTTP_CURL_OPT(COOKIELIST, NULL);
+#endif
                HTTP_CURL_OPT(COOKIEFILE, NULL);
                HTTP_CURL_OPT(COOKIEJAR, NULL);
                HTTP_CURL_OPT(RESUME_FROM, 0);
@@ -366,10 +369,16 @@ PHP_HTTP_API void _http_request_set_progress_callback(http_request *request, zva
        if (request->_progress_callback) {
                zval_ptr_dtor(&request->_progress_callback);
        }
-       if (cb) {
+       if ((request->_progress_callback = cb)) {
                ZVAL_ADDREF(cb);
+               HTTP_CURL_OPT(NOPROGRESS, 0);
+               HTTP_CURL_OPT(PROGRESSDATA, request);
+               HTTP_CURL_OPT(PROGRESSFUNCTION, http_curl_progress_callback);
+       } else {
+               HTTP_CURL_OPT(NOPROGRESS, 1);
+               HTTP_CURL_OPT(PROGRESSDATA, NULL);
+               HTTP_CURL_OPT(PROGRESSFUNCTION, NULL);
        }
-       request->_progress_callback = cb;
 }
 
 /* {{{ STATUS http_request_prepare(http_request *, HashTable *) */
@@ -389,10 +398,7 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
        HTTP_CURL_OPT(URL, request->url);
 
        /* progress callback */
-       if ((zoption = http_request_option(request, options, "onprogress", 0))) {
-               HTTP_CURL_OPT(NOPROGRESS, 0);
-               HTTP_CURL_OPT(PROGRESSDATA, request);
-               HTTP_CURL_OPT(PROGRESSFUNCTION, http_curl_progress_callback);
+       if ((zoption = http_request_option(request, options, "onprogress", -1))) {
                http_request_set_progress_callback(request, zoption);
        }
 
@@ -492,7 +498,7 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
                }
        }
 
-#if LIBCURL_VERSION_NUM >= 0x070f01
+#if LIBCURL_VERSION_NUM >= 0x070e01
        /* reset cookies */
        if ((zoption = http_request_option(request, options, "resetcookies", IS_BOOL)) && Z_LVAL_P(zoption)) {
                HTTP_CURL_OPT(COOKIELIST, "ALL");
@@ -591,24 +597,24 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
        switch (request->meth)
        {
                case HTTP_GET:
-                       curl_easy_setopt(request->ch, CURLOPT_HTTPGET, 1);
+                       HTTP_CURL_OPT(HTTPGET, 1);
                break;
 
                case HTTP_HEAD:
-                       curl_easy_setopt(request->ch, CURLOPT_NOBODY, 1);
+                       HTTP_CURL_OPT(NOBODY, 1);
                break;
 
                case HTTP_POST:
-                       curl_easy_setopt(request->ch, CURLOPT_POST, 1);
+                       HTTP_CURL_OPT(POST, 1);
                break;
 
                case HTTP_PUT:
-                       curl_easy_setopt(request->ch, CURLOPT_UPLOAD, 1);
+                       HTTP_CURL_OPT(UPLOAD, 1);
                break;
 
                default:
                        if (http_request_method_exists(0, request->meth, NULL)) {
-                               curl_easy_setopt(request->ch, CURLOPT_CUSTOMREQUEST, http_request_method_name(request->meth));
+                               HTTP_CURL_OPT(CUSTOMREQUEST, http_request_method_name(request->meth));
                        } else {
                                http_error_ex(HE_WARNING, HTTP_E_REQUEST_METHOD, "Unsupported request method: %d (%s)", request->meth, request->url);
                                return FAILURE;
@@ -621,18 +627,18 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
                switch (request->body->type)
                {
                        case HTTP_REQUEST_BODY_CSTRING:
-                               curl_easy_setopt(request->ch, CURLOPT_POSTFIELDS, request->body->data);
-                               curl_easy_setopt(request->ch, CURLOPT_POSTFIELDSIZE, request->body->size);
+                               HTTP_CURL_OPT(POSTFIELDS, request->body->data);
+                               HTTP_CURL_OPT(POSTFIELDSIZE, request->body->size);
                        break;
 
                        case HTTP_REQUEST_BODY_CURLPOST:
-                               curl_easy_setopt(request->ch, CURLOPT_HTTPPOST, (struct curl_httppost *) request->body->data);
+                               HTTP_CURL_OPT(HTTPPOST, (struct curl_httppost *) request->body->data);
                        break;
 
                        case HTTP_REQUEST_BODY_UPLOADFILE:
-                               curl_easy_setopt(request->ch, CURLOPT_IOCTLDATA, request);
-                               curl_easy_setopt(request->ch, CURLOPT_READDATA, request);
-                               curl_easy_setopt(request->ch, CURLOPT_INFILESIZE, request->body->size);
+                               HTTP_CURL_OPT(IOCTLDATA, request);
+                               HTTP_CURL_OPT(READDATA, request);
+                               HTTP_CURL_OPT(INFILESIZE, request->body->size);
                        break;
 
                        default:
@@ -713,30 +719,26 @@ static size_t http_curl_read_callback(void *data, size_t len, size_t n, void *ct
 /* {{{ static int http_curl_progress_callback(void *, double, double, double, double) */
 static int http_curl_progress_callback(void *ctx, double dltotal, double dlnow, double ultotal, double ulnow)
 {
-       int rc;
-       zval *params_pass[4], params_local[4], retval;
+       zval *param, retval;
        http_request *request = (http_request *) ctx;
        TSRMLS_FETCH_FROM_CTX(request->tsrm_ls);
 
-       params_pass[0] = &params_local[0];
-       params_pass[1] = &params_local[1];
-       params_pass[2] = &params_local[2];
-       params_pass[3] = &params_local[3];
-
-       INIT_PZVAL(params_pass[0]);
-       INIT_PZVAL(params_pass[1]);
-       INIT_PZVAL(params_pass[2]);
-       INIT_PZVAL(params_pass[3]);
-       ZVAL_DOUBLE(params_pass[0], dltotal);
-       ZVAL_DOUBLE(params_pass[1], dlnow);
-       ZVAL_DOUBLE(params_pass[2], ultotal);
-       ZVAL_DOUBLE(params_pass[3], ulnow);
-
        INIT_PZVAL(&retval);
        ZVAL_NULL(&retval);
-       rc = call_user_function(EG(function_table), NULL, request->_progress_callback, &retval, 4, params_pass TSRMLS_CC);
+
+       MAKE_STD_ZVAL(param);
+       array_init(param);
+       add_assoc_double(param, "dltotal", dltotal);
+       add_assoc_double(param, "dlnow", dlnow);
+       add_assoc_double(param, "ultotal", ultotal);
+       add_assoc_double(param, "ulnow", ulnow);
+       
+       call_user_function(EG(function_table), NULL, request->_progress_callback, &retval, 1, &param TSRMLS_CC);
+       
+       zval_ptr_dtor(&param);
        zval_dtor(&retval);
-       return rc;
+       
+       return 0;
 }
 /* }}} */