X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http.h;h=87e1f3a06d0b1cc1c9ce73cf4c36abb7ee37cc08;hp=49b79e699d466b67ce22e6b951725bd01dbdc905;hb=3e5cfc8e26b5d9c538edbb841104bd82327fc797;hpb=b30c267318b2b1add1a01e783f9dbe561a649a7b

diff --git a/php_http.h b/php_http.h
index 49b79e6..87e1f3a 100644
--- a/php_http.h
+++ b/php_http.h
@@ -18,7 +18,7 @@
 #ifndef PHP_EXT_HTTP_H
 #define PHP_EXT_HTTP_H
 
-#define HTTP_PEXT_VERSION "0.9.0dev"
+#define HTTP_PEXT_VERSION "0.14.1"
 
 /* make compile on Win32 */
 #ifdef HTTP_HAVE_CURL
@@ -27,7 +27,7 @@
 #	endif
 #	include <curl/curl.h>
 #endif
-#include "ext/standard/md5.h"
+
 #include "phpstr/phpstr.h"
 
 extern zend_module_entry http_module_entry;
@@ -37,13 +37,20 @@ extern int http_module_number;
 
 ZEND_BEGIN_MODULE_GLOBALS(http)
 
+#ifdef ZEND_ENGINE_2
+	zend_bool only_exceptions;
+#endif
 	struct _http_globals_etag {
+		long mode;
+		void *ctx;
 		zend_bool started;
-		PHP_MD5_CTX md5ctx;
 	} etag;
 
 	struct _http_globals_log {
 		char *cache;
+		char *redirect;
+		char *allowed_methods;
+		char *composite;
 	} log;
 
 	struct _http_globals_send {
@@ -61,11 +68,13 @@ ZEND_BEGIN_MODULE_GLOBALS(http)
 		} methods;
 
 #ifdef HTTP_HAVE_CURL
-		struct _http_globlas_request_copies {
+		struct _http_globals_request_copies {
 			zend_llist strings;
 			zend_llist slists;
+			zend_llist contexts;
+			zend_llist convs;
 		} copies;
-#	if LIBCURL_VERSION_NUM < 0x070c00
+#	ifndef HAVE_CURL_EASY_STRERROR
 		char error[CURL_ERROR_SIZE + 1];
 #	endif
 #endif /* HTTP_HAVE_CURL */
@@ -79,7 +88,7 @@ ZEND_END_MODULE_GLOBALS(http)
 #	define HTTP_GLOBALS ((zend_http_globals *) (*((void ***) tsrm_ls))[TSRM_UNSHUFFLE_RSRC_ID(http_globals_id)])
 #else
 #	define HTTP_G(v) (http_globals.v)
-#	define HTTP_GLOBALS http_globals
+#	define HTTP_GLOBALS (&http_globals)
 #endif
 #define getGlobals(G) zend_http_globals *G = HTTP_GLOBALS;
 
@@ -102,9 +111,10 @@ PHP_FUNCTION(http_send_data);
 PHP_FUNCTION(http_send_file);
 PHP_FUNCTION(http_send_stream);
 PHP_FUNCTION(http_chunked_decode);
-PHP_FUNCTION(http_split_response);
+PHP_FUNCTION(http_parse_message);
 PHP_FUNCTION(http_parse_headers);
 PHP_FUNCTION(http_get_request_headers);
+PHP_FUNCTION(http_get_request_body);
 PHP_FUNCTION(http_match_request_header);
 #ifdef HTTP_HAVE_CURL
 PHP_FUNCTION(http_get);
@@ -113,14 +123,11 @@ PHP_FUNCTION(http_post_data);
 PHP_FUNCTION(http_post_fields);
 PHP_FUNCTION(http_put_file);
 PHP_FUNCTION(http_put_stream);
-/*PHP_FUNCTION(http_request)*/
+#endif /* HTTP_HAVE_CURL */
 PHP_FUNCTION(http_request_method_register);
 PHP_FUNCTION(http_request_method_unregister);
 PHP_FUNCTION(http_request_method_exists);
 PHP_FUNCTION(http_request_method_name);
-#endif /* HTTP_HAVE_CURL */
-PHP_FUNCTION(http_auth_basic);
-PHP_FUNCTION(http_auth_basic_cb);
 #ifndef ZEND_ENGINE_2
 PHP_FUNCTION(http_build_query);
 #endif /* ZEND_ENGINE_2 */