- attempt to fix gcc-2.95 build by using less HTTP_HAVE_$EXT magic

[m6w6/ext-http] / http.c

diff --git a/http.c b/http.c
index 65c0d91c8918a3cd015fe053522f0fe0f7fde5d4..348940b6bad82e654832dd159ade4b6f48aef538 100644 (file)
--- a/http.c
+++ b/http.c
@@ -137,16 +137,16 @@ PHP_MINFO_FUNCTION(http);
 /* {{{ http_module_dep */
 #if ZEND_EXTENSION_API_NO >= 220050617
 static zend_module_dep http_module_deps[] = {
-#      ifdef HAVE_SPL
+#      ifdef HTTP_HAVE_SPL
        ZEND_MOD_REQUIRED("spl")
 #      endif
-#      ifdef HTTP_HAVE_EXT_HASH
+#      ifdef HTTP_HAVE_HASH
        ZEND_MOD_REQUIRED("hash")
 #      endif
-#      ifdef HAVE_PHP_SESSION
+#      ifdef HTTP_HAVE_SESSION
        ZEND_MOD_REQUIRED("session")
 #      endif
-#      ifdef HAVE_ICONV
+#      ifdef HTTP_HAVE_ICONV
        ZEND_MOD_REQUIRED("iconv")
 #      endif
        {NULL, NULL, NULL, 0}
@@ -191,6 +191,7 @@ static inline void _http_globals_init(zend_http_globals *G TSRMLS_DC)
        G->request.time = time(NULL);
 #endif
        G->send.buffer_size = HTTP_SENDBUF_SIZE;
+       G->send.not_found_404 = 1;
        G->read_post_data = 0;
 }
 
@@ -231,6 +232,7 @@ PHP_INI_BEGIN()
        HTTP_PHP_INI_ENTRY("http.etag.mode", "MD5", PHP_INI_ALL, OnUpdateString, etag.mode)
        HTTP_PHP_INI_ENTRY("http.log.cache", "", PHP_INI_ALL, OnUpdateString, log.cache)
        HTTP_PHP_INI_ENTRY("http.log.redirect", "", PHP_INI_ALL, OnUpdateString, log.redirect)
+       HTTP_PHP_INI_ENTRY("http.log.not_found", "", PHP_INI_ALL, OnUpdateString, log.not_found)
        HTTP_PHP_INI_ENTRY("http.log.allowed_methods", "", PHP_INI_ALL, OnUpdateString, log.allowed_methods)
        HTTP_PHP_INI_ENTRY("http.log.composite", "", PHP_INI_ALL, OnUpdateString, log.composite)
        HTTP_PHP_INI_ENTRY("http.request.methods.allowed", "", PHP_INI_ALL, http_update_allowed_methods, request.methods.allowed)
@@ -241,6 +243,7 @@ PHP_INI_BEGIN()
        HTTP_PHP_INI_ENTRY("http.send.deflate.start_auto", "0", PHP_INI_PERDIR|PHP_INI_SYSTEM, OnUpdateBool, send.deflate.start_auto)
        HTTP_PHP_INI_ENTRY("http.send.deflate.start_flags", "0", PHP_INI_ALL, OnUpdateLong, send.deflate.start_flags)
 #endif
+       HTTP_PHP_INI_ENTRY("http.send.not_found_404", "1", PHP_INI_ALL, OnUpdateBool, send.not_found_404)
 #ifdef ZEND_ENGINE_2
        HTTP_PHP_INI_ENTRY("http.only_exceptions", "0", PHP_INI_ALL, OnUpdateBool, only_exceptions)
 #endif