X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_exception_object.c;h=9074005aed96ad137d83b5ece270f86676c3ef46;hp=60966a9bbaf8e9ae03fe5c8036792fcbb736daec;hb=9676c81efbb8f180fa189d71a7ecb50dde4f5646;hpb=cc9f67a6e5d50fc0c870a19d98e35e05f03d9b68

diff --git a/http_exception_object.c b/http_exception_object.c
index 60966a9..9074005 100644
--- a/http_exception_object.c
+++ b/http_exception_object.c
@@ -6,17 +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
-
 #include "php_http.h"
 
 #ifdef ZEND_ENGINE_2
@@ -36,10 +31,14 @@ 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());
+	
+	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);
@@ -52,9 +51,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);
+	HTTP_REGISTER_EXCEPTION(HttpQueryStringException, HTTP_EX_CE(querystring), HTTP_EX_DEF_CE);
 	
-	zend_declare_property_null(HTTP_EX_CE(request_pool), "requestExceptions", sizeof("requestExceptions")-1, 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);
@@ -67,6 +65,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;
 }
@@ -80,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;
@@ -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;