From: Michael Wallner <mike@php.net>
Date: Wed, 16 Nov 2005 21:33:27 +0000 (+0000)
Subject: - fix PHP4 build
X-Git-Tag: RELEASE_0_19_0~16
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=09c63e9aa5d552e91db75dcf5bc64ba33923348f;p=m6w6%2Fext-http

- fix PHP4 build
---

diff --git a/http.c b/http.c
index 38f91f8..6695ff9 100644
--- a/http.c
+++ b/http.c
@@ -30,13 +30,13 @@
 #include "php_http_send_api.h"
 #include "php_http_cache_api.h"
 #include "php_http_headers_api.h"
-#include "php_http_filter_api.h"
 #include "php_http_request_method_api.h"
 #ifdef HTTP_HAVE_CURL
 #	include "php_http_request_api.h"
 #endif
 
 #ifdef ZEND_ENGINE_2
+#	include "php_http_filter_api.h"
 #	include "php_http_util_object.h"
 #	include "php_http_message_object.h"
 #	ifndef WONKY
@@ -293,7 +293,6 @@ PHP_MINIT_FUNCTION(http)
 	if (	(SUCCESS != PHP_MINIT_CALL(http_support))	||
 			(SUCCESS != PHP_MINIT_CALL(http_headers))	||
 			(SUCCESS != PHP_MINIT_CALL(http_cache))		||
-			(SUCCESS != PHP_MINIT_CALL(http_filter))	||
 #ifdef HTTP_HAVE_CURL
 			(SUCCESS != PHP_MINIT_CALL(http_request))	||
 #endif /* HTTP_HAVE_CURL */
@@ -302,14 +301,15 @@ PHP_MINIT_FUNCTION(http)
 	}
 
 #ifdef ZEND_ENGINE_2
-	if (	(SUCCESS != PHP_MINIT_CALL(http_util_object))		||
+	if (	(SUCCESS != PHP_MINIT_CALL(http_filter))			||
+			(SUCCESS != PHP_MINIT_CALL(http_util_object))		||
 			(SUCCESS != PHP_MINIT_CALL(http_message_object))	||
 #	ifndef WONKY
 			(SUCCESS != PHP_MINIT_CALL(http_response_object))	||
 #	endif /* WONKY */
 #	ifdef HTTP_HAVE_CURL
 			(SUCCESS != PHP_MINIT_CALL(http_request_object))	||
-			(SUCCESS != PHP_MINIT_CALL(http_requestpool_object))	||
+			(SUCCESS != PHP_MINIT_CALL(http_requestpool_object))||
 #	endif /* HTTP_HAVE_CURL */
 			(SUCCESS != PHP_MINIT_CALL(http_exception_object))) {
 		return FAILURE;
diff --git a/http_filter_api.c b/http_filter_api.c
index 944bff2..fb44f02 100644
--- a/http_filter_api.c
+++ b/http_filter_api.c
@@ -17,6 +17,8 @@
 #endif
 #include "php.h"
 
+#ifdef ZEND_ENGINE_2
+
 #include "php_http_std_defs.h"
 #include "php_http_api.h"
 #include "php_http_filter_api.h"
@@ -306,6 +308,8 @@ php_stream_filter_factory http_filter_factory = {
 	http_filter_create
 };
 
+#endif /* ZEND_ENGINE_2 */
+
 /*
  * Local variables:
  * tab-width: 4
diff --git a/php_http_filter_api.h b/php_http_filter_api.h
index d6783d8..726ac04 100644
--- a/php_http_filter_api.h
+++ b/php_http_filter_api.h
@@ -15,8 +15,10 @@
 #ifndef PHP_HTTP_FILTER_API_H
 #define PHP_HTTP_FILTER_API_H
 
+#ifdef ZEND_ENGINE_2
 php_stream_filter_factory http_filter_factory;
 PHP_MINIT_FUNCTION(http_filter);
+#endif
 
 #endif