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

diff --git a/php_http.h b/php_http.h
index 1012a12..ea2c255 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.7.0-dev"
 
 /* make compile on Win32 */
 #include "php_streams.h"
@@ -28,12 +28,123 @@ 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
 
+#ifdef ZEND_ENGINE_2
+
+typedef struct {
+	zend_object	zo;
+} httpi_response_object;
+
+#ifdef HTTP_HAVE_CURL
+
+#ifdef	PHP_WIN32
+#	include <winsock2.h>
+#endif
+
+#include <curl/curl.h>
+
+typedef struct {
+	zend_object zo;
+	CURL *ch;
+} httpi_request_object;
+
+typedef enum {
+	HTTP_GET,
+	HTTP_HEAD,
+	HTTP_POST,
+} http_request_method;
+
+#endif /* HTTP_HAVE _CURL */
+
+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, sendContentType);
+PHP_METHOD(HTTPi, sendContentDisposition);
+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 /* HTTP_HAVE_CURL */
+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);
+
+#ifdef HTTP_HAVE_CURL
+
+PHP_METHOD(HTTPi_Request, __construct);
+PHP_METHOD(HTTPi_Request, __destruct);
+PHP_METHOD(HTTPi_Request, setOptions);
+PHP_METHOD(HTTPi_Request, getOptions);
+PHP_METHOD(HTTPi_Request, setMethod);
+PHP_METHOD(HTTPi_Request, getMethod);
+PHP_METHOD(HTTPi_Request, setURL);
+PHP_METHOD(HTTPi_Request, getURL);
+PHP_METHOD(HTTPi_Request, setContentType);
+PHP_METHOD(HTTPi_Request, getContentType);
+PHP_METHOD(HTTPi_Request, setQueryData);
+PHP_METHOD(HTTPi_Request, getQueryData);
+PHP_METHOD(HTTPi_Request, addQueryData);
+PHP_METHOD(HTTPi_Request, unsetQueryData);
+PHP_METHOD(HTTPi_Request, setPostData);
+PHP_METHOD(HTTPi_Request, getPostData);
+PHP_METHOD(HTTPi_Request, addPostData);
+PHP_METHOD(HTTPi_Request, unsetPostData);
+PHP_METHOD(HTTPi_Request, addPostFile);
+PHP_METHOD(HTTPi_Request, getPostFiles);
+PHP_METHOD(HTTPi_Request, unsetPostFiles);
+PHP_METHOD(HTTPi_Request, send);
+PHP_METHOD(HTTPi_Request, getResponseData);
+PHP_METHOD(HTTPi_Request, getResponseHeader);
+PHP_METHOD(HTTPi_Request, getResponseCode);
+PHP_METHOD(HTTPi_Request, getResponseBody);
+PHP_METHOD(HTTPi_Request, getResponseInfo);
+
+#endif /* HTTP_HAVE_CURL */
+
+#endif /* ZEND_ENGINE_2 */
+
+
 PHP_FUNCTION(http_date);
 PHP_FUNCTION(http_absolute_uri);
 PHP_FUNCTION(http_negotiate_language);
@@ -41,28 +152,35 @@ PHP_FUNCTION(http_negotiate_charset);
 PHP_FUNCTION(http_redirect);
 PHP_FUNCTION(http_send_status);
 PHP_FUNCTION(http_send_last_modified);
+PHP_FUNCTION(http_send_content_type);
+PHP_FUNCTION(http_send_content_disposition);
 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);
 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);
 PHP_FUNCTION(http_post_array);
-#endif
+#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_httpetaghandler);
 
 PHP_MINIT_FUNCTION(http);
+PHP_MSHUTDOWN_FUNCTION(http);
+PHP_RINIT_FUNCTION(http);
 PHP_RSHUTDOWN_FUNCTION(http);
 PHP_MINFO_FUNCTION(http);
 
@@ -71,20 +189,18 @@ 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;
-			size_t used;
-			size_t free;
-		} body;
-		struct {
-			char *data;
-			size_t used;
-			size_t free;
-		} hdrs;
+		char *data;
+		size_t used;
+		size_t free;
+		size_t size;
 	} curlbuf;
-#endif
+	zend_llist to_free;
+#endif /* HTTP_HAVE_CURL */
 ZEND_END_MODULE_GLOBALS(http)
 
 #endif	/* PHP_HTTP_H */
@@ -97,3 +213,4 @@ ZEND_END_MODULE_GLOBALS(http)
  * vim600: noet sw=4 ts=4 fdm=marker
  * vim<600: noet sw=4 ts=4
  */
+