- remove unnecessary separation crud

[m6w6/ext-http] / http_request_pool_api.c

diff --git a/http_request_pool_api.c b/http_request_pool_api.c
index e67b142f5da7ebb29286a59125c82a542982a034..e5482b41da4778dc90661b82b11f59c01fd3f262 100644 (file)
--- a/http_request_pool_api.c
+++ b/http_request_pool_api.c
@@ -86,7 +86,7 @@ PHP_HTTP_API http_request_pool *_http_request_pool_init(http_request_pool *pool
        
        TSRMLS_SET_CTX(pool->tsrm_ls);
        
-#if HTTP_HAVE_EVENT
+#ifdef HTTP_HAVE_EVENT
        pool->timeout = ecalloc(1, sizeof(struct event));
        curl_multi_setopt(pool->ch, CURLMOPT_SOCKETDATA, pool);
        curl_multi_setopt(pool->ch, CURLMOPT_SOCKETFUNCTION, http_request_pool_socket_callback);
@@ -297,7 +297,7 @@ PHP_HTTP_API void _http_request_pool_dtor(http_request_pool *pool)
        fprintf(stderr, "Destructing request pool %p\n", pool);
 #endif
        
-#if HTTP_HAVE_EVENT
+#ifdef HTTP_HAVE_EVENT
        efree(pool->timeout);
 #endif
        
@@ -382,9 +382,8 @@ void _http_request_pool_responsehandler(http_request_pool *pool)
                msg = curl_multi_info_read(pool->ch, &remaining);
                if (msg && CURLMSG_DONE == msg->msg) {
                        if (CURLE_OK != msg->data.result) {
-                               http_request *r = NULL;
-                               curl_easy_getinfo(msg->easy_handle, CURLINFO_PRIVATE, &r);
-                               http_error_ex(HE_WARNING, HTTP_E_REQUEST, "%s; %s (%s)", curl_easy_strerror(msg->data.result), r?r->_error:"", r?r->url:"");
+                               http_request_storage *st = http_request_storage_get(msg->easy_handle);
+                               http_error_ex(HE_WARNING, HTTP_E_REQUEST, "%s; %s (%s)", curl_easy_strerror(msg->data.result), st?st->errorbuffer:"", st?st->url:"");
                        }
                        http_request_pool_apply_with_arg(pool, _http_request_pool_apply_responsehandler, msg->easy_handle);
                }