* split into more reasonable modules

[m6w6/ext-http] / php_http.h

diff --git a/php_http.h b/php_http.h
index 187ba2d94792b77119ad41b68846eceb0d47d1d8..3a46a7216d9c112a15f3fa30bebbbdf4d87d9b69 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.5.0-dev"
+#define PHP_EXT_HTTP_VERSION "0.6.0-dev"
 
 /* make compile on Win32 */
 #include "php_streams.h"
@@ -38,25 +38,25 @@ extern zend_module_entry http_module_entry;
 #      include "php_http_build_query.h"
 #else
 
+typedef struct {
+       zend_object     zo;
+} httpi_response_object;
+
 #ifdef HTTP_HAVE_CURL
+
+#include <curl/curl.h>
+
 typedef struct {
-       struct {
-               char *data;
-               size_t used;
-               size_t free;
-       } body;
-       struct {
-               char *data;
-               size_t used;
-               size_t free;
-       } hdrs;
-} http_curlbuf;
+       zend_object zo;
+       CURL *ch;
+} httpi_request_object;
 
 typedef enum {
        HTTP_GET,
        HTTP_HEAD,
        HTTP_POST,
 } http_request_method;
+
 #endif
 
 PHP_METHOD(HTTPi, date);
@@ -110,10 +110,10 @@ PHP_METHOD(HTTPi_Response, send);
 
 #ifdef HTTP_HAVE_CURL
 
-PHP_METHOD(HTTPi_Request, __construct);/*
+PHP_METHOD(HTTPi_Request, __construct);
 PHP_METHOD(HTTPi_Request, __destruct);
 PHP_METHOD(HTTPi_Request, setOptions);
-PHP_METHOD(HTTPi_Request, getOptions);*/
+PHP_METHOD(HTTPi_Request, getOptions);
 PHP_METHOD(HTTPi_Request, setMethod);
 PHP_METHOD(HTTPi_Request, getMethod);
 PHP_METHOD(HTTPi_Request, setURL);
@@ -123,15 +123,19 @@ 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, 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, 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, getResponseHeaders);
 PHP_METHOD(HTTPi_Request, getResponseBody);
+PHP_METHOD(HTTPi_Request, getResponseInfo);
 
 #endif /* HTTP_HAVE_CURL */
 
@@ -184,7 +188,12 @@ ZEND_BEGIN_MODULE_GLOBALS(http)
        time_t lmod;
        char *allowed_methods;
 #ifdef HTTP_HAVE_CURL
-       http_curlbuf curlbuf;
+       struct {
+               char *data;
+               size_t used;
+               size_t free;
+               size_t size;
+       } curlbuf;
 #endif
 ZEND_END_MODULE_GLOBALS(http)