X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http.c;h=528f8bad300a77dac1dfaaaa6c5fbf19abc835fe;hp=b14befebaee917925b89edb31ced7549a479eefd;hb=bb1f32fd5d06b9b9ace6517c177b0fe58c9ff57c;hpb=ff17beb99d61462cf1791eecdb3f68dbd2aea5e5 diff --git a/http.c b/http.c index b14befe..528f8ba 100644 --- a/http.c +++ b/http.c @@ -250,12 +250,6 @@ PHP_INI_BEGIN() PHP_INI_END() /* }}} */ -/* {{{ SSL */ -#ifdef HTTP_NEED_SSL - -#endif -/* }}} */ - /* {{{ PHP_MINIT_FUNCTION */ PHP_MINIT_FUNCTION(http) { @@ -268,6 +262,9 @@ PHP_MINIT_FUNCTION(http) if (SUCCESS != http_cache_global_init()) { return FAILURE; } + if (SUCCESS != http_request_method_global_init()) { + return FAILURE; + } #ifdef HTTP_HAVE_CURL if (SUCCESS != http_request_global_init()) { return FAILURE; @@ -319,6 +316,13 @@ PHP_RINIT_FUNCTION(http) /* {{{ PHP_RSHUTDOWN_FUNCTION */ PHP_RSHUTDOWN_FUNCTION(http) { +#if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL) + int i, c = zend_hash_num_elements(&HTTP_G(request).methods.custom); + + for (i = 0; i < c; ++i) { + http_request_method_unregister(HTTP_MAX_REQUEST_METHOD + i); + } +#endif http_globals_free(HTTP_GLOBALS); return SUCCESS; }