X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http.c;h=dfac09e70e166f66b6274947895d4c4ddd0e86a6;hp=0acb05c33c85462ddcbc9e1b9214626082f185d4;hb=f0b91eef34357ee6146faa2a2f88d4fac7c0d66c;hpb=b08947e98f1832091c8a9f6dea3799e0524d2822 diff --git a/http.c b/http.c index 0acb05c..dfac09e 100644 --- a/http.c +++ b/http.c @@ -29,7 +29,9 @@ #include "php_http_std_defs.h" #include "php_http_api.h" #include "php_http_send_api.h" -#include "php_http_request_api.h" +#ifdef HTTP_HAVE_CURL +# include "php_http_request_api.h" +#endif #ifdef ZEND_ENGINE_2 # include "php_http_util_object.h" @@ -81,6 +83,7 @@ function_entry http_functions[] = { PHP_FE(http_send_file, NULL) PHP_FE(http_send_stream, NULL) PHP_FE(http_chunked_decode, NULL) + PHP_FE(http_parse_message, NULL) PHP_FE(http_split_response, NULL) PHP_FE(http_parse_headers, NULL) PHP_FE(http_get_request_headers, NULL) @@ -200,7 +203,7 @@ PHP_MINIT_FUNCTION(http) REGISTER_INI_ENTRIES(); #ifdef HTTP_HAVE_CURL - if (SUCCESS != http_request_global_init()) { + if (CURLE_OK != curl_global_init(CURL_GLOBAL_ALL)) { return FAILURE; } #endif /* HTTP_HAVE_CURL */ @@ -286,6 +289,7 @@ PHP_MINFO_FUNCTION(http) } php_info_print_table_end(); +#ifdef HTTP_HAVE_CURL php_info_print_table_start(); { unsigned i; @@ -314,6 +318,7 @@ PHP_MINFO_FUNCTION(http) phpstr_free(custom_request_methods); } php_info_print_table_end(); +#endif php_info_print_table_start(); {