X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http.c;h=b1039ade5fa4024e3cb741a5afa0aaa5905436eb;hp=3d634d357e8bccdcba5ed4df38f2c884ce73df5c;hb=b0919f33875667baecb05888fba006d5652d68d1;hpb=efad267ce4b49489b03022d7decd94dcf244e71e diff --git a/http.c b/http.c index 3d634d3..b1039ad 100644 --- a/http.c +++ b/http.c @@ -150,8 +150,8 @@ static inline void http_globals_init(zend_http_globals *G) #ifdef HTTP_HAVE_CURL 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); + zend_llist_init(&G->request.copies.contexts, sizeof(http_request_callback_ctx *), http_request_data_free_context, 0); + zend_llist_init(&G->request.copies.convs, sizeof(http_request_conv *), http_request_data_free_conv, 0); #endif } @@ -340,6 +340,11 @@ PHP_MINFO_FUNCTION(http) } #else php_info_print_table_row(2, "mhash ETag Generator:", "disabled"); +#endif +#if defined(HTTP_HAVE_MAGIC) && !defined(WONKY) + php_info_print_table_row(2, "magic MIME Guessing:", "libmagic/unknown"); +#else + php_info_print_table_row(2, "magic MIME Guessing:", "disabled"); #endif php_info_print_table_row(2, "Registered Classes:", #ifndef ZEND_ENGINE_2