X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http.c;h=dc8d7dd7c44f68bec6d5118320d88a7d25b8cc88;hp=e64840e3bbb8332990f207b2f5d13867f61486a2;hb=a52c5612eddc62880c3ff4b8b43f991f8d1e2523;hpb=e7c1206dcba5169d6d3d41b88a63db07a315cfc7

diff --git a/http.c b/http.c
index e64840e..dc8d7dd 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
@@ -186,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)
@@ -222,7 +224,9 @@ PHP_MINIT_FUNCTION(http)
 #ifdef ZEND_ENGINE_2
 	http_util_object_init();
 	http_message_object_init();
+#	ifndef WONKY
 	http_response_object_init();
+#	endif
 #	ifdef HTTP_HAVE_CURL
 	http_request_object_init();
 	http_requestpool_object_init();
@@ -230,10 +234,6 @@ 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;
 }
 /* }}} */
@@ -241,9 +241,6 @@ 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();
@@ -262,9 +259,6 @@ 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;
 }
 /* }}} */
@@ -272,9 +266,6 @@ 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;
 }