X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http_exception_object.c;h=06d464ec10e1256f1ad77bc1d0857bf41f34a260;hb=988f1d1ea97c689b9b7d288b0efe5b93dd0eb04a;hp=8e1ffeedeed79a18c170484efcd688a6b5f4882f;hpb=32e91737086db53bb1fd9ed9f79d693c43ec459f;p=m6w6%2Fext-http diff --git a/http_exception_object.c b/http_exception_object.c index 8e1ffee..06d464e 100644 --- a/http_exception_object.c +++ b/http_exception_object.c @@ -12,11 +12,6 @@ /* $Id$ */ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - #include "php_http.h" #ifdef ZEND_ENGINE_2 @@ -36,10 +31,11 @@ zend_class_entry *HTTP_EX_CE(request_pool); zend_class_entry *HTTP_EX_CE(socket); zend_class_entry *HTTP_EX_CE(response); zend_class_entry *HTTP_EX_CE(url); +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()); 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); @@ -52,6 +48,7 @@ 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); + 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); @@ -67,6 +64,7 @@ PHP_MINIT_FUNCTION(http_exception_object) HTTP_LONG_CONSTANT("HTTP_E_SOCKET", HTTP_E_SOCKET); HTTP_LONG_CONSTANT("HTTP_E_RESPONSE", HTTP_E_RESPONSE); HTTP_LONG_CONSTANT("HTTP_E_URL", HTTP_E_URL); + HTTP_LONG_CONSTANT("HTTP_E_QUERYSTRING", HTTP_E_QUERYSTRING); return SUCCESS; } @@ -94,6 +92,7 @@ zend_class_entry *_http_exception_get_for_code(long code) case HTTP_E_SOCKET: ex = HTTP_EX_CE(socket); break; case HTTP_E_RESPONSE: ex = HTTP_EX_CE(response); break; case HTTP_E_URL: ex = HTTP_EX_CE(url); break; + case HTTP_E_QUERYSTRING: ex = HTTP_EX_CE(querystring); break; } return ex;