- remove http_compress() and http_uncompress() (deflate/inflate ambiguity)

[m6w6/ext-http] / php_http.h

diff --git a/php_http.h b/php_http.h
index 1801943a64d2488941343b6cb355c85d1e51bb38..22d97e13846c1e7a8797ea5cac1ff7adf1aa10f4 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.19.0"
+#define PHP_EXT_HTTP_VERSION "0.20.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
@@ -85,18 +85,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
@@ -163,8 +151,6 @@ PHP_FUNCTION(http_gzencode);
 PHP_FUNCTION(http_gzdecode);
 PHP_FUNCTION(http_deflate);
 PHP_FUNCTION(http_inflate);
-PHP_FUNCTION(http_compress);
-PHP_FUNCTION(http_uncompress);
 #endif
 PHP_FUNCTION(http_support);