- happy new year

[m6w6/ext-http] / http_exception_object.c

diff --git a/http_exception_object.c b/http_exception_object.c
index 3fc2bc90eb01e3d891edf166f01b222891ba99bc..8e1ffeedeed79a18c170484efcd688a6b5f4882f 100644 (file)
--- a/http_exception_object.c
+++ b/http_exception_object.c
@@ -6,7 +6,7 @@
     | 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>            |
     +--------------------------------------------------------------------+
 */
 
@@ -16,19 +16,14 @@
 #ifdef HAVE_CONFIG_H
 #      include "config.h"
 #endif
-#include "php.h"
 
-#ifdef ZEND_ENGINE_2
+#include "php_http.h"
 
-#include "zend_exceptions.h"
+#ifdef ZEND_ENGINE_2
 
-#include "php_http.h"
-#include "php_http_std_defs.h"
 #include "php_http_exception_object.h"
 
-#define HTTP_EX_DEF_CE http_exception_object_ce
 zend_class_entry *http_exception_object_ce;
-#define HTTP_EX_CE(name) http_ ##name## _exception_object_ce
 zend_class_entry *HTTP_EX_CE(runtime);
 zend_class_entry *HTTP_EX_CE(header);
 zend_class_entry *HTTP_EX_CE(malformed_headers);
@@ -57,6 +52,8 @@ PHP_MINIT_FUNCTION(http_exception_object)
        HTTP_REGISTER_EXCEPTION(HttpSocketException, HTTP_EX_CE(socket), HTTP_EX_DEF_CE);
        HTTP_REGISTER_EXCEPTION(HttpResponseException, HTTP_EX_CE(response), HTTP_EX_DEF_CE);
        HTTP_REGISTER_EXCEPTION(HttpUrlException, HTTP_EX_CE(url), HTTP_EX_DEF_CE);
+       
+       zend_declare_property_null(HTTP_EX_CE(request_pool), "exceptionStack", lenof("exceptionStack"), ZEND_ACC_PUBLIC TSRMLS_CC);
 
        HTTP_LONG_CONSTANT("HTTP_E_RUNTIME", HTTP_E_RUNTIME);
        HTTP_LONG_CONSTANT("HTTP_E_INVALID_PARAM", HTTP_E_INVALID_PARAM);