- fix INI entries

[m6w6/ext-http] / http.c

diff --git a/http.c b/http.c
index 2901a88c866863a7910c014b9d8dc73117534a07..0acb05c33c85462ddcbc9e1b9214626082f185d4 100644 (file)
--- a/http.c
+++ b/http.c
@@ -19,26 +19,17 @@
 #ifdef HAVE_CONFIG_H
 #      include "config.h"
 #endif
-
-#ifdef HTTP_HAVE_CURL
-#      ifdef PHP_WIN32
-#              include <winsock2.h>
-#      endif
-#      include <curl/curl.h>
-#endif
-
-#include <ctype.h>
-
 #include "php.h"
-#include "php_ini.h"
-#include "ext/standard/info.h"
 
 #include "SAPI.h"
+#include "php_ini.h"
+#include "ext/standard/info.h"
 
 #include "php_http.h"
 #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"
@@ -53,6 +44,15 @@
 
 #include "phpstr/phpstr.h"
 
+#ifdef HTTP_HAVE_CURL
+#      ifdef PHP_WIN32
+#              include <winsock2.h>
+#      endif
+#      include <curl/curl.h>
+#endif
+
+#include <ctype.h>
+
 ZEND_DECLARE_MODULE_GLOBALS(http);
 HTTP_DECLARE_ARG_PASS_INFO();
 
@@ -84,6 +84,7 @@ function_entry http_functions[] = {
        PHP_FE(http_split_response, NULL)
        PHP_FE(http_parse_headers, NULL)
        PHP_FE(http_get_request_headers, NULL)
+       PHP_FE(http_get_request_body, NULL)
        PHP_FE(http_match_request_header, NULL)
 #ifdef HTTP_HAVE_CURL
        PHP_FE(http_get, http_arg_pass_ref_3)
@@ -138,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
 }
 
@@ -146,9 +148,12 @@ 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);
+       zend_llist_clean(&G->request.copies.convs);
+#endif
 }
 /* }}} */
 
@@ -174,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()
 /* }}} */
 
@@ -185,7 +193,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