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

diff --git a/http.c b/http.c
index 1c901d1..599cc7e 100644
--- a/http.c
+++ b/http.c
@@ -102,8 +102,6 @@ function_entry http_functions[] = {
 	PHP_FE(http_request_method_exists, NULL)
 	PHP_FE(http_request_method_name, NULL)
 #endif
-	PHP_FE(http_auth_basic, NULL)
-	PHP_FE(http_auth_basic_cb, NULL)
 #ifndef ZEND_ENGINE_2
 	PHP_FE(http_build_query, NULL)
 #endif
@@ -134,9 +132,13 @@ zend_module_entry http_module_entry = {
 int http_module_number;
 
 /* {{{ http_globals */
-static inline void http_globals_init(zend_http_globals *G)
+static void http_globals_init_once(zend_http_globals *G)
 {
 	memset(G, 0, sizeof(zend_http_globals));
+}
+
+static inline void http_globals_init(zend_http_globals *G)
+{
 	G->send.buffer_size = HTTP_SENDBUF_SIZE;
 	zend_hash_init(&G->request.methods.custom, 0, NULL, ZVAL_PTR_DTOR, 0);
 #ifdef HTTP_HAVE_CURL
@@ -149,8 +151,8 @@ static inline void http_globals_init(zend_http_globals *G)
 
 static inline void http_globals_free(zend_http_globals *G)
 {
-	STR_FREE(G->send.content_type);
-	STR_FREE(G->send.unquoted_etag);
+	STR_SET(G->send.content_type, NULL);
+	STR_SET(G->send.unquoted_etag, NULL);
 	zend_hash_destroy(&G->request.methods.custom);
 #ifdef HTTP_HAVE_CURL
 	zend_llist_clean(&G->request.copies.strings);
@@ -182,6 +184,10 @@ PHP_INI_MH(http_update_allowed_methods)
 	return OnUpdateString(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC);
 }
 
+#ifndef ZEND_ENGINE_2
+#	define OnUpdateLong OnUpdateInt
+#endif
+
 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)
@@ -201,9 +207,7 @@ PHP_MINIT_FUNCTION(http)
 {
 	http_module_number = module_number;
 
-#ifdef ZTS
-	ZEND_INIT_MODULE_GLOBALS(http, NULL, NULL)
-#endif
+	ZEND_INIT_MODULE_GLOBALS(http, http_globals_init_once, NULL)
 
 	REGISTER_INI_ENTRIES();
 	
@@ -239,7 +243,9 @@ PHP_MINIT_FUNCTION(http)
 /* {{{ PHP_MSHUTDOWN_FUNCTION */
 PHP_MSHUTDOWN_FUNCTION(http)
 {
+#ifdef ZEND_ENGINE_2
 	zend_hash_destroy(&http_response_statics);
+#endif
 	UNREGISTER_INI_ENTRIES();
 #ifdef HTTP_HAVE_CURL
 	curl_global_cleanup();
@@ -258,7 +264,9 @@ PHP_RINIT_FUNCTION(http)
 	}
 
 	http_globals_init(HTTP_GLOBALS);
+#ifdef ZEND_ENGINE_2
 	zend_init_static_properties(http_response_object_ce, &http_response_statics TSRMLS_CC);
+#endif
 	return SUCCESS;
 }
 /* }}} */