X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=php_http_request_object.h;h=35d7a379baf7d1f50b5cc45ae02419dd73ea9222;hb=8fa713be4960d51958523429ee0e7dfca6d017fb;hp=7ae1fca1b75212ca609d4e99702f8a079c36bcf6;hpb=b3fc227f0180cc93c521ef52bee7e4faa71c9a4c;p=m6w6%2Fext-http

diff --git a/php_http_request_object.h b/php_http_request_object.h
index 7ae1fca..35d7a37 100644
--- a/php_http_request_object.h
+++ b/php_http_request_object.h
@@ -17,22 +17,12 @@
 #ifdef HTTP_HAVE_CURL
 #ifdef ZEND_ENGINE_2
 
-#ifdef	PHP_WIN32
-#	include <winsock2.h>
-#endif
-
-#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;
+	http_request *request;
 	http_request_pool *pool;
-	phpstr response;
-	phpstr request;
 	phpstr history;
 } http_request_object;
 
@@ -50,8 +40,8 @@ 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);
 
@@ -95,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);