X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http.h;h=29d868c06f8e09f467526b723d6693a0e4e37fb5;hp=1012a12536b8197f305deb446b7a76ecf3dda18a;hb=ba245e2db9af9c413bf15f5c1765d97aa0ff1fea;hpb=9949be4659856993b6f3668c87cdcf158f6c2ddf

diff --git a/php_http.h b/php_http.h
index 1012a12..29d868c 100644
--- 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.5.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);
@@ -45,7 +49,6 @@ PHP_FUNCTION(http_match_modified);
 PHP_FUNCTION(http_match_etag);
 PHP_FUNCTION(http_cache_last_modified);
 PHP_FUNCTION(http_cache_etag);
-PHP_FUNCTION(http_accept_ranges);
 PHP_FUNCTION(http_content_type);
 PHP_FUNCTION(http_content_disposition);
 PHP_FUNCTION(http_send_data);
@@ -53,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,7 +67,10 @@ PHP_FUNCTION(http_post_array);
 PHP_FUNCTION(http_auth_basic);
 PHP_FUNCTION(http_auth_basic_cb);
 
+PHP_FUNCTION(ob_httpetaghandler);
+
 PHP_MINIT_FUNCTION(http);
+PHP_MSHUTDOWN_FUNCTION(http);
 PHP_RSHUTDOWN_FUNCTION(http);
 PHP_MINFO_FUNCTION(http);
 
@@ -71,7 +79,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;
@@ -97,3 +108,4 @@ ZEND_END_MODULE_GLOBALS(http)
  * vim600: noet sw=4 ts=4 fdm=marker
  * vim<600: noet sw=4 ts=4
  */
+