X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=http_functions.c;h=2018c276dcd3d350781de2a8d447e469aa006286;hb=5b55dee0720e8969d8b6ddd7fa3ef7a7f415abcc;hp=a22bea3d98219f597588cd0b73b2063fa50c4137;hpb=bcda0df869eb6c34df1b3ec6888070c76bb33065;p=m6w6%2Fext-http

diff --git a/http_functions.c b/http_functions.c
index a22bea3..2018c27 100644
--- a/http_functions.c
+++ b/http_functions.c
@@ -62,6 +62,10 @@ PHP_FUNCTION(http_date)
 }
 /* }}} */
 
+#if PHP_MAJOR_VERSION == 4 && PHP_MINOR_VERSION == 3 && PHP_RELEASE_VERSION < 10
+#	define php_url_parse_ex(u, l) php_url_parse(u)
+#endif
+
 /* {{{ proto string http_build_url([mixed url[, mixed parts[, int flags = HTTP_URL_REPLACE[, array &new_url]]]])
  *
  * Build an URL.
@@ -1151,7 +1155,7 @@ PHP_FUNCTION(http_get_request_headers)
 	NO_ARGS;
 
 	array_init(return_value);
-	http_get_request_headers(return_value);
+	http_get_request_headers(Z_ARRVAL_P(return_value));
 }
 /* }}} */
 
@@ -1983,22 +1987,8 @@ PHP_FUNCTION(http_support)
 }
 /* }}} */
 
-#include "zend_exceptions.h"
 PHP_FUNCTION(http_test)
 {
-	int i;
-	
-	for (i = 0; i < 3; ++i) {
-		http_try {
-			fprintf(stderr, "Throwing Ex %d\n", i);
-			http_error_ex(HE_THROW, HTTP_E_RUNTIME, "Ex %d", i);
-			http_try {
-				fprintf(stderr, "Throwing SubEx %d\n", i);
-				http_error_ex(HE_THROW, HTTP_E_RUNTIME, "SubEx %d", i);
-			} http_catch(ZEND_EXCEPTION_GET_DEFAULT());
-		} http_catch(ZEND_EXCEPTION_GET_DEFAULT());
-	}
-	http_final(ZEND_EXCEPTION_GET_DEFAULT());
 }
 
 /*