- typo

[m6w6/ext-http] / http_request_api.c

diff --git a/http_request_api.c b/http_request_api.c
index 6eb31fbc4eb502a84060e3363949d353018dac79..49b699b04dba59a7fea3b83827273d72f5b2a2a7 100644 (file)
--- a/http_request_api.c
+++ b/http_request_api.c
@@ -349,7 +349,7 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, const
        HTTP_CURL_OPT(NOSIGNAL, 1);
 #endif
 #if LIBCURL_VERSION_NUM < 0x070c00
-       HTTP_CURL_OPT(ERRORBUFFER, HTTP_G(request).curl.error);
+       HTTP_CURL_OPT(ERRORBUFFER, HTTP_G(request).error);
 #endif
 
        /* progress callback */
@@ -602,7 +602,7 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, const
                switch (body->type)
                {
                        case HTTP_REQUEST_BODY_CSTRING:
-                               curl_easy_setopt(ch, CURLOPT_POSTFIELDS, (char *) body->data);
+                               curl_easy_setopt(ch, CURLOPT_POSTFIELDS, body->data);
                                curl_easy_setopt(ch, CURLOPT_POSTFIELDSIZE, body->size);
                        break;
 
@@ -611,8 +611,7 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, const
                        break;
 
                        case HTTP_REQUEST_BODY_UPLOADFILE:
-                       case HTTP_REQUEST_BODY_UPLOADDATA:
-                               curl_easy_setopt(ch, CURLOPT_READDATA, body);
+                               curl_easy_setopt(ch, CURLOPT_READDATA, http_curl_callback_data(body));
                                curl_easy_setopt(ch, CURLOPT_INFILESIZE, body->size);
                        break;
 
@@ -703,10 +702,23 @@ PHP_HTTP_API void _http_request_info(CURL *ch, HashTable *info TSRMLS_DC)
 /* {{{ STATUS http_request_ex(CURL *, http_request_method, char *, http_request_body, HashTable, HashTable, phpstr *) */
 PHP_HTTP_API STATUS _http_request_ex(CURL *ch, http_request_method meth, const char *url, http_request_body *body, HashTable *options, HashTable *info, phpstr *response TSRMLS_DC)
 {
-       if (SUCCESS != http_request_init(ch, meth, url, body, options, response)) {
-               return FAILURE;
+       STATUS status;
+       zend_bool clean_curl;
+
+       if ((clean_curl = (!ch))) {
+               if (!(ch = curl_easy_init())) {
+                       http_error(E_WARNING, HTTP_E_CURL, "Could not initialize curl.");
+                       return FAILURE;
+               }
+       }
+
+       status =        ((SUCCESS == http_request_init(ch, meth, url, body, options, response)) &&
+                               (SUCCESS == http_request_exec(ch, info))) ? SUCCESS : FAILURE;
+
+       if (clean_curl) {
+               curl_easy_cleanup(ch);
        }
-       return http_request_exec(ch, info);
+       return status;
 }
 /* }}} */
 
@@ -847,7 +859,6 @@ PHP_HTTP_API STATUS _http_request_pool_attach(http_request_pool *pool, zval *req
                zval *info = GET_PROP_EX(req, request, responseInfo);
 
                if (SUCCESS != http_request_object_requesthandler(req, request, body)) {
-                       efree(body);
                        http_error_ex(E_WARNING, HTTP_E_CURL, "Could not initialize HttpRequest object for attaching to the HttpRequestPool");
                } else if (CURLM_OK != (code = curl_multi_add_handle(pool->ch, req->ch))) {
                        http_error_ex(E_WARNING, HTTP_E_CURL, "Could not attach HttpRequest object to the HttpRequestPool: %s", curl_multi_strerror(code));
@@ -858,6 +869,7 @@ PHP_HTTP_API STATUS _http_request_pool_attach(http_request_pool *pool, zval *req
                        zend_llist_add_element(&pool->bodies, &body);
                        return SUCCESS;
                }
+               efree(body);
        }
        return FAILURE;
 }
@@ -871,7 +883,7 @@ PHP_HTTP_API STATUS _http_request_pool_detach(http_request_pool *pool, zval *req
        fprintf(stderr, "Detaching request %p (pool: %p) from pool %p\n", req, req->pool, pool);
 #endif
        if (req->pool != pool) {
-               http_error_ex(E_WARNING, HTTP_E_CURL, "HttpRequest object is not attached to this HttpRequestPool (%p != %p)", req->pool, pool);
+               http_error(E_WARNING, HTTP_E_CURL, "HttpRequest object is not attached to this HttpRequestPool");
        } else {
                CURLMcode code;
 
@@ -1040,40 +1052,10 @@ static size_t http_curl_read_callback(void *data, size_t len, size_t n, void *s)
        static char *offset = NULL, *original = NULL;
        HTTP_CURL_CALLBACK_DATA(s, http_request_body *, body);
 
-       switch (body->type)
-       {
-               case HTTP_REQUEST_BODY_UPLOADFILE:
-               {
-                       TSRMLS_FETCH();
-                       return php_stream_read((php_stream *) body->data, data, len * n);
-               }
-               break;
-
-               case HTTP_REQUEST_BODY_UPLOADDATA:
-               {
-                       size_t avail;
-                       if (original != s) {
-                               original = offset = s;
-                       }
-                       if ((avail = body->size - (offset - original)) < 1) {
-                               return 0;
-                       }
-                       if (avail < (len * n)) {
-                               memcpy(data, offset, avail);
-                               offset += avail;
-                               return avail;
-                       } else {
-                               memcpy(data, offset, len * n);
-                               offset += len * n;
-                               return len * n;
-                       }
-               }
-               break;
-
-               default:
-                       return 0;
-               break;
+       if (body->type != HTTP_REQUEST_BODY_UPLOADFILE) {
+               return 0;
        }
+       return php_stream_read((php_stream *) body->data, data, len * n);
 }
 /* }}} */