branch off v1 as R_1_7

[m6w6/ext-http] / php_http.h

diff --git a/php_http.h b/php_http.h
index 62cb1bc2cea794265fec9376a98493f29c9187d4..e4a0f85d8fd7cfe82cd81b4a6cd186d88fa8e51c 100644 (file)
--- 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-2007, 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.5.0dev"
+#define PHP_HTTP_VERSION "1.7.6"
 
 #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)
@@ -120,12 +124,9 @@ ZEND_BEGIN_MODULE_GLOBALS(http)
                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 {
@@ -135,12 +136,19 @@ ZEND_BEGIN_MODULE_GLOBALS(http)
                        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;
 
-#ifdef HTTP_HAVE_PERSISTENT_HANDLES
        struct _http_globals_persistent {
                struct _http_globals_persistent_handles {
+                       ulong limit;
                        struct _http_globals_persistent_handles_ident {
                                ulong h;
                                char *s;
@@ -148,7 +156,7 @@ ZEND_BEGIN_MODULE_GLOBALS(http)
                        } ident;
                } handles;
        } persistent;
-#endif
+
 #ifdef ZEND_ENGINE_2
        zend_bool only_exceptions;
 #endif
@@ -190,6 +198,7 @@ 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);
@@ -213,12 +222,10 @@ 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);
-#ifdef HTTP_HAVE_CURL
-#      ifdef HTTP_HAVE_PERSISTENT_HANDLES
 PHP_FUNCTION(http_persistent_handles_count);
 PHP_FUNCTION(http_persistent_handles_clean);
 PHP_FUNCTION(http_persistent_handles_ident);
-#      endif
+#ifdef HTTP_HAVE_CURL
 PHP_FUNCTION(http_get);
 PHP_FUNCTION(http_head);
 PHP_FUNCTION(http_post_data);