X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http.c;h=192834be53f9476a16060641f9869bddaf8e9fbd;hb=4b918f89dfd55ec1b4cc928b50f33e35567ed533;hp=11c7439429ee52b0b6ed1af1eca8d36721ce4a66;hpb=b30c267318b2b1add1a01e783f9dbe561a649a7b;p=m6w6%2Fext-http

diff --git a/http.c b/http.c
index 11c7439..192834b 100644
--- 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)
@@ -137,6 +138,7 @@ 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);
 #endif
 }
 
@@ -145,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
 }
 /* }}} */
 
@@ -183,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
@@ -232,9 +240,19 @@ PHP_RINIT_FUNCTION(http)
 }
 /* }}} */
 
+static int cleanup_statics(void *p TSRMLS_DC)
+{
+	zval_dtor(*(zval **)p);
+	return 0;
+}
+
 /* {{{ PHP_RSHUTDOWN_FUNCTION */
 PHP_RSHUTDOWN_FUNCTION(http)
 {
+	/* ZE kludge */
+#ifdef ZEND_ENGINE_2
+	zend_hash_apply(http_response_object_ce->static_members, cleanup_statics TSRMLS_CC);
+#endif
 	http_globals_free(HTTP_GLOBALS);
 	return SUCCESS;
 }