| 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"
# define HTTP_DEBUG_REQPOOLS 0
#endif
-ZEND_EXTERN_MODULE_GLOBALS(http);
-
#ifndef HAVE_CURL_MULTI_STRERROR
# define curl_multi_strerror(dummy) "unknown error"
#endif
/* 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){