X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http.c;h=4460d6950d2bd540d78d143c92af23925c99a785;hb=18e86b19915dec609896efdb4e969ab73d90cb5b;hp=62f86ab011d108cbdb08c042472eb6b5d6180079;hpb=96f5c917e43d94f2d5d7f092a09422db6b13f307;p=m6w6%2Fext-http diff --git a/http.c b/http.c index 62f86ab..4460d69 100644 --- a/http.c +++ b/http.c @@ -39,6 +39,7 @@ #include "php_http_std_defs.h" #include "php_http_api.h" #include "php_http_send_api.h" +#include "php_http_request_api.h" #ifdef ZEND_ENGINE_2 # include "php_http_util_object.h" @@ -146,8 +147,11 @@ static inline void http_globals_free(zend_http_globals *G) STR_FREE(G->send.content_type); STR_FREE(G->send.unquoted_etag); zend_hash_destroy(&G->request.methods.custom); +#ifdef HTTP_HAVE_CURL zend_llist_clean(&G->request.copies.strings); zend_llist_clean(&G->request.copies.slists); + zend_llist_clean(&G->request.copies.contexts); +#endif } /* }}} */ @@ -184,7 +188,10 @@ PHP_MINIT_FUNCTION(http) { http_module_number = module_number; - ZEND_INIT_MODULE_GLOBALS(http, NULL, NULL); +#ifdef ZTS + ZEND_INIT_MODULE_GLOBALS(http, NULL, NULL) +#endif + REGISTER_INI_ENTRIES(); #ifdef HTTP_HAVE_CURL