- fix PHP4 build

diff --git a/http.c b/http.c
index 38f91f829d9841c3002a5607217912758742e893..6695ff9dedb324bad724789f4743cacc40c5387b 100644 (file)
--- 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 944bff241a8b7a31a06424b1ddc2dbe16eabb11f..fb44f026108972a26b3c3b6efb35ddab742d0309 100644 (file)
--- 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 d6783d8f5fb079c5aa1527804956f068db6efe8c..726ac043fc77e0f28fbaf3ac423b4ae6c7f4518d 100644 (file)
--- 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