- typos & allow passing NULL as curl handle in http_request() again'

diff --git a/http_request_api.c b/http_request_api.c
index 4cf683475dd56658d5226dc705c9801393c0bd5a..eb4d6271aa238326ffd368a760a332e9526e8cc1 100644 (file)
--- a/http_request_api.c
+++ b/http_request_api.c
@@ -702,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;
+               }
        }
-       return http_request_exec(ch, info);
+
+       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 status;
 }
 /* }}} */
 
@@ -846,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));
@@ -857,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;
 }
@@ -870,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;
 

diff --git a/php_http_request_api.h b/php_http_request_api.h
index 194a12e723d69cc06228257ae64a6c82117b7ab7..4b642e4625d47644f6196ebd3d175e76c6c959da 100644 (file)
--- a/php_http_request_api.h
+++ b/php_http_request_api.h
@@ -92,7 +92,7 @@ extern void _http_request_data_free_string(void *string);
 extern void _http_request_data_free_slist(void *list);
 
 #define http_request_pool_responsehandler _http_request_pool_responsehandler
-extern void http_request_pool_responsehandler(zval **req TSRMLS_DC);
+extern void _http_request_pool_responsehandler(zval **req TSRMLS_DC);
 
 #define http_request_global_init _http_request_global_init
 extern STATUS _http_request_global_init(void);