X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http.c;h=348940b6bad82e654832dd159ade4b6f48aef538;hp=1d338647995718d39b9507eb3dfdca16de379ded;hb=84a00407857506ab8cfb9335cbe5f495a68e0880;hpb=98d8a1dced6ae8bde1953f439de7fd9c453e5971

diff --git a/http.c b/http.c
index 1d33864..348940b 100644
--- a/http.c
+++ b/http.c
@@ -107,7 +107,9 @@ zend_function_entry http_functions[] = {
 	PHP_FE(http_put_file, http_arg_pass_ref_4)
 	PHP_FE(http_put_stream, http_arg_pass_ref_4)
 	PHP_FE(http_request, http_arg_pass_ref_5)
+#ifdef HAVE_CURL_GETFORMDATA
 	PHP_FE(http_request_body_encode, NULL)
+#endif
 #endif
 	PHP_FE(http_request_method_register, NULL)
 	PHP_FE(http_request_method_unregister, NULL)
@@ -135,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}
@@ -189,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;
 }
 
@@ -229,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)
@@ -239,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