- Fixed build on php-trunk

[m6w6/ext-http] / php_http_request_object.h

diff --git a/php_http_request_object.h b/php_http_request_object.h
index 0326f011dc1b803d6a5fc3e9985a6ea7ace856b2..262a202ae4fd39e6c9b2d85f88592879cb854dfc 100644 (file)
--- a/php_http_request_object.h
+++ b/php_http_request_object.h
@@ -6,7 +6,7 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2006, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -17,12 +17,15 @@
 #ifdef HTTP_HAVE_CURL
 #ifdef ZEND_ENGINE_2
 
+#include "php_http_request_api.h"
 #include "php_http_request_pool_api.h"
+#include "php_http_request_datashare_api.h"
 
 typedef struct _http_request_object_t {
        zend_object zo;
        http_request *request;
        http_request_pool *pool;
+       http_request_datashare *share;
 } http_request_object;
 
 extern zend_class_entry *http_request_object_ce;
@@ -56,6 +59,9 @@ PHP_METHOD(HttpRequest, setHeaders);
 PHP_METHOD(HttpRequest, addCookies);
 PHP_METHOD(HttpRequest, getCookies);
 PHP_METHOD(HttpRequest, setCookies);
+PHP_METHOD(HttpRequest, enableCookies);
+PHP_METHOD(HttpRequest, resetCookies);
+PHP_METHOD(HttpRequest, flushCookies);
 PHP_METHOD(HttpRequest, setMethod);
 PHP_METHOD(HttpRequest, getMethod);
 PHP_METHOD(HttpRequest, setUrl);
@@ -68,9 +74,9 @@ PHP_METHOD(HttpRequest, addQueryData);
 PHP_METHOD(HttpRequest, setPostFields);
 PHP_METHOD(HttpRequest, getPostFields);
 PHP_METHOD(HttpRequest, addPostFields);
-PHP_METHOD(HttpRequest, getRawPostData);
-PHP_METHOD(HttpRequest, setRawPostData);
-PHP_METHOD(HttpRequest, addRawPostData);
+PHP_METHOD(HttpRequest, getBody);
+PHP_METHOD(HttpRequest, setBody);
+PHP_METHOD(HttpRequest, addBody);
 PHP_METHOD(HttpRequest, addPostFile);
 PHP_METHOD(HttpRequest, setPostFiles);
 PHP_METHOD(HttpRequest, getPostFiles);
@@ -93,18 +99,9 @@ PHP_METHOD(HttpRequest, getRequestMessage);
 PHP_METHOD(HttpRequest, getRawRequestMessage);
 PHP_METHOD(HttpRequest, getHistory);
 PHP_METHOD(HttpRequest, clearHistory);
-
-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);
+PHP_METHOD(HttpRequest, getMessageClass);
+PHP_METHOD(HttpRequest, setMessageClass);
+PHP_METHOD(HttpRequest, factory);
 
 #endif
 #endif