X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http.c;h=97899774f9f3a764f325d053bf076ecbb1476c0b;hp=3d634d357e8bccdcba5ed4df38f2c884ce73df5c;hb=d83edb65a0097de2d5baa1a9fd9dbcebed34cc79;hpb=efad267ce4b49489b03022d7decd94dcf244e71e

diff --git a/http.c b/http.c
index 3d634d3..9789977 100644
--- a/http.c
+++ b/http.c
@@ -71,7 +71,7 @@ ZEND_GET_MODULE(http)
 #endif
 
 /* {{{ http_functions[] */
-function_entry http_functions[] = {
+zend_function_entry http_functions[] = {
 	PHP_FE(http_test, NULL)
 	PHP_FE(http_date, NULL)
 	PHP_FE(http_absolute_uri, NULL)
@@ -112,7 +112,8 @@ function_entry http_functions[] = {
 	PHP_FE(http_build_query, NULL)
 #endif
 	PHP_FE(ob_etaghandler, NULL)
-	{NULL, NULL, NULL}
+	
+	EMPTY_FUNCTION_ENTRY
 };
 /* }}} */
 
@@ -150,8 +151,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 +341,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