X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http_request_pool_api.c;h=e9473e31741b61816b78ed987b68ce38a8830ecf;hb=3fcfaba41748c3fd452e84ba6da6ea2d91f28e5e;hp=83c5c5902eccb648ffc238fdb74defea32bbb0f2;hpb=7b88d9022c90eb12e5fe195af8644935141c9d68;p=m6w6%2Fext-http

diff --git a/http_request_pool_api.c b/http_request_pool_api.c
index 83c5c59..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"
 
@@ -292,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"));