- solve that another way

[m6w6/ext-http] / php_http.h

diff --git a/php_http.h b/php_http.h
index e646c20097b0688056f30d62103ccc00bba969d2..7e82c04037a7073e6b6ea59561f1fe0b27c7baa5 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-2005, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2006, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -15,18 +15,37 @@
 #ifndef PHP_EXT_HTTP_H
 #define PHP_EXT_HTTP_H
 
-#define PHP_EXT_HTTP_VERSION "0.20.0dev"
+#define PHP_EXT_HTTP_VERSION "0.23.0dev"
+
+#ifdef HAVE_CONFIG_H
+#      include "config.h"
+#else
+#      ifndef PHP_WIN32
+#              include "php_config.h"
+#      endif
+#endif
 
 #include "php.h"
 #include "php_http_std_defs.h"
 #include "phpstr/phpstr.h"
 #include "missing.h"
 
+#ifdef HTTP_WANT_SAPI
+#      if PHP_API_VERSION > 20041225
+#              define HTTP_HAVE_SAPI_RTIME
+#              define HTTP_GET_REQUEST_TIME() sapi_get_request_time(TSRMLS_C)
+#      else
+#              define HTTP_GET_REQUEST_TIME() HTTP_G(request_time)
+#      endif
+#      include "SAPI.h"
+#endif
 
 #ifdef HTTP_WANT_NETDB
 #      ifdef PHP_WIN32
+#              define HTTP_HAVE_NETDB
 #              include <winsock2.h>
 #      elif defined(HAVE_NETDB_H)
+#              define HTTP_HAVE_NETDB
 #              include <netdb.h>
 #      endif
 #endif
@@ -34,6 +53,7 @@
 #if defined(HTTP_WANT_CURL) && defined(HTTP_HAVE_CURL)
 #      ifdef PHP_WIN32
 #              include <winsock2.h>
+#              define CURL_STATICLIB
 #      endif
 #      include <curl/curl.h>
 #endif
@@ -77,24 +97,43 @@ ZEND_BEGIN_MODULE_GLOBALS(http)
                char *content_type;
                char *unquoted_etag;
                time_t last_modified;
-               int gzip_encoding;
+               struct _http_globals_send_deflate {
+                       zend_bool start_auto;
+                       long start_flags;
+                       int encoding;
+                       void *stream;
+               } deflate;
+               struct _http_globals_send_inflate {
+                       zend_bool start_auto;
+                       long start_flags;
+                       void *stream;
+               } inflate;
        } send;
 
        struct _http_globals_request {
                struct _http_globals_request_methods {
                        char *allowed;
-                       HashTable custom;
+                       struct _http_globals_request_methods_custom {
+                               int count;
+                               void *entries;
+                       } custom;
                } methods;
        } request;
 
+#ifndef HTTP_HAVE_SAPI_RTIME
+       time_t request_time;
+#endif
 #ifdef ZEND_ENGINE_2
        zend_bool only_exceptions;
 #endif
 
        zend_bool force_exit;
+       zend_bool read_post_data;
 
 ZEND_END_MODULE_GLOBALS(http)
 
+ZEND_EXTERN_MODULE_GLOBALS(http);
+
 #ifdef ZTS
 #      include "TSRM.h"
 #      define HTTP_G(v) TSRMG(http_globals_id, zend_http_globals *, v)
@@ -103,11 +142,12 @@ ZEND_END_MODULE_GLOBALS(http)
 #      define HTTP_G(v) (http_globals.v)
 #      define HTTP_GLOBALS (&http_globals)
 #endif
-#define getGlobals(G) zend_http_globals *G = HTTP_GLOBALS;
+#define getGlobals(G) zend_http_globals *G = HTTP_GLOBALS
 
 PHP_FUNCTION(http_test);
 PHP_FUNCTION(http_date);
-PHP_FUNCTION(http_build_uri);
+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);
@@ -127,8 +167,10 @@ PHP_FUNCTION(http_send_stream);
 PHP_FUNCTION(http_chunked_decode);
 PHP_FUNCTION(http_parse_message);
 PHP_FUNCTION(http_parse_headers);
+PHP_FUNCTION(http_parse_cookie);
 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
 PHP_FUNCTION(http_get);
@@ -142,17 +184,12 @@ PHP_FUNCTION(http_request_method_register);
 PHP_FUNCTION(http_request_method_unregister);
 PHP_FUNCTION(http_request_method_exists);
 PHP_FUNCTION(http_request_method_name);
-#ifndef ZEND_ENGINE_2
-PHP_FUNCTION(http_build_query);
-#endif /* ZEND_ENGINE_2 */
 PHP_FUNCTION(ob_etaghandler);
 #ifdef HTTP_HAVE_ZLIB
-PHP_FUNCTION(http_gzencode);
-PHP_FUNCTION(http_gzdecode);
 PHP_FUNCTION(http_deflate);
 PHP_FUNCTION(http_inflate);
-PHP_FUNCTION(http_compress);
-PHP_FUNCTION(http_uncompress);
+PHP_FUNCTION(ob_deflatehandler);
+PHP_FUNCTION(ob_inflatehandler);
 #endif
 PHP_FUNCTION(http_support);