X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http.c;h=599cc7e19b6a9fde104b55ef4bae7fa5b5e268d1;hp=73d6f87283798cb7a9783beb3f8659520d448123;hb=a2a03258160b8dea5525a82c3251e0cbff4a3132;hpb=234dac3f03c6b7342bb70829bc9641268cab7156 diff --git a/http.c b/http.c index 73d6f87..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 @@ -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) @@ -241,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(); @@ -260,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; } /* }}} */