* ms cc chokes on that

[m6w6/ext-http] / php_http.h

diff --git a/php_http.h b/php_http.h
index 49804244b3048e2aed92a9436e1a6f4085c0f087..04dc05a02f6e06dc6f155afe2827fe5c85a9adbc 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 PHP_EXT_HTTP_VERSION "0.3.0"
+#define PHP_EXT_HTTP_VERSION "0.4.0-dev"
 
 /* make compile on Win32 */
 #include "php_streams.h"
@@ -28,10 +28,14 @@ extern zend_module_entry http_module_entry;
 #define phpext_http_ptr &http_module_entry
 
 #ifdef ZTS
-#include "TSRM.h"
-#define HTTP_G(v) TSRMG(http_globals_id, zend_http_globals *, v)
+#      include "TSRM.h"
+#      define HTTP_G(v) TSRMG(http_globals_id, zend_http_globals *, v)
 #else
-#define HTTP_G(v) (http_globals.v)
+#      define HTTP_G(v) (http_globals.v)
+#endif
+
+#ifndef ZEND_ENGINE_2
+#      include "php_http_build_query.h"
 #endif
 
 PHP_FUNCTION(http_date);
@@ -52,7 +56,9 @@ PHP_FUNCTION(http_send_file);
 PHP_FUNCTION(http_send_stream);
 PHP_FUNCTION(http_chunked_decode);
 PHP_FUNCTION(http_split_response);
-#if defined(HAVE_CURL) && HAVE_CURL
+PHP_FUNCTION(http_parse_headers);
+PHP_FUNCTION(http_get_request_headers);
+#ifdef HTTP_HAVE_CURL
 PHP_FUNCTION(http_get);
 PHP_FUNCTION(http_head);
 PHP_FUNCTION(http_post_data);
@@ -62,6 +68,7 @@ PHP_FUNCTION(http_auth_basic);
 PHP_FUNCTION(http_auth_basic_cb);
 
 PHP_MINIT_FUNCTION(http);
+PHP_MSHUTDOWN_FUNCTION(http);
 PHP_RSHUTDOWN_FUNCTION(http);
 PHP_MINFO_FUNCTION(http);
 
@@ -70,7 +77,10 @@ ZEND_BEGIN_MODULE_GLOBALS(http)
        PHP_MD5_CTX etag_md5;
        php_stream_statbuf ssb;
        char *ctype;
-#if defined(HAVE_CURL) && HAVE_CURL
+       char *etag;
+       time_t lmod;
+       char *allowed_methods;
+#ifdef HTTP_HAVE_CURL
        struct {
                struct {
                        char *data;
@@ -96,3 +106,4 @@ ZEND_END_MODULE_GLOBALS(http)
  * vim600: noet sw=4 ts=4 fdm=marker
  * vim<600: noet sw=4 ts=4
  */
+