X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http.c;h=0acb05c33c85462ddcbc9e1b9214626082f185d4;hp=3b0588719324a8140363227e023e543f47552643;hb=b08947e98f1832091c8a9f6dea3799e0524d2822;hpb=3f8d6ea256f520d439cebc37c46bb93c30b2660e diff --git a/http.c b/http.c index 3b05887..0acb05c 100644 --- a/http.c +++ b/http.c @@ -139,6 +139,7 @@ static inline void http_globals_init(zend_http_globals *G) zend_llist_init(&G->request.copies.strings, sizeof(char *), http_request_data_free_string, 0); zend_llist_init(&G->request.copies.slists, sizeof(struct curl_slist *), http_request_data_free_slist, 0); zend_llist_init(&G->request.copies.contexts, sizeof(http_curl_callback_ctx *), http_request_data_free_context, 0); + zend_llist_init(&G->request.copies.convs, sizeof(http_curl_conv *), http_request_data_free_conv, 0); #endif } @@ -151,6 +152,7 @@ static inline void http_globals_free(zend_http_globals *G) zend_llist_clean(&G->request.copies.strings); zend_llist_clean(&G->request.copies.slists); zend_llist_clean(&G->request.copies.contexts); + zend_llist_clean(&G->request.copies.convs); #endif } /* }}} */ @@ -177,8 +179,11 @@ PHP_INI_MH(http_update_allowed_methods) } PHP_INI_BEGIN() - HTTP_PHP_INI_ENTRY("http.allowed_methods", NULL, PHP_INI_ALL, http_update_allowed_methods, request.methods.allowed) - HTTP_PHP_INI_ENTRY("http.cache_log", NULL, PHP_INI_ALL, OnUpdateString, log.cache) + 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) +#ifdef ZEND_ENGINE_2 + HTTP_PHP_INI_ENTRY("http.only_exceptions", "0", PHP_INI_ALL, OnUpdateBool, only_exceptions) +#endif PHP_INI_END() /* }}} */