remove 90% of the request method cruft; request methods are now simple strings

[m6w6/ext-http] / php_http_request_pool.h

diff --git a/php_http_request_pool.h b/php_http_request_pool.h
index d2b6eb47310ed7edc4ae7c58d5c6f3b035831968..c0903302f497425152c080af3125cc8a2060e695 100644 (file)
--- a/php_http_request_pool.h
+++ b/php_http_request_pool.h
@@ -13,8 +13,6 @@
 #ifndef PHP_HTTP_REQUESTPOOL_H
 #define PHP_HTTP_REQUESTPOOL_H
 
-#include "php_http_request.h"
-
 typedef enum php_http_request_pool_setopt_opt {
        PHP_HTTP_REQUEST_POOL_OPT_ENABLE_PIPELINING,
        PHP_HTTP_REQUEST_POOL_OPT_USE_EVENTS,
@@ -29,7 +27,7 @@ typedef void (*php_http_request_pool_reset_func_t)(php_http_request_pool_t *p);
 typedef STATUS (*php_http_request_pool_exec_func_t)(php_http_request_pool_t *p);
 typedef STATUS (*php_http_request_pool_wait_func_t)(php_http_request_pool_t *p, struct timeval *custom_timeout);
 typedef int (*php_http_request_pool_once_func_t)(php_http_request_pool_t *p);
-typedef STATUS (*php_http_request_pool_attach_func_t)(php_http_request_pool_t *p, php_http_request_t *r, php_http_request_method_t m, const char *url, php_http_message_body_t *body);
+typedef STATUS (*php_http_request_pool_attach_func_t)(php_http_request_pool_t *p, php_http_request_t *r, const char *m, const char *url, php_http_message_body_t *body);
 typedef STATUS (*php_http_request_pool_detach_func_t)(php_http_request_pool_t *p, php_http_request_t *r);
 typedef STATUS (*php_http_request_pool_setopt_func_t)(php_http_request_pool_t *p, php_http_request_pool_setopt_opt_t opt, void *arg);
 
@@ -57,8 +55,6 @@ struct php_http_request_pool {
                zend_llist finished;
        } requests;
 
-       zval *persistent_handle_id;
-
 #ifdef ZTS
        void ***ts;
 #endif