X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=php_http_request.h;h=d535dc4998be130c1b02f56a18dda9b98f4021da;hb=737776929a44884a24c3e584162d771ada71f7e9;hp=5dc0750c42466bdb86f71d2cf0bfaaae89d1e468;hpb=8d05291f42b3b42159b3fe91492aa4862f3d4405;p=m6w6%2Fext-http

diff --git a/php_http_request.h b/php_http_request.h
index 5dc0750..d535dc4 100644
--- a/php_http_request.h
+++ b/php_http_request.h
@@ -15,7 +15,6 @@
 
 #include "php_http_message_body.h"
 #include "php_http_message_parser.h"
-#include "php_http_request_method.h"
 
 typedef struct php_http_request_progress_state {
 	struct {
@@ -125,7 +124,7 @@ typedef struct php_http_request php_http_request_t;
 typedef php_http_request_t *(*php_http_request_init_func_t)(php_http_request_t *h, void *arg);
 typedef php_http_request_t *(*php_http_request_copy_func_t)(php_http_request_t *from, php_http_request_t *to);
 typedef void (*php_http_request_dtor_func_t)(php_http_request_t *h);
-typedef STATUS (*php_http_request_exec_func_t)(php_http_request_t *h, php_http_request_method_t meth, const char *url, php_http_message_body_t *body);
+typedef STATUS (*php_http_request_exec_func_t)(php_http_request_t *h, const char *meth, const char *url, php_http_message_body_t *body);
 typedef STATUS (*php_http_request_reset_func_t)(php_http_request_t *h);
 typedef STATUS (*php_http_request_setopt_func_t)(php_http_request_t *h, php_http_request_setopt_opt_t opt, void *arg);
 typedef STATUS (*php_http_request_getopt_func_t)(php_http_request_t *h, php_http_request_getopt_opt_t opt, void *arg);
@@ -150,7 +149,6 @@ struct php_http_request {
 	php_http_message_parser_t *parser;
 	php_http_message_t *message;
 	php_http_buffer_t *buffer;
-	zval *persistent_handle_id;
 #ifdef ZTS
 	void ***ts;
 #endif
@@ -158,7 +156,7 @@ struct php_http_request {
 
 PHP_HTTP_API php_http_request_t *php_http_request_init(php_http_request_t *h, php_http_request_ops_t *ops, php_http_resource_factory_t *rf, void *init_arg TSRMLS_DC);
 PHP_HTTP_API php_http_request_t *php_http_request_copy(php_http_request_t *from, php_http_request_t *to);
-PHP_HTTP_API STATUS php_http_request_exec(php_http_request_t *h, php_http_request_method_t meth, const char *url, php_http_message_body_t *body);
+PHP_HTTP_API STATUS php_http_request_exec(php_http_request_t *h, const char *meth, const char *url, php_http_message_body_t *body);
 PHP_HTTP_API STATUS php_http_request_reset(php_http_request_t *h);
 PHP_HTTP_API STATUS php_http_request_setopt(php_http_request_t *h, php_http_request_setopt_opt_t opt, void *arg);
 PHP_HTTP_API STATUS php_http_request_getopt(php_http_request_t *h, php_http_request_getopt_opt_t opt, void *arg);
@@ -178,7 +176,7 @@ extern zend_object_value php_http_request_object_new_ex(zend_class_entry *ce, ph
 extern zend_object_value php_http_request_object_clone(zval *zobject TSRMLS_DC);
 extern void php_http_request_object_free(void *object TSRMLS_DC);
 
-extern STATUS php_http_request_object_requesthandler(php_http_request_object_t *obj, zval *this_ptr, php_http_request_method_t *meth, char **url, php_http_message_body_t **body TSRMLS_DC);
+extern STATUS php_http_request_object_requesthandler(php_http_request_object_t *obj, zval *this_ptr, char **meth, char **url, php_http_message_body_t **body TSRMLS_DC);
 extern STATUS php_http_request_object_responsehandler(php_http_request_object_t *obj, zval *this_ptr TSRMLS_DC);
 
 PHP_METHOD(HttpRequest, __construct);