X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http.h;h=86cedff125881f4e4c9617b060e1e3714927f84a;hp=2f2b7eef4ce732567d91ee29cd02aa99b6c72354;hb=75cb17b3277c71c09660c4e8566483630240e36b;hpb=7dedd1935ab8400dfbd49fe63c83b74b0d0b68e6

diff --git a/php_http.h b/php_http.h
index 2f2b7ee..86cedff 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,12 +28,66 @@ 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"
+#else
+
+PHP_METHOD(HTTPi, date);
+PHP_METHOD(HTTPi, absoluteURI);
+PHP_METHOD(HTTPi, negotiateLanguage);
+PHP_METHOD(HTTPi, negotiateCharset);
+PHP_METHOD(HTTPi, redirect);
+PHP_METHOD(HTTPi, sendStatus);
+PHP_METHOD(HTTPi, sendLastModified);
+PHP_METHOD(HTTPi, matchModified);
+PHP_METHOD(HTTPi, matchEtag);
+PHP_METHOD(HTTPi, cacheLastModified);
+PHP_METHOD(HTTPi, cacheEtag);
+PHP_METHOD(HTTPi, chunkedDecode);
+PHP_METHOD(HTTPi, splitResponse);
+PHP_METHOD(HTTPi, parseHeaders);
+PHP_METHOD(HTTPi, getRequestHeaders);
+#ifdef HTTP_HAVE_CURL
+PHP_METHOD(HTTPi, get);
+PHP_METHOD(HTTPi, head);
+PHP_METHOD(HTTPi, postData);
+PHP_METHOD(HTTPi, postArray);
+#endif
+PHP_METHOD(HTTPi, authBasic);
+PHP_METHOD(HTTPi, authBasicCallback);
+
+
+PHP_METHOD(HTTPi_Response, __construct);/*
+PHP_METHOD(HTTPi_Response, __destruct);*/
+PHP_METHOD(HTTPi_Response, setETag);
+PHP_METHOD(HTTPi_Response, getETag);
+PHP_METHOD(HTTPi_Response, setContentDisposition);
+PHP_METHOD(HTTPi_Response, getContentDisposition);
+PHP_METHOD(HTTPi_Response, setContentType);
+PHP_METHOD(HTTPi_Response, getContentType);
+PHP_METHOD(HTTPi_Response, setCache);
+PHP_METHOD(HTTPi_Response, getCache);
+PHP_METHOD(HTTPi_Response, setCacheControl);
+PHP_METHOD(HTTPi_Response, getCacheControl);
+PHP_METHOD(HTTPi_Response, setGzip);
+PHP_METHOD(HTTPi_Response, getGzip);/*
+PHP_METHOD(HTTPi_Response, setData);
+PHP_METHOD(HTTPi_Response, getData);
+PHP_METHOD(HTTPi_Response, setFile);
+PHP_METHOD(HTTPi_Response, getFile);
+PHP_METHOD(HTTPi_Response, setStream);
+PHP_METHOD(HTTPi_Response, getStream);
+PHP_METHOD(HTTPi_Response, send);*/
+
+#endif /* ZEND_ENGINE_2 */
+
+
 PHP_FUNCTION(http_date);
 PHP_FUNCTION(http_absolute_uri);
 PHP_FUNCTION(http_negotiate_language);
@@ -52,7 +106,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);
@@ -61,7 +117,11 @@ 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_RINIT_FUNCTION(http);
 PHP_RSHUTDOWN_FUNCTION(http);
 PHP_MINFO_FUNCTION(http);
 
@@ -72,7 +132,8 @@ ZEND_BEGIN_MODULE_GLOBALS(http)
 	char *ctype;
 	char *etag;
 	time_t lmod;
-#if defined(HAVE_CURL) && HAVE_CURL
+	char *allowed_methods;
+#ifdef HTTP_HAVE_CURL
 	struct {
 		struct {
 			char *data;