- correct package name

[m6w6/ext-http] / php_http.h

diff --git a/php_http.h b/php_http.h
index 27e8fc009bd626e87b7200f0fcd8a37e24f7b0e4..45e3b2474e71b89bf4382e2b40a5d0a65fc6fba4 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.8.0"
+#define HTTP_PEXT_VERSION "0.14.0dev"
 
 /* make compile on Win32 */
 #ifdef HTTP_HAVE_CURL
@@ -27,7 +27,7 @@
 #      endif
 #      include <curl/curl.h>
 #endif
-#include "ext/standard/md5.h"
+
 #include "phpstr/phpstr.h"
 
 extern zend_module_entry http_module_entry;
@@ -37,13 +37,20 @@ extern int http_module_number;
 
 ZEND_BEGIN_MODULE_GLOBALS(http)
 
+#ifdef ZEND_ENGINE_2
+       zend_bool only_exceptions;
+#endif
        struct _http_globals_etag {
+               long mode;
+               void *ctx;
                zend_bool started;
-               PHP_MD5_CTX md5ctx;
        } etag;
 
        struct _http_globals_log {
                char *cache;
+               char *redirect;
+               char *allowed_methods;
+               char *composite;
        } log;
 
        struct _http_globals_send {
@@ -61,12 +68,15 @@ ZEND_BEGIN_MODULE_GLOBALS(http)
                } methods;
 
 #ifdef HTTP_HAVE_CURL
-               struct _http_globals_request_curl {
-                       zend_llist copies;
-#      if LIBCURL_VERSION_NUM < 0x070c00
-                       char error[CURL_ERROR_SIZE + 1];
+               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
-               } curl;
 #endif /* HTTP_HAVE_CURL */
        } request;
 
@@ -78,7 +88,7 @@ ZEND_END_MODULE_GLOBALS(http)
 #      define HTTP_GLOBALS ((zend_http_globals *) (*((void ***) tsrm_ls))[TSRM_UNSHUFFLE_RSRC_ID(http_globals_id)])
 #else
 #      define HTTP_G(v) (http_globals.v)
-#      define HTTP_GLOBALS http_globals
+#      define HTTP_GLOBALS (&http_globals)
 #endif
 #define getGlobals(G) zend_http_globals *G = HTTP_GLOBALS;
 
@@ -101,9 +111,11 @@ PHP_FUNCTION(http_send_data);
 PHP_FUNCTION(http_send_file);
 PHP_FUNCTION(http_send_stream);
 PHP_FUNCTION(http_chunked_decode);
-PHP_FUNCTION(http_split_response);
+PHP_FUNCTION(http_parse_message);
 PHP_FUNCTION(http_parse_headers);
 PHP_FUNCTION(http_get_request_headers);
+PHP_FUNCTION(http_get_request_body);
+PHP_FUNCTION(http_match_request_header);
 #ifdef HTTP_HAVE_CURL
 PHP_FUNCTION(http_get);
 PHP_FUNCTION(http_head);
@@ -111,14 +123,11 @@ 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 */