- add persistent cURL handle support

[m6w6/ext-http] / http_request_api.c

diff --git a/http_request_api.c b/http_request_api.c
index 6528b97d303c843eab4220bd81a557755f6ac10a..b9931c81dd35ca74611b01281021632ea7e5e396 100644 (file)
--- a/http_request_api.c
+++ b/http_request_api.c
@@ -21,6 +21,9 @@
 #include "php_http_api.h"
 #include "php_http_request_api.h"
 #include "php_http_url_api.h"
 #include "php_http_api.h"
 #include "php_http_request_api.h"
 #include "php_http_url_api.h"

+#ifdef HTTP_HAVE_PERSISTENT_HANDLES
+#      include "php_http_persistent_handle_api.h"
+#endif

 
 #ifdef ZEND_ENGINE_2
 #      include "php_http_request_object.h"
 
 #ifdef ZEND_ENGINE_2
 #      include "php_http_request_object.h"


@@ -109,6 +112,12 @@ PHP_MINIT_FUNCTION(http_request)
                return FAILURE;
        }
        
                return FAILURE;
        }
        

+#ifdef HTTP_HAVE_PERSISTENT_HANDLES
+       if (SUCCESS != http_persistent_handle_provide("http_request", curl_easy_init, curl_easy_cleanup)) {
+               return FAILURE;
+       }
+#endif
+       

        HTTP_LONG_CONSTANT("HTTP_AUTH_BASIC", CURLAUTH_BASIC);
        HTTP_LONG_CONSTANT("HTTP_AUTH_DIGEST", CURLAUTH_DIGEST);
        HTTP_LONG_CONSTANT("HTTP_AUTH_NTLM", CURLAUTH_NTLM);
        HTTP_LONG_CONSTANT("HTTP_AUTH_BASIC", CURLAUTH_BASIC);
        HTTP_LONG_CONSTANT("HTTP_AUTH_DIGEST", CURLAUTH_DIGEST);
        HTTP_LONG_CONSTANT("HTTP_AUTH_NTLM", CURLAUTH_NTLM);


@@ -176,10 +185,18 @@ static int http_curl_dummy_callback(char *data, size_t n, size_t l, void *s) { r
 static curlioerr http_curl_ioctl_callback(CURL *, curliocmd, void *);
 /* }}} */
 
 static curlioerr http_curl_ioctl_callback(CURL *, curliocmd, void *);
 /* }}} */
 

+#ifdef HTTP_HAVE_PERSISTENT_HANDLES
+#      define HTTP_CURL_HANDLE_CTOR(ch) (SUCCESS == http_persistent_handle_acquire("http_request", &(ch)))
+#      define HTTP_CURL_HANDLE_DTOR(chp) http_persistent_handle_release("http_request", (chp))
+#else
+#      define HTTP_CURL_HANDLE_CTOR(ch) ((ch) = curl_easy_init())
+#      define HTTP_CURL_HANDLE_DTOR(chp) curl_easy_cleanup(*(chp)); *(chp) = NULL
+#endif
+

 /* {{{ CURL *http_curl_init(http_request *) */
 PHP_HTTP_API CURL * _http_curl_init_ex(CURL *ch, http_request *request)
 {
 /* {{{ CURL *http_curl_init(http_request *) */
 PHP_HTTP_API CURL * _http_curl_init_ex(CURL *ch, http_request *request)
 {

-       if (ch || (ch = curl_easy_init())) {
+       if (ch || HTTP_CURL_HANDLE_CTOR(ch)) {

 #if defined(ZTS)
                curl_easy_setopt(ch, CURLOPT_NOSIGNAL, 1L);
 #endif
 #if defined(ZTS)
                curl_easy_setopt(ch, CURLOPT_NOSIGNAL, 1L);
 #endif


@@ -214,13 +231,12 @@ PHP_HTTP_API CURL * _http_curl_init_ex(CURL *ch, http_request *request)
 PHP_HTTP_API void _http_curl_free(CURL **ch)
 {
        if (*ch) {
 PHP_HTTP_API void _http_curl_free(CURL **ch)
 {
        if (*ch) {

-               /* avoid nasty segfaults with already cleaned up callbacks */

                curl_easy_setopt(*ch, CURLOPT_NOPROGRESS, 1L);
                curl_easy_setopt(*ch, CURLOPT_PROGRESSFUNCTION, NULL);
                curl_easy_setopt(*ch, CURLOPT_VERBOSE, 0L);
                curl_easy_setopt(*ch, CURLOPT_DEBUGFUNCTION, NULL);
                curl_easy_setopt(*ch, CURLOPT_NOPROGRESS, 1L);
                curl_easy_setopt(*ch, CURLOPT_PROGRESSFUNCTION, NULL);
                curl_easy_setopt(*ch, CURLOPT_VERBOSE, 0L);
                curl_easy_setopt(*ch, CURLOPT_DEBUGFUNCTION, NULL);

-               curl_easy_cleanup(*ch);
-               *ch = NULL;
+               
+               HTTP_CURL_HANDLE_DTOR(ch);

        }
 }
 /* }}} */
        }
 }
 /* }}} */