- API juggling

[m6w6/ext-http] / php_http_request_object.h

diff --git a/php_http_request_object.h b/php_http_request_object.h
index e8326b39c3473b92eff1da6f1bbc9540ff992bd3..5414fa5d70ccd2ddfd9b11ed7501dbce0ec8155a 100644 (file)
--- a/php_http_request_object.h
+++ b/php_http_request_object.h
@@ -27,12 +27,13 @@
 #include <curl/curl.h>
 
 #include "php_http_request_api.h"
+#include "php_http_request_pool_api.h"
 #include "phpstr/phpstr.h"
 
 typedef struct {
        zend_object zo;
        CURL *ch;
-       zend_bool attached;
+       http_request_pool *pool;
        phpstr response;
 } http_request_object;
 
@@ -48,8 +49,8 @@ extern void _http_request_object_free(zend_object *object TSRMLS_DC);
 
 #define http_request_object_requesthandler(req, this, body) _http_request_object_requesthandler((req), (this), (body) TSRMLS_CC)
 extern STATUS _http_request_object_requesthandler(http_request_object *obj, zval *this_ptr, http_request_body *body TSRMLS_DC);
-#define http_request_object_responsehandler(req, this, info) _http_request_object_responsehandler((req), (this), (info) TSRMLS_CC)
-extern STATUS _http_request_object_responsehandler(http_request_object *obj, zval *this_ptr, HashTable *info TSRMLS_DC);
+#define http_request_object_responsehandler(req, this) _http_request_object_responsehandler((req), (this) TSRMLS_CC)
+extern STATUS _http_request_object_responsehandler(http_request_object *obj, zval *this_ptr TSRMLS_DC);
 
 PHP_METHOD(HttpRequest, __construct);
 PHP_METHOD(HttpRequest, __destruct);
@@ -67,8 +68,8 @@ PHP_METHOD(HttpRequest, getCookies);
 PHP_METHOD(HttpRequest, unsetCookies);
 PHP_METHOD(HttpRequest, setMethod);
 PHP_METHOD(HttpRequest, getMethod);
-PHP_METHOD(HttpRequest, setURL);
-PHP_METHOD(HttpRequest, getURL);
+PHP_METHOD(HttpRequest, setUrl);
+PHP_METHOD(HttpRequest, getUrl);
 PHP_METHOD(HttpRequest, setContentType);
 PHP_METHOD(HttpRequest, getContentType);
 PHP_METHOD(HttpRequest, setQueryData);
@@ -95,6 +96,18 @@ PHP_METHOD(HttpRequest, getResponseBody);
 PHP_METHOD(HttpRequest, getResponseInfo);
 PHP_METHOD(HttpRequest, getResponseMessage);
 
+PHP_METHOD(HttpRequest, get);
+PHP_METHOD(HttpRequest, head);
+PHP_METHOD(HttpRequest, postData);
+PHP_METHOD(HttpRequest, postFields);
+PHP_METHOD(HttpRequest, putFile);
+PHP_METHOD(HttpRequest, putStream);
+
+PHP_METHOD(HttpRequest, methodRegister);
+PHP_METHOD(HttpRequest, methodUnregister);
+PHP_METHOD(HttpRequest, methodName);
+PHP_METHOD(HttpRequest, methodExists);
+
 #endif
 #endif
 #endif