* release 0.5.1

[m6w6/ext-http] / php_http.h

diff --git a/php_http.h b/php_http.h
index 187ba2d94792b77119ad41b68846eceb0d47d1d8..c4fc38050873776aad9c82ded570cd42c8fd410f 100644 (file)
--- a/php_http.h
+++ b/php_http.h
@@ -39,19 +39,6 @@ extern zend_module_entry http_module_entry;
 #else
 
 #ifdef HTTP_HAVE_CURL
-typedef struct {
-       struct {
-               char *data;
-               size_t used;
-               size_t free;
-       } body;
-       struct {
-               char *data;
-               size_t used;
-               size_t free;
-       } hdrs;
-} http_curlbuf;
-
 typedef enum {
        HTTP_GET,
        HTTP_HEAD,
@@ -110,10 +97,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);
@@ -132,6 +119,7 @@ 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 +172,18 @@ ZEND_BEGIN_MODULE_GLOBALS(http)
        time_t lmod;
        char *allowed_methods;
 #ifdef HTTP_HAVE_CURL
-       http_curlbuf curlbuf;
+       struct {
+               struct {
+                       char *data;
+                       size_t used;
+                       size_t free;
+               } body;
+               struct {
+                       char *data;
+                       size_t used;
+                       size_t free;
+               } hdrs;
+       } curlbuf;
 #endif
 ZEND_END_MODULE_GLOBALS(http)