X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_request_pool_api.c;h=e9473e31741b61816b78ed987b68ce38a8830ecf;hp=a24f7328e26dffd5d64556d6cd8dcb92eace7a28;hb=988f1d1ea97c689b9b7d288b0efe5b93dd0eb04a;hpb=649aada485583ccac67928e0700cb5f1b963f4e8

diff --git a/http_request_pool_api.c b/http_request_pool_api.c
index a24f732..e9473e3 100644
--- a/http_request_pool_api.c
+++ b/http_request_pool_api.c
@@ -6,16 +6,12 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2005, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2006, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
 /* $Id$ */
 
-#ifdef HAVE_CONFIG_H
-#	include "config.h"
-#endif
-
 #define HTTP_WANT_CURL
 #include "php_http.h"
 
@@ -32,8 +28,6 @@
 #	define HTTP_DEBUG_REQPOOLS 0
 #endif
 
-ZEND_EXTERN_MODULE_GLOBALS(http);
-
 #ifndef HAVE_CURL_MULTI_STRERROR
 #	define curl_multi_strerror(dummy) "unknown error"
 #endif
@@ -294,12 +288,12 @@ static void move_backtrace_args(zval *from, zval *to TSRMLS_DC)
 {
 	zval **args, **trace_0, *old_trace_0, *trace = NULL;
 	
-	if ((trace = zend_read_property(zend_exception_get_default(), from, "trace", lenof("trace"), 0 TSRMLS_CC))) {
-		if (SUCCESS == zend_hash_index_find(Z_ARRVAL_P(trace), 0, (void **) &trace_0)) {
+	if ((trace = zend_read_property(ZEND_EXCEPTION_GET_DEFAULT(), from, "trace", lenof("trace"), 0 TSRMLS_CC))) {
+		if (SUCCESS == zend_hash_index_find(Z_ARRVAL_P(trace), 0, (void *) &trace_0)) {
 			old_trace_0 = *trace_0;
-			if (SUCCESS == zend_hash_find(Z_ARRVAL_PP(trace_0), "args", sizeof("args"), (void **) &args)) {
-				if ((trace = zend_read_property(zend_exception_get_default(), to, "trace", lenof("trace"), 0 TSRMLS_CC))) {
-					if (SUCCESS == zend_hash_index_find(Z_ARRVAL_P(trace), 0, (void **) &trace_0)) {
+			if (SUCCESS == zend_hash_find(Z_ARRVAL_PP(trace_0), "args", sizeof("args"), (void *) &args)) {
+				if ((trace = zend_read_property(ZEND_EXCEPTION_GET_DEFAULT(), to, "trace", lenof("trace"), 0 TSRMLS_CC))) {
+					if (SUCCESS == zend_hash_index_find(Z_ARRVAL_P(trace), 0, (void *) &trace_0)) {
 						ZVAL_ADDREF(*args);
 						add_assoc_zval(*trace_0, "args", *args);
 						zend_hash_del(Z_ARRVAL_P(old_trace_0), "args", sizeof("args"));
@@ -317,14 +311,17 @@ void _http_request_pool_wrap_exception(zval *old_exception, zval *new_exception
 	/*	if old_exception is already an HttpRequestPoolException append the new one, 
 		else create a new HttpRequestPoolException and append the old and new exceptions */
 	if (old_exception && Z_OBJCE_P(old_exception) == ce) {
-		zval *exprop;
+		zval *old_exprop, *new_exprop;
 		
-		exprop = zend_read_property(ce, old_exception, "exceptionStack", lenof("exceptionStack"), 0 TSRMLS_CC);
-		SEP_PROP(&exprop);
-		convert_to_array(exprop);
-		
-		add_next_index_zval(exprop, new_exception);
-		zend_update_property(ce, old_exception, "exceptionStack", lenof("exceptionStack"), exprop TSRMLS_CC);
+		MAKE_STD_ZVAL(new_exprop);
+		array_init(new_exprop);
+		old_exprop = zend_read_property(ce, old_exception, "exceptionStack", lenof("exceptionStack"), 0 TSRMLS_CC);
+		if (Z_TYPE_P(old_exprop) == IS_ARRAY) {
+			array_copy(old_exprop, new_exprop);
+		}
+		add_next_index_zval(new_exprop, new_exception);
+		zend_update_property(ce, old_exception, "exceptionStack", lenof("exceptionStack"), new_exprop TSRMLS_CC);
+		zval_ptr_dtor(&new_exprop);
 		
 		EG(exception) = old_exception;
 	} else if (new_exception && Z_OBJCE_P(new_exception) != ce){