- request pools for ZE2 only yet

[m6w6/ext-http] / http_request_api.c

diff --git a/http_request_api.c b/http_request_api.c
index ca91a28cae071e142c99430bbfce41a5ceca5a7b..722e0b5a3ddd8b7e46d8eaeac0aed20deb757cb6 100644 (file)
--- a/http_request_api.c
+++ b/http_request_api.c
@@ -48,14 +48,6 @@ ZEND_EXTERN_MODULE_GLOBALS(http)
 
 #if LIBCURL_VERSION_NUM < 0x070c00
 #      define curl_easy_strerror(code) HTTP_G(request).error
-#      ifndef curl_multi_strerror
-               static char *curl_multi_strerror(int code)
-               {
-                       char message[256] = {0};
-                       snprintf(message, 255, "Unknown HttpRequestPool error (curl multi code: %d)", code);
-                       return http_request_data_copy(COPY_STRING, message);
-               }
-#endif
 #endif
 
 #define HTTP_CURL_INFO(I) HTTP_CURL_INFO_EX(I, I)
@@ -122,11 +114,6 @@ static size_t http_curl_read_callback(void *, size_t, size_t, void *);
 static int http_curl_progress_callback(void *, double, double, double, double);
 static int http_curl_debug_callback(CURL *, curl_infotype, char *, size_t, void *);
 
-typedef struct {
-       void ***tsrm_ctx;
-       void *data;
-} http_curl_callback_ctx;
-
 #define HTTP_CURL_CALLBACK_DATA(from, type, var) \
        http_curl_callback_ctx *__CTX = (http_curl_callback_ctx *) (from); \
        TSRMLS_FETCH_FROM_CTX(__CTX->tsrm_ctx); \
@@ -185,6 +172,12 @@ void *_http_request_data_copy(int type, void *data TSRMLS_DC)
                        return data;
                }
 
+               case COPY_CONTEXT:
+               {
+                       zend_llist_add_element(&HTTP_G(request).copies.contexts, &data);
+                       return data;
+               }
+
                default:
                {
                        return data;
@@ -207,6 +200,13 @@ void _http_request_data_free_slist(void *list)
 }
 /* }}} */
 
+/* {{{ _http_request_data_free_context(http_curl_callback_ctx **) */
+void _http_request_data_free_context(void *context)
+{
+       efree(*((http_curl_callback_ctx **) context));
+}
+/* }}} */
+
 /* {{{ http_request_body *http_request_body_new() */
 PHP_HTTP_API http_request_body *_http_request_body_new(TSRMLS_D)
 {
@@ -819,7 +819,7 @@ PHP_HTTP_API STATUS _http_request_method_unregister(unsigned long method TSRMLS_
 }
 /* }}} */
 
-
+#ifdef ZEND_ENGINE_2
 /* {{{ http_request_pool *http_request_pool_init(http_request_pool *) */
 PHP_HTTP_API http_request_pool *_http_request_pool_init(http_request_pool *pool TSRMLS_DC)
 {
@@ -868,14 +868,17 @@ PHP_HTTP_API STATUS _http_request_pool_attach(http_request_pool *pool, zval *req
 
                if (SUCCESS != http_request_object_requesthandler(req, request, 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));
                } else {
-                       req->pool = pool;
-                       zval_add_ref(&request);
-                       zend_llist_add_element(&pool->handles, &request);
-                       zend_llist_add_element(&pool->bodies, &body);
-                       return SUCCESS;
+                       code = curl_multi_add_handle(pool->ch, req->ch);
+                       if ((CURLM_OK != code) && (CURLM_CALL_MULTI_PERFORM != code)) {
+                               http_error_ex(E_WARNING, HTTP_E_CURL, "Could not attach HttpRequest object to the HttpRequestPool: %s", curl_multi_strerror(code));
+                       } else {
+                               req->pool = pool;
+                               zval_add_ref(&request);
+                               zend_llist_add_element(&pool->handles, &request);
+                               zend_llist_add_element(&pool->bodies, &body);
+                               return SUCCESS;
+                       }
                }
                efree(body);
        }
@@ -1007,6 +1010,7 @@ static void http_request_pool_freehandle(zval **request, http_request_pool *pool
 #endif
 }
 /* }}} */
+#endif /* ZEND_ENGINE_2 */
 
 /* {{{ char *http_request_methods[] */
 static const char *const http_request_methods[] = {
@@ -1073,7 +1077,7 @@ static http_curl_callback_ctx *_http_curl_callback_data(void *data TSRMLS_DC)
        http_curl_callback_ctx *ctx = emalloc(sizeof(http_curl_callback_ctx));
        TSRMLS_SET_CTX(ctx->tsrm_ctx);
        ctx->data = data;
-       return ctx;
+       return http_request_data_copy(COPY_CONTEXT, ctx);
 }
 /* }}} */