- add flush() to HttpDeflateStream and HttpInflateStream

[m6w6/ext-http] / php_http.h

diff --git a/php_http.h b/php_http.h
index 8e724af7ba09dcd259b6d08f46754dcbcd4ece4c..b0a0a149d5e74798854485fcb7c29d7ba1f82004 100644 (file)
--- a/php_http.h
+++ b/php_http.h
@@ -15,14 +15,13 @@
 #ifndef PHP_EXT_HTTP_H
 #define PHP_EXT_HTTP_H
 
-#define PHP_EXT_HTTP_VERSION "0.20.0dev"
+#define PHP_EXT_HTTP_VERSION "0.21.0dev"
 
 #include "php.h"
 #include "php_http_std_defs.h"
 #include "phpstr/phpstr.h"
 #include "missing.h"
 
-
 #ifdef HTTP_WANT_NETDB
 #      ifdef PHP_WIN32
 #              include <winsock2.h>
@@ -34,6 +33,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,7 +77,17 @@ 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 {
@@ -85,18 +95,6 @@ ZEND_BEGIN_MODULE_GLOBALS(http)
                        char *allowed;
                        HashTable custom;
                } methods;
-
-#ifdef HTTP_HAVE_CURL
-               struct _http_globals_request_copies {
-                       zend_llist strings;
-                       zend_llist slists;
-                       zend_llist contexts;
-                       zend_llist convs;
-               } copies;
-#      ifndef HAVE_CURL_EASY_STRERROR
-               char error[CURL_ERROR_SIZE + 1];
-#      endif
-#endif /* HTTP_HAVE_CURL */
        } request;
 
 #ifdef ZEND_ENGINE_2
@@ -107,6 +105,8 @@ ZEND_BEGIN_MODULE_GLOBALS(http)
 
 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)
@@ -119,7 +119,7 @@ ZEND_END_MODULE_GLOBALS(http)
 
 PHP_FUNCTION(http_test);
 PHP_FUNCTION(http_date);
-PHP_FUNCTION(http_build_uri);
+PHP_FUNCTION(http_build_url);
 PHP_FUNCTION(http_negotiate_language);
 PHP_FUNCTION(http_negotiate_charset);
 PHP_FUNCTION(http_negotiate_content_type);
@@ -139,6 +139,7 @@ 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_match_request_header);
@@ -159,12 +160,10 @@ 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);