- typo

[m6w6/ext-http] / http.c

diff --git a/http.c b/http.c
index 62f86ab011d108cbdb08c042472eb6b5d6180079..3b0588719324a8140363227e023e543f47552643 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)
@@ -146,8 +147,11 @@ 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);
+#endif
 }
 /* }}} */
 
@@ -184,7 +188,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