X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http.c;h=61ee3e7f7b951e877db2b1ec50e7d25aed8b9145;hp=3b0588719324a8140363227e023e543f47552643;hb=3b56e96a9ebe6744c623879754ad24bea2f4773b;hpb=902d195a198f4976c8ff081a95cdd3e315c14f5f

diff --git a/http.c b/http.c
index 3b05887..61ee3e7 100644
--- a/http.c
+++ b/http.c
@@ -29,7 +29,9 @@
 #include "php_http_std_defs.h"
 #include "php_http_api.h"
 #include "php_http_send_api.h"
-#include "php_http_request_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 +44,7 @@
 #	include "php_http_exception_object.h"
 #endif
 
+#include "missing.h"
 #include "phpstr/phpstr.h"
 
 #ifdef HTTP_HAVE_CURL
@@ -81,7 +84,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)
@@ -139,6 +142,7 @@ static inline void http_globals_init(zend_http_globals *G)
 	zend_llist_init(&G->request.copies.strings, sizeof(char *), http_request_data_free_string, 0);
 	zend_llist_init(&G->request.copies.slists, sizeof(struct curl_slist *), http_request_data_free_slist, 0);
 	zend_llist_init(&G->request.copies.contexts, sizeof(http_curl_callback_ctx *), http_request_data_free_context, 0);
+	zend_llist_init(&G->request.copies.convs, sizeof(http_curl_conv *), http_request_data_free_conv, 0);
 #endif
 }
 
@@ -151,6 +155,7 @@ static inline void http_globals_free(zend_http_globals *G)
 	zend_llist_clean(&G->request.copies.strings);
 	zend_llist_clean(&G->request.copies.slists);
 	zend_llist_clean(&G->request.copies.contexts);
+	zend_llist_clean(&G->request.copies.convs);
 #endif
 }
 /* }}} */
@@ -177,8 +182,14 @@ PHP_INI_MH(http_update_allowed_methods)
 }
 
 PHP_INI_BEGIN()
-	HTTP_PHP_INI_ENTRY("http.allowed_methods", NULL, PHP_INI_ALL, http_update_allowed_methods, request.methods.allowed)
-	HTTP_PHP_INI_ENTRY("http.cache_log", NULL, PHP_INI_ALL, OnUpdateString, log.cache)
+	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
 PHP_INI_END()
 /* }}} */
 
@@ -195,7 +206,7 @@ PHP_MINIT_FUNCTION(http)
 	REGISTER_INI_ENTRIES();
 
 #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 */
@@ -211,6 +222,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;
 }
 /* }}} */
@@ -218,6 +233,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();
@@ -236,6 +252,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;
 }
 /* }}} */
@@ -243,6 +260,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;
 }
@@ -281,6 +301,7 @@ PHP_MINFO_FUNCTION(http)
 	}
 	php_info_print_table_end();
 
+#ifdef HTTP_HAVE_CURL
 	php_info_print_table_start();
 	{
 		unsigned i;
@@ -305,10 +326,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();
 	{