X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_request_object.h;h=3433d51f95c8cb3009ecc740c671b6f1026bf5fa;hp=d1ffb7e3e04ab75a4e1b685fef3e6d69a76343e9;hb=45abbc6fd229be01e963e9642a03118d3c99131c;hpb=edc84b40eb2c5be04492fa98fec5833a030782eb

diff --git a/php_http_request_object.h b/php_http_request_object.h
index d1ffb7e..3433d51 100644
--- a/php_http_request_object.h
+++ b/php_http_request_object.h
@@ -21,10 +21,8 @@
 
 typedef struct {
 	zend_object zo;
-	CURL *ch;
+	http_request *request;
 	http_request_pool *pool;
-	phpstr response;
-	phpstr request;
 	phpstr history;
 } http_request_object;
 
@@ -42,15 +40,15 @@ extern zend_object_value _http_request_object_clone_obj(zval *zobject TSRMLS_DC)
 #define http_request_object_free(o) _http_request_object_free((o) TSRMLS_CC)
 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_requesthandler(req, this) _http_request_object_requesthandler((req), (this) TSRMLS_CC)
+extern STATUS _http_request_object_requesthandler(http_request_object *obj, zval *this_ptr 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);
 PHP_METHOD(HttpRequest, setOptions);
 PHP_METHOD(HttpRequest, getOptions);
+PHP_METHOD(HttpRequest, addSslOptions);
 PHP_METHOD(HttpRequest, setSslOptions);
 PHP_METHOD(HttpRequest, getSslOptions);
 PHP_METHOD(HttpRequest, addHeaders);
@@ -87,7 +85,9 @@ PHP_METHOD(HttpRequest, getResponseCode);
 PHP_METHOD(HttpRequest, getResponseBody);
 PHP_METHOD(HttpRequest, getResponseInfo);
 PHP_METHOD(HttpRequest, getResponseMessage);
+PHP_METHOD(HttpRequest, getRawResponseMessage);
 PHP_METHOD(HttpRequest, getRequestMessage);
+PHP_METHOD(HttpRequest, getRawRequestMessage);
 PHP_METHOD(HttpRequest, getHistory);
 PHP_METHOD(HttpRequest, clearHistory);