- add compression functions to userspace

[m6w6/ext-http] / php_http.h

diff --git a/php_http.h b/php_http.h
index 9137b812c6eecb7036535f8ed42169d1fdb3f53b..223a4f63dbab25bd6f59450f95ac465c3ff3186c 100644 (file)
--- a/php_http.h
+++ b/php_http.h
@@ -18,7 +18,7 @@
 #ifndef PHP_EXT_HTTP_H
 #define PHP_EXT_HTTP_H
 
-#define HTTP_PEXT_VERSION "0.12.0dev"
+#define HTTP_PEXT_VERSION "0.15.0"
 
 /* make compile on Win32 */
 #ifdef HTTP_HAVE_CURL
@@ -27,8 +27,7 @@
 #      endif
 #      include <curl/curl.h>
 #endif
-#include "ext/standard/md5.h"
-#include "ext/standard/sha1.h"
+
 #include "phpstr/phpstr.h"
 
 extern zend_module_entry http_module_entry;
@@ -48,7 +47,6 @@ ZEND_BEGIN_MODULE_GLOBALS(http)
        } etag;
 
        struct _http_globals_log {
-               char *auth;
                char *cache;
                char *redirect;
                char *allowed_methods;
@@ -76,7 +74,7 @@ ZEND_BEGIN_MODULE_GLOBALS(http)
                        zend_llist contexts;
                        zend_llist convs;
                } copies;
-#      if LIBCURL_VERSION_NUM < 0x070c00
+#      ifndef HAVE_CURL_EASY_STRERROR
                char error[CURL_ERROR_SIZE + 1];
 #      endif
 #endif /* HTTP_HAVE_CURL */
@@ -96,7 +94,7 @@ ZEND_END_MODULE_GLOBALS(http)
 
 PHP_FUNCTION(http_test);
 PHP_FUNCTION(http_date);
-PHP_FUNCTION(http_absolute_uri);
+PHP_FUNCTION(http_build_uri);
 PHP_FUNCTION(http_negotiate_language);
 PHP_FUNCTION(http_negotiate_charset);
 PHP_FUNCTION(http_redirect);
@@ -125,18 +123,23 @@ PHP_FUNCTION(http_post_data);
 PHP_FUNCTION(http_post_fields);
 PHP_FUNCTION(http_put_file);
 PHP_FUNCTION(http_put_stream);
-/*PHP_FUNCTION(http_request)*/
+#endif /* HTTP_HAVE_CURL */
 PHP_FUNCTION(http_request_method_register);
 PHP_FUNCTION(http_request_method_unregister);
 PHP_FUNCTION(http_request_method_exists);
 PHP_FUNCTION(http_request_method_name);
-#endif /* HTTP_HAVE_CURL */
-PHP_FUNCTION(http_auth_basic);
-PHP_FUNCTION(http_auth_basic_cb);
 #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);
+#endif
 
 PHP_MINIT_FUNCTION(http);
 PHP_MSHUTDOWN_FUNCTION(http);