X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=php_http.h;h=f18f6d702d63906cfe87c79bedf5a82337cca6a8;hb=cdbe702a66e68d97885d5305278246c2630c9f10;hp=9b9b1e707bcc7ffbe85233a8acee001a1e49d16e;hpb=781c90c0447166dd52ef881ae15751fa466c32fb;p=m6w6%2Fext-http

diff --git a/php_http.h b/php_http.h
index 9b9b1e7..f18f6d7 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.8.0-dev"
+#define HTTP_PEXT_VERSION "0.12.0dev"
 
 /* make compile on Win32 */
 #ifdef HTTP_HAVE_CURL
@@ -27,21 +27,31 @@
 #	endif
 #	include <curl/curl.h>
 #endif
-#include "ext/standard/md5.h"
+
 #include "phpstr/phpstr.h"
 
 extern zend_module_entry http_module_entry;
 #define phpext_http_ptr &http_module_entry
 
+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 *auth;
 		char *cache;
+		char *redirect;
+		char *allowed_methods;
+		char *composite;
 	} log;
 
 	struct _http_globals_send {
@@ -59,12 +69,15 @@ ZEND_BEGIN_MODULE_GLOBALS(http)
 		} methods;
 
 #ifdef HTTP_HAVE_CURL
-		struct _http_globals_request_curl {
-			zend_llist copies;
+		struct _http_globals_request_copies {
+			zend_llist strings;
+			zend_llist slists;
+			zend_llist contexts;
+			zend_llist convs;
+		} copies;
 #	if LIBCURL_VERSION_NUM < 0x070c00
-			char error[CURL_ERROR_SIZE + 1];
+		char error[CURL_ERROR_SIZE + 1];
 #	endif
-		} curl;
 #endif /* HTTP_HAVE_CURL */
 	} request;
 
@@ -76,7 +89,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;
 
@@ -99,9 +112,11 @@ 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);
 PHP_FUNCTION(http_head);