X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http.c;h=1c901d17ed541a9c0043aea10214fe8ae72a9408;hp=0acb05c33c85462ddcbc9e1b9214626082f185d4;hb=061fbbe598d6e28b35c408b35beec1a6508abac9;hpb=b08947e98f1832091c8a9f6dea3799e0524d2822

diff --git a/http.c b/http.c
index 0acb05c..1c901d1 100644
--- a/http.c
+++ b/http.c
@@ -29,7 +29,10 @@
 #include "php_http_std_defs.h"
 #include "php_http_api.h"
 #include "php_http_send_api.h"
-#include "php_http_request_api.h"
+#include "php_http_cache_api.h"
+#ifdef HTTP_HAVE_CURL
+#	include "php_http_request_api.h"
+#endif
 
 #ifdef ZEND_ENGINE_2
 #	include "php_http_util_object.h"
@@ -42,6 +45,7 @@
 #	include "php_http_exception_object.h"
 #endif
 
+#include "missing.h"
 #include "phpstr/phpstr.h"
 
 #ifdef HTTP_HAVE_CURL
@@ -81,7 +85,7 @@ function_entry http_functions[] = {
 	PHP_FE(http_send_file, NULL)
 	PHP_FE(http_send_stream, NULL)
 	PHP_FE(http_chunked_decode, NULL)
-	PHP_FE(http_split_response, NULL)
+	PHP_FE(http_parse_message, NULL)
 	PHP_FE(http_parse_headers, NULL)
 	PHP_FE(http_get_request_headers, NULL)
 	PHP_FE(http_get_request_body, NULL)
@@ -181,9 +185,13 @@ PHP_INI_MH(http_update_allowed_methods)
 PHP_INI_BEGIN()
 	HTTP_PHP_INI_ENTRY("http.allowed_methods", "", PHP_INI_ALL, http_update_allowed_methods, request.methods.allowed)
 	HTTP_PHP_INI_ENTRY("http.cache_log", "", PHP_INI_ALL, OnUpdateString, log.cache)
+	HTTP_PHP_INI_ENTRY("http.redirect_log", "", PHP_INI_ALL, OnUpdateString, log.redirect)
+	HTTP_PHP_INI_ENTRY("http.allowed_methods_log", "", PHP_INI_ALL, OnUpdateString, log.allowed_methods)
+	HTTP_PHP_INI_ENTRY("http.composite_log", "", PHP_INI_ALL, OnUpdateString, log.composite)
 #ifdef ZEND_ENGINE_2
 	HTTP_PHP_INI_ENTRY("http.only_exceptions", "0", PHP_INI_ALL, OnUpdateBool, only_exceptions)
 #endif
+	HTTP_PHP_INI_ENTRY("http.etag_mode", "-2", PHP_INI_ALL, OnUpdateLong, etag.mode)
 PHP_INI_END()
 /* }}} */
 
@@ -198,9 +206,13 @@ PHP_MINIT_FUNCTION(http)
 #endif
 
 	REGISTER_INI_ENTRIES();
+	
+	HTTP_LONG_CONSTANT("HTTP_ETAG_MD5", HTTP_ETAG_MD5);
+	HTTP_LONG_CONSTANT("HTTP_ETAG_SHA1", HTTP_ETAG_SHA1);
+	HTTP_LONG_CONSTANT("HTTP_ETAG_MHASH", HTTP_ETAG_MHASH);
 
 #ifdef HTTP_HAVE_CURL
-	if (SUCCESS != http_request_global_init()) {
+	if (CURLE_OK != curl_global_init(CURL_GLOBAL_ALL)) {
 		return FAILURE;
 	}
 #endif /* HTTP_HAVE_CURL */
@@ -216,6 +228,10 @@ PHP_MINIT_FUNCTION(http)
 	http_exception_object_init();
 #endif /* ZEND_ENGINE_2 */
 
+#ifdef ZEND_ENGINE_2
+	zend_hash_init_ex(&http_response_statics, 0, NULL, ZVAL_INTERNAL_PTR_DTOR, 1, 0);
+	zend_fix_static_properties(http_response_object_ce, &http_response_statics TSRMLS_CC);
+#endif
 	return SUCCESS;
 }
 /* }}} */
@@ -223,6 +239,7 @@ PHP_MINIT_FUNCTION(http)
 /* {{{ PHP_MSHUTDOWN_FUNCTION */
 PHP_MSHUTDOWN_FUNCTION(http)
 {
+	zend_hash_destroy(&http_response_statics);
 	UNREGISTER_INI_ENTRIES();
 #ifdef HTTP_HAVE_CURL
 	curl_global_cleanup();
@@ -241,6 +258,7 @@ PHP_RINIT_FUNCTION(http)
 	}
 
 	http_globals_init(HTTP_GLOBALS);
+	zend_init_static_properties(http_response_object_ce, &http_response_statics TSRMLS_CC);
 	return SUCCESS;
 }
 /* }}} */
@@ -248,6 +266,9 @@ PHP_RINIT_FUNCTION(http)
 /* {{{ PHP_RSHUTDOWN_FUNCTION */
 PHP_RSHUTDOWN_FUNCTION(http)
 {
+#ifdef ZEND_ENGINE_2
+	zend_clean_static_properties(http_response_object_ce TSRMLS_CC);
+#endif
 	http_globals_free(HTTP_GLOBALS);
 	return SUCCESS;
 }
@@ -286,6 +307,7 @@ PHP_MINFO_FUNCTION(http)
 	}
 	php_info_print_table_end();
 
+#ifdef HTTP_HAVE_CURL
 	php_info_print_table_start();
 	{
 		unsigned i;
@@ -310,10 +332,11 @@ PHP_MINFO_FUNCTION(http)
 		php_info_print_table_row(2, "Custom Request Methods:",
 			PHPSTR_LEN(custom_request_methods) ? PHPSTR_VAL(custom_request_methods) : "none registered");
 
-		phpstr_free(known_request_methods);
-		phpstr_free(custom_request_methods);
+		phpstr_free(&known_request_methods);
+		phpstr_free(&custom_request_methods);
 	}
 	php_info_print_table_end();
+#endif
 
 	php_info_print_table_start();
 	{