X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_exception_object.c;h=422f6ce70193e9f60595b7a30030ec04da62ff5b;hp=3fc2bc90eb01e3d891edf166f01b222891ba99bc;hb=f9a650f4b1ed0baad4a41f6e130991f328dc64b9;hpb=e83a7438dc70ed96630887246a1d3aefcf155b1c

diff --git a/http_exception_object.c b/http_exception_object.c
index 3fc2bc9..422f6ce 100644
--- a/http_exception_object.c
+++ b/http_exception_object.c
@@ -6,29 +6,19 @@
     | 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.h"
+#include "php_http.h"
 
 #ifdef ZEND_ENGINE_2
 
-#include "zend_exceptions.h"
-
-#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);
@@ -41,6 +31,7 @@ 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)
 {
@@ -57,6 +48,9 @@ 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);
 
 	HTTP_LONG_CONSTANT("HTTP_E_RUNTIME", HTTP_E_RUNTIME);
 	HTTP_LONG_CONSTANT("HTTP_E_INVALID_PARAM", HTTP_E_INVALID_PARAM);
@@ -70,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;
 }
@@ -97,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;