- move some cruft of http_request_api.c to php_http_request_int.h

[m6w6/ext-http] / http_exception_object.c

diff --git a/http_exception_object.c b/http_exception_object.c
index 422f6ce70193e9f60595b7a30030ec04da62ff5b..9074005aed96ad137d83b5ece270f86676c3ef46 100644 (file)
--- a/http_exception_object.c
+++ b/http_exception_object.c
@@ -35,7 +35,10 @@ zend_class_entry *HTTP_EX_CE(querystring);
 
 PHP_MINIT_FUNCTION(http_exception_object)
 {
-       HTTP_REGISTER_EXCEPTION(HttpException, http_exception_object_ce, zend_exception_get_default());
+       HTTP_REGISTER_EXCEPTION(HttpException, http_exception_object_ce, ZEND_EXCEPTION_GET_DEFAULT());
+       
+       zend_declare_property_null(HTTP_EX_DEF_CE, "innerException", lenof("innerException"), ZEND_ACC_PUBLIC TSRMLS_CC);
+       
        HTTP_REGISTER_EXCEPTION(HttpRuntimeException, HTTP_EX_CE(runtime), HTTP_EX_DEF_CE);
        HTTP_REGISTER_EXCEPTION(HttpInvalidParamException, HTTP_EX_CE(invalid_param), HTTP_EX_DEF_CE);
        HTTP_REGISTER_EXCEPTION(HttpHeaderException, HTTP_EX_CE(header), HTTP_EX_DEF_CE);
@@ -50,8 +53,6 @@ PHP_MINIT_FUNCTION(http_exception_object)
        HTTP_REGISTER_EXCEPTION(HttpUrlException, HTTP_EX_CE(url), HTTP_EX_DEF_CE);
        HTTP_REGISTER_EXCEPTION(HttpQueryStringException, HTTP_EX_CE(querystring), 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);
        HTTP_LONG_CONSTANT("HTTP_E_HEADER", HTTP_E_HEADER);
@@ -78,8 +79,7 @@ zend_class_entry *_http_exception_get_for_code(long code)
 {
        zend_class_entry *ex = http_exception_object_ce;
 
-       switch (code)
-       {
+       switch (code) {
                case HTTP_E_RUNTIME:                                    ex = HTTP_EX_CE(runtime);                                       break;
                case HTTP_E_INVALID_PARAM:                              ex = HTTP_EX_CE(invalid_param);                         break;
                case HTTP_E_HEADER:                                             ex = HTTP_EX_CE(header);                                        break;