X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http.h;h=d4b00bbd1dc568610cbfd09612aede0dabac9c69;hp=3f11b66b47ee94dba764de3f91c935df30d759f1;hb=65e8d26f23e09b824c3009d9263dbb2629f29304;hpb=c8dff7011092296f9fcc12e68ad8eef18b19cdf4

diff --git a/php_http.h b/php_http.h
index 3f11b66..d4b00bb 100644
--- a/php_http.h
+++ b/php_http.h
@@ -6,7 +6,7 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2006, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -15,7 +15,7 @@
 #ifndef PHP_EXT_HTTP_H
 #define PHP_EXT_HTTP_H
 
-#define PHP_EXT_HTTP_VERSION "1.1.0dev"
+#define PHP_HTTP_VERSION "1.7.3"
 
 #ifdef HAVE_CONFIG_H
 #	include "config.h"
@@ -57,6 +57,10 @@
 #	endif
 #	include <curl/curl.h>
 #	define HTTP_CURL_VERSION(x, y, z) (LIBCURL_VERSION_NUM >= (((x)<<16) + ((y)<<8) + (z)))
+#
+#	if defined(HTTP_WANT_EVENT) && defined(HTTP_HAVE_EVENT)
+#		include <event.h>
+#	endif
 #endif
 
 #if defined(HTTP_WANT_MAGIC) && defined(HTTP_HAVE_MAGIC)
@@ -71,6 +75,8 @@
 #endif
 
 #include <ctype.h>
+#define HTTP_IS_CTYPE(type, c) is##type((int) (unsigned char) (c))
+#define HTTP_TO_CTYPE(type, c) to##type((int) (unsigned char) (c))
 
 extern zend_module_entry http_module_entry;
 #define phpext_http_ptr &http_module_entry
@@ -100,6 +106,7 @@ ZEND_BEGIN_MODULE_GLOBALS(http)
 		char *unquoted_etag;
 		time_t last_modified;
 		struct _http_globals_send_deflate {
+			zend_bool response;
 			zend_bool start_auto;
 			long start_flags;
 			int encoding;
@@ -115,22 +122,48 @@ ZEND_BEGIN_MODULE_GLOBALS(http)
 
 	struct _http_globals_request {
 		time_t time;
+		HashTable *headers;
 		struct _http_globals_request_methods {
+			HashTable registered;
 			char *allowed;
-			struct _http_globals_request_methods_custom {
-				char *ini;
-				int count;
-				void *entries;
-			} custom;
+			char *custom;
 		} methods;
+#if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL)
+		struct _http_globals_request_datashare {
+			zend_llist handles;
+			zend_bool cookie;
+			zend_bool dns;
+			zend_bool ssl;
+			zend_bool connect;
+		} datashare;
+#endif
+#if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_EVENT)
+		struct _http_globals_request_pool {
+			struct _http_globals_request_pool_event {
+				void *base;
+			} event;
+		} pool;
+#endif
 	} request;
 
+	struct _http_globals_persistent {
+		struct _http_globals_persistent_handles {
+			ulong limit;
+			struct _http_globals_persistent_handles_ident {
+				ulong h;
+				char *s;
+				size_t l;
+			} ident;
+		} handles;
+	} persistent;
+
 #ifdef ZEND_ENGINE_2
 	zend_bool only_exceptions;
 #endif
 
 	zend_bool force_exit;
 	zend_bool read_post_data;
+	zval *server_var;
 
 ZEND_END_MODULE_GLOBALS(http)
 
@@ -151,7 +184,7 @@ ZEND_EXTERN_MODULE_GLOBALS(http);
 #	define HTTP_HAVE_SESSION
 #endif
 
-#if defined(HAVE_HASH_EXT) && (HTTP_SHARED_DEPS || !defined(COMPILE_DL_HASH) && defined(HTTP_HAVE_PHP_HASH_H))
+#if defined(HAVE_HASH_EXT) && (HTTP_SHARED_DEPS || !defined(COMPILE_DL_HASH)) && defined(HTTP_HAVE_PHP_HASH_H)
 #	define HTTP_HAVE_HASH
 #endif
 
@@ -159,13 +192,13 @@ ZEND_EXTERN_MODULE_GLOBALS(http);
 #	define HTTP_HAVE_SPL
 #endif
 
-PHP_FUNCTION(http_test);
 PHP_FUNCTION(http_date);
 PHP_FUNCTION(http_build_url);
 PHP_FUNCTION(http_build_str);
 PHP_FUNCTION(http_negotiate_language);
 PHP_FUNCTION(http_negotiate_charset);
 PHP_FUNCTION(http_negotiate_content_type);
+PHP_FUNCTION(http_negotiate);
 PHP_FUNCTION(http_redirect);
 PHP_FUNCTION(http_throttle);
 PHP_FUNCTION(http_send_status);
@@ -183,11 +216,15 @@ PHP_FUNCTION(http_chunked_decode);
 PHP_FUNCTION(http_parse_message);
 PHP_FUNCTION(http_parse_headers);
 PHP_FUNCTION(http_parse_cookie);
+PHP_FUNCTION(http_build_cookie);
 PHP_FUNCTION(http_parse_params);
 PHP_FUNCTION(http_get_request_headers);
 PHP_FUNCTION(http_get_request_body);
 PHP_FUNCTION(http_get_request_body_stream);
 PHP_FUNCTION(http_match_request_header);
+PHP_FUNCTION(http_persistent_handles_count);
+PHP_FUNCTION(http_persistent_handles_clean);
+PHP_FUNCTION(http_persistent_handles_ident);
 #ifdef HTTP_HAVE_CURL
 PHP_FUNCTION(http_get);
 PHP_FUNCTION(http_head);