- fix nested exception suppression and order

- allow detaching from request pool within onfinish() callback
  by adding llist safe request pool apply functions
- fix newly introduced leak in request method api

diff --git a/http_api.c b/http_api.c
index acff118b1f9edd40b9d678f549a327a85e22c306..fef29305672e645a80fa4503f9ccae59c1a4cdae 100644 (file)
--- a/http_api.c
+++ b/http_api.c
@@ -116,33 +116,43 @@ void _http_error_ex(long type TSRMLS_DC, long code, const char *format, ...)
 /* {{{ zval *http_exception_wrap(zval *, zval *, zend_class_entry *) */
 zval *_http_exception_wrap(zval *old_exception, zval *new_exception, zend_class_entry *ce TSRMLS_DC)
 {
-       zval **args, **trace_0, *old_trace_0, *trace = NULL;
-       
        /* create wrapping exception if requested */
        if (!new_exception) {
+               zval **args, **trace_0, *old_trace_0, *trace = NULL;
+               
                MAKE_STD_ZVAL(new_exception);
                object_init_ex(new_exception, ce);
                zend_update_property_string(ce, new_exception, "message", lenof("message"), "Exception caused by inner exception(s)" TSRMLS_CC);
-       }
+               zend_update_property(Z_OBJCE_P(new_exception), new_exception, "innerException", lenof("innerException"), old_exception TSRMLS_CC);
        
-       /* copy bt arguments */
-       if ((trace = zend_read_property(ZEND_EXCEPTION_GET_DEFAULT(), old_exception, "trace", lenof("trace"), 0 TSRMLS_CC))) {
-               if (Z_TYPE_P(trace) == IS_ARRAY && SUCCESS == zend_hash_index_find(Z_ARRVAL_P(trace), 0, (void *) &trace_0)) {
-                       old_trace_0 = *trace_0;
-                       if (Z_TYPE_PP(trace_0) == IS_ARRAY && SUCCESS == zend_hash_find(Z_ARRVAL_PP(trace_0), "args", sizeof("args"), (void *) &args)) {
-                               if ((trace = zend_read_property(ZEND_EXCEPTION_GET_DEFAULT(), new_exception, "trace", lenof("trace"), 0 TSRMLS_CC))) {
-                                       if (Z_TYPE_P(trace) == IS_ARRAY && SUCCESS == zend_hash_index_find(Z_ARRVAL_P(trace), 0, (void *) &trace_0)) {
-                                               ZVAL_ADDREF(*args);
-                                               add_assoc_zval(*trace_0, "args", *args);
+               /* copy bt arguments */
+               if ((trace = zend_read_property(ZEND_EXCEPTION_GET_DEFAULT(), old_exception, "trace", lenof("trace"), 0 TSRMLS_CC))) {
+                       if (Z_TYPE_P(trace) == IS_ARRAY && SUCCESS == zend_hash_index_find(Z_ARRVAL_P(trace), 0, (void *) &trace_0)) {
+                               old_trace_0 = *trace_0;
+                               if (Z_TYPE_PP(trace_0) == IS_ARRAY && SUCCESS == zend_hash_find(Z_ARRVAL_PP(trace_0), "args", sizeof("args"), (void *) &args)) {
+                                       if ((trace = zend_read_property(ZEND_EXCEPTION_GET_DEFAULT(), new_exception, "trace", lenof("trace"), 0 TSRMLS_CC))) {
+                                               if (Z_TYPE_P(trace) == IS_ARRAY && SUCCESS == zend_hash_index_find(Z_ARRVAL_P(trace), 0, (void *) &trace_0)) {
+                                                       ZVAL_ADDREF(*args);
+                                                       add_assoc_zval(*trace_0, "args", *args);
+                                               }
                                        }
                                }
                        }
                }
+               
+               zval_ptr_dtor(&old_exception);
+               return new_exception;
+       } else {
+               zval *sub_exception = old_exception, *top_exception = old_exception;
+               
+               while ((sub_exception = zend_read_property(ZEND_EXCEPTION_GET_DEFAULT(), sub_exception, "innerException", lenof("innerException"), 0 TSRMLS_CC)) && Z_TYPE_P(sub_exception) == IS_OBJECT) {
+                       top_exception = sub_exception;
+               }
+               zend_update_property(Z_OBJCE_P(top_exception), top_exception, "innerException", lenof("innerException"), new_exception TSRMLS_CC);
+               
+               zval_ptr_dtor(&new_exception);
+               return old_exception;
        }
-       
-       zend_update_property(Z_OBJCE_P(new_exception), new_exception, "innerException", lenof("innerException"), old_exception TSRMLS_CC);
-       zval_ptr_dtor(&old_exception);
-       return new_exception;
 }
 /* }}} */
 #endif /* ZEND_ENGINE_2 */

diff --git a/http_functions.c b/http_functions.c
index 82597f4517f4d22aa91d79d8426878065fdcdc3a..a22bea3d98219f597588cd0b73b2063fa50c4137 100644 (file)
--- a/http_functions.c
+++ b/http_functions.c
@@ -1983,8 +1983,22 @@ PHP_FUNCTION(http_support)
 }
 /* }}} */
 
+#include "zend_exceptions.h"
 PHP_FUNCTION(http_test)
 {
+       int i;
+       
+       for (i = 0; i < 3; ++i) {
+               http_try {
+                       fprintf(stderr, "Throwing Ex %d\n", i);
+                       http_error_ex(HE_THROW, HTTP_E_RUNTIME, "Ex %d", i);
+                       http_try {
+                               fprintf(stderr, "Throwing SubEx %d\n", i);
+                               http_error_ex(HE_THROW, HTTP_E_RUNTIME, "SubEx %d", i);
+                       } http_catch(ZEND_EXCEPTION_GET_DEFAULT());
+               } http_catch(ZEND_EXCEPTION_GET_DEFAULT());
+       }
+       http_final(ZEND_EXCEPTION_GET_DEFAULT());
 }
 
 /*

diff --git a/http_request_method_api.c b/http_request_method_api.c
index 3359b28ad501f5fce3b474b7fbb0b80b7678f114..713fc5a1e8a0d00eadd1a1a8e5b9dcc588ffdf9f 100644 (file)
--- a/http_request_method_api.c
+++ b/http_request_method_api.c
@@ -260,7 +260,7 @@ PHP_HTTP_API STATUS _http_request_method_unregister(int method TSRMLS_DC)
        if (    (HTTP_CUSTOM_REQUEST_METHOD(method) < 0) ||
                        (HTTP_CUSTOM_REQUEST_METHOD(method) > HTTP_G->request.methods.custom.count) ||
                        (!ptr[HTTP_CUSTOM_REQUEST_METHOD(method)])) {
-               http_error_ex(HE_NOTICE, HTTP_E_REQUEST_METHOD, "Custom request method with id %lu does not exist", method);
+               http_error_ex(HE_NOTICE, HTTP_E_REQUEST_METHOD, "Custom request method with id %d does not exist", method);
                return FAILURE;
        }
        

diff --git a/http_request_pool_api.c b/http_request_pool_api.c
index 1c67148a723461127d561423d8b5fe9310f7d9ae..e93a078c0b7b1ac6cccc8dcc054b1888e253c17d 100644 (file)
--- a/http_request_pool_api.c
+++ b/http_request_pool_api.c
@@ -136,20 +136,41 @@ PHP_HTTP_API STATUS _http_request_pool_detach(http_request_pool *pool, zval *req
 }
 /* }}} */
 
-/* {{{ void http_request_pool_detach_all(http_request_pool *) */
-PHP_HTTP_API void _http_request_pool_detach_all(http_request_pool *pool TSRMLS_DC)
+/* {{{ void http_request_pool_apply(http_request_pool *, http_request_pool_apply_func) */
+PHP_HTTP_API void _http_request_pool_apply(http_request_pool *pool, http_request_pool_apply_func cb TSRMLS_DC)
 {
        int count = zend_llist_count(&pool->handles);
        
-#if HTTP_DEBUG_REQPOOLS
-       fprintf(stderr, "Detaching %d requests from pool %p\n", count, pool);
-#endif
+       if (count) {
+               int i = 0;
+               zend_llist_position pos;
+               zval **handle, **handles = emalloc(count * sizeof(zval *));
+
+               for (handle = zend_llist_get_first_ex(&pool->handles, &pos); handle; handle = zend_llist_get_next_ex(&pool->handles, &pos)) {
+                       handles[i++] = *handle;
+               }
+               
+               /* should never happen */
+               if (i != count) {
+                       zend_error(E_ERROR, "number of fetched request handles do not match overall count");
+                       count = i;
+               }
+               
+               for (i = 0; i < count; ++i) {
+                       if (cb(pool, handles[i] TSRMLS_CC)) {
+                               break;
+                       }
+               }
+               efree(handles);
+       }
+}
+/* }}} */
+
+/* {{{ void http_request_pool_apply_with_arg(http_request_pool *, http_request_pool_apply_with_arg_func, void *) */
+PHP_HTTP_API void _http_request_pool_apply_with_arg(http_request_pool *pool, http_request_pool_apply_with_arg_func cb, void *arg TSRMLS_DC)
+{
+       int count = zend_llist_count(&pool->handles);
        
-       /*
-        * we cannot apply a function to the llist which actually detaches
-        * the curl handle *and* removes the llist element --
-        * so let's get our hands dirty
-        */
        if (count) {
                int i = 0;
                zend_llist_position pos;
@@ -166,11 +187,24 @@ PHP_HTTP_API void _http_request_pool_detach_all(http_request_pool *pool TSRMLS_D
                }
                
                for (i = 0; i < count; ++i) {
-                       http_request_pool_detach(pool, handles[i]);
+                       if (cb(pool, handles[i], arg TSRMLS_CC)) {
+                               break;
+                       }
                }
                efree(handles);
        }
 }
+/* }}} */
+
+/* {{{ void http_request_pool_detach_all(http_request_pool *) */
+PHP_HTTP_API void _http_request_pool_detach_all(http_request_pool *pool TSRMLS_DC)
+{
+#if HTTP_DEBUG_REQPOOLS
+       fprintf(stderr, "Detaching %d requests from pool %p\n", zend_llist_count(&pool->handles), pool);
+#endif
+       http_request_pool_apply(pool, _http_request_pool_detach);
+}
+/* }}} */
 
 /* {{{ STATUS http_request_pool_send(http_request_pool *) */
 PHP_HTTP_API STATUS _http_request_pool_send(http_request_pool *pool TSRMLS_DC)
@@ -179,7 +213,7 @@ PHP_HTTP_API STATUS _http_request_pool_send(http_request_pool *pool TSRMLS_DC)
        fprintf(stderr, "Attempt to send %d requests of pool %p\n", zend_llist_count(&pool->handles), pool);
 #endif
        
-       while (http_request_pool_perform(pool)) {
+       while (http_request_pool_perform(pool, 0)) {
                if (SUCCESS != http_request_pool_select(pool)) {
 #ifdef PHP_WIN32
                        http_error(HE_WARNING, HTTP_E_SOCKET, WSAGetLastError());
@@ -239,7 +273,7 @@ PHP_HTTP_API STATUS _http_request_pool_select(http_request_pool *pool)
 /* }}} */
 
 /* {{{ int http_request_pool_perform(http_request_pool *) */
-PHP_HTTP_API int _http_request_pool_perform(http_request_pool *pool TSRMLS_DC)
+PHP_HTTP_API int _http_request_pool_perform(http_request_pool *pool, int once TSRMLS_DC)
 {
        CURLMsg *msg;
        int remaining = 0;
@@ -248,39 +282,43 @@ PHP_HTTP_API int _http_request_pool_perform(http_request_pool *pool TSRMLS_DC)
        
        while ((msg = curl_multi_info_read(pool->ch, &remaining))) {
                if (CURLMSG_DONE == msg->msg) {
-                       if (CURLE_OK != msg->data.result) {
+                               if (CURLE_OK != msg->data.result) {
+                                       http_request_pool_try {
+                                               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_pool_catch();
+                               }
                                http_request_pool_try {
-                                       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_pool_apply_with_arg(pool, _http_request_pool_responsehandler, msg->easy_handle);
                                } http_request_pool_catch();
-                       }
-                       http_request_pool_try {
-                               zend_llist_apply_with_argument(&pool->handles, (llist_apply_with_arg_func_t) http_request_pool_responsehandler, msg->easy_handle TSRMLS_CC);
-                       } http_request_pool_catch();
                }
        }
-       http_request_pool_final();
+       if (once || !pool->unfinished) {
+               http_request_pool_final();
+       }
        
        return pool->unfinished;
 }
 /* }}} */
 
-/* {{{ void http_request_pool_responsehandler(zval **) */
-void _http_request_pool_responsehandler(zval **req, CURL *ch TSRMLS_DC)
+/* {{{ void http_request_pool_responsehandler(http_request_pool *, zval *, void *) */
+int _http_request_pool_responsehandler(http_request_pool *pool, zval *req, void *ch TSRMLS_DC)
 {
-       getObjectEx(http_request_object, obj, *req);
+       getObjectEx(http_request_object, obj, req);
        
-       if (obj->request->ch == ch) {
+       if ((!ch) || obj->request->ch == (CURL *) ch) {
                
 #if HTTP_DEBUG_REQPOOLS
-               fprintf(stderr, "Fetching data from HttpRequest(#%d) %p of pool %p\n", Z_OBJ_HANDLE_PP(req), obj, obj->pool);
+               fprintf(stderr, "Fetching data from HttpRequest(#%d) %p of pool %p\n", Z_OBJ_HANDLE_P(req), obj, obj->pool);
 #endif
                
-               ZVAL_ADDREF(*req);
-               zend_llist_add_element(&obj->pool->finished, req);
-               http_request_object_responsehandler(obj, *req);
+               ZVAL_ADDREF(req);
+               zend_llist_add_element(&obj->pool->finished, &req);
+               http_request_object_responsehandler(obj, req);
+               return 1;
        }
+       return 0;
 }
 /* }}} */
 

diff --git a/http_requestpool_object.c b/http_requestpool_object.c
index 6ae9cd96443de98aa3e921ab3bf665d278846f07..665a65ccbe27e2036b6ba89defd3ab39dfd7fef9 100644 (file)
--- a/http_requestpool_object.c
+++ b/http_requestpool_object.c
@@ -353,7 +353,7 @@ PHP_METHOD(HttpRequestPool, socketPerform)
 
        NO_ARGS;
 
-       if (0 < http_request_pool_perform(&obj->pool)) {
+       if (0 < http_request_pool_perform(&obj->pool, 1)) {
                RETURN_TRUE;
        } else {
                RETURN_FALSE;

diff --git a/php_http_request_pool_api.h b/php_http_request_pool_api.h
index 19d9eb858378f20b0caf35bacabe4b578104025a..492a797393763cce8e285c01250d8aafdd5ff5f6 100644 (file)
--- a/php_http_request_pool_api.h
+++ b/php_http_request_pool_api.h
@@ -23,8 +23,11 @@ typedef struct _http_request_pool_t {
        int unfinished;
 } http_request_pool;
 
-#define http_request_pool_responsehandler _http_request_pool_responsehandler
-extern void _http_request_pool_responsehandler(zval **req, CURL *ch TSRMLS_DC);
+typedef int (*http_request_pool_apply_func)(http_request_pool *pool, zval *request TSRMLS_DC);
+typedef int (*http_request_pool_apply_with_arg_func)(http_request_pool *pool, zval *request, void *arg TSRMLS_DC);
+
+#define http_request_pool_responsehandler(p, r, c) _http_request_pool_responsehandler((p), (r), (c) TSRMLS_CC)
+extern int _http_request_pool_responsehandler(http_request_pool *pool, zval *req, void *ch TSRMLS_DC);
 
 #define http_request_pool_try http_try
 #define http_request_pool_catch() http_catch(HTTP_EX_CE(request_pool))
@@ -39,6 +42,12 @@ PHP_HTTP_API STATUS _http_request_pool_attach(http_request_pool *pool, zval *req
 #define http_request_pool_detach(p, r) _http_request_pool_detach((p), (r) TSRMLS_CC)
 PHP_HTTP_API STATUS _http_request_pool_detach(http_request_pool *pool, zval *request TSRMLS_DC);
 
+#define http_request_pool_apply(p, f) _http_request_pool_apply((p), (f) TSRMLS_CC)
+PHP_HTTP_API void _http_request_pool_apply(http_request_pool *pool, http_request_pool_apply_func cb TSRMLS_DC);
+
+#define http_request_pool_apply_with_arg(p, f, a) _http_request_pool_apply_with_arg((p), (f), (a) TSRMLS_CC)
+PHP_HTTP_API void _http_request_pool_apply_with_arg(http_request_pool *pool, http_request_pool_apply_with_arg_func cb, void *arg TSRMLS_DC);
+
 #define http_request_pool_detach_all(p) _http_request_pool_detach_all((p) TSRMLS_CC)
 PHP_HTTP_API void _http_request_pool_detach_all(http_request_pool *pool TSRMLS_DC);
 
@@ -48,8 +57,8 @@ PHP_HTTP_API STATUS _http_request_pool_send(http_request_pool *pool TSRMLS_DC);
 #define http_request_pool_select _http_request_pool_select
 PHP_HTTP_API STATUS _http_request_pool_select(http_request_pool *pool);
 
-#define http_request_pool_perform(p) _http_request_pool_perform((p) TSRMLS_CC)
-PHP_HTTP_API int _http_request_pool_perform(http_request_pool *pool TSRMLS_DC);
+#define http_request_pool_perform(p, o) _http_request_pool_perform((p), (o) TSRMLS_CC)
+PHP_HTTP_API int _http_request_pool_perform(http_request_pool *pool, int once TSRMLS_DC);
 
 #define http_request_pool_dtor(p) _http_request_pool_dtor((p) TSRMLS_CC)
 PHP_HTTP_API void _http_request_pool_dtor(http_request_pool *pool TSRMLS_DC);