X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_request_api.h;h=3ff2769a9db82413c91d59663f598fd0a07d7904;hp=52897b64e4e83300ff6f9f93f7a3c81dfc96c8eb;hb=5efb94c93bc4c1d4873706958962acc4313477f3;hpb=b272c1e03de58ff0c01f78421b824c7f45d43959 diff --git a/php_http_request_api.h b/php_http_request_api.h index 52897b6..3ff2769 100644 --- a/php_http_request_api.h +++ b/php_http_request_api.h @@ -17,8 +17,11 @@ #ifndef PHP_HTTP_REQUEST_API_H #define PHP_HTTP_REQUEST_API_H +#ifdef HTTP_HAVE_CURL #include "php_http_std_defs.h" +#include "php_http_request_method_api.h" + #include "phpstr/phpstr.h" #ifdef PHP_WIN32 @@ -27,49 +30,14 @@ #include -typedef enum { - HTTP_NO_REQUEST_METHOD = 0, - /* HTTP/1.1 */ - HTTP_GET = 1, - HTTP_HEAD = 2, - HTTP_POST = 3, - HTTP_PUT = 4, - HTTP_DELETE = 5, - HTTP_OPTIONS = 6, - HTTP_TRACE = 7, - HTTP_CONNECT = 8, - /* WebDAV - RFC 2518 */ - HTTP_PROPFIND = 9, - HTTP_PROPPATCH = 10, - HTTP_MKCOL = 11, - HTTP_COPY = 12, - HTTP_MOVE = 13, - HTTP_LOCK = 14, - HTTP_UNLOCK = 15, - /* WebDAV Versioning - RFC 3253 */ - HTTP_VERSION_CONTROL = 16, - HTTP_REPORT = 17, - HTTP_CHECKOUT = 18, - HTTP_CHECKIN = 19, - HTTP_UNCHECKOUT = 20, - HTTP_MKWORKSPACE = 21, - HTTP_UPDATE = 22, - HTTP_LABEL = 23, - HTTP_MERGE = 24, - HTTP_BASELINE_CONTROL = 25, - HTTP_MKACTIVITY = 26, - /* WebDAV Access Control - RFC 3744 */ - HTTP_ACL = 27, - HTTP_MAX_REQUEST_METHOD = 28 -} http_request_method; - -#define HTTP_STD_REQUEST_METHOD(m) ((m > HTTP_NO_REQUEST_METHOD) && (m < HTTP_MAX_REQUEST_METHOD)) -#define HTTP_CUSTOM_REQUEST_METHOD(m) (m - HTTP_MAX_REQUEST_METHOD) +#define http_request_global_init() _http_request_global_init(INIT_FUNC_ARGS_PASSTHRU) +extern STATUS _http_request_global_init(INIT_FUNC_ARGS); +#define http_request_global_cleanup() _http_request_global_cleanup(TSRMLS_C) +extern void _http_request_global_cleanup(TSRMLS_D); #define HTTP_REQUEST_BODY_CSTRING 1 #define HTTP_REQUEST_BODY_CURLPOST 2 #define HTTP_REQUEST_BODY_UPLOADFILE 3 -#define HTTP_REQUEST_BODY_UPLOADDATA 4 typedef struct { int type; void *data; @@ -77,35 +45,43 @@ typedef struct { } http_request_body; typedef struct { - CURLM *ch; - zend_llist handles; - zend_llist bodies; - int unfinished; -} http_request_pool; - -#define COPY_STRING 1 -#define COPY_SLIST 2 + void ***tsrm_ctx; + void *data; +} http_request_callback_ctx; + +typedef struct { + phpstr *response; + phpstr *request; + curl_infotype last_info; +} http_request_conv; + +#define HTTP_REQUEST_CALLBACK_DATA(from, type, var) \ + http_request_callback_ctx *__CTX = (http_request_callback_ctx *) (from); \ + TSRMLS_FETCH_FROM_CTX(__CTX->tsrm_ctx); \ + type (var) = (type) (__CTX->data) + +#define http_request_callback_data(data) _http_request_callback_data_ex((data), 1 TSRMLS_CC) +#define http_request_callback_data_ex(data, copy) _http_request_callback_data_ex((data), (copy) TSRMLS_CC) +extern http_request_callback_ctx *_http_request_callback_data_ex(void *data, zend_bool cpy TSRMLS_DC); + + +#define COPY_STRING 1 +#define COPY_SLIST 2 +#define COPY_CONTEXT 3 +#define COPY_CONV 4 #define http_request_data_copy(type, data) _http_request_data_copy((type), (data) TSRMLS_CC) extern void *_http_request_data_copy(int type, void *data TSRMLS_DC); #define http_request_data_free_string _http_request_data_free_string extern void _http_request_data_free_string(void *string); #define http_request_data_free_slist _http_request_data_free_slist extern void _http_request_data_free_slist(void *list); +#define http_request_data_free_context _http_request_data_free_context +extern void _http_request_data_free_context(void *context); +#define http_request_data_free_conv _http_request_data_free_conv +extern void _http_request_data_free_conv(void *conv); -#define http_request_global_init _http_request_global_init -extern STATUS _http_request_global_init(void); - -#define http_request_method_name(m) _http_request_method_name((m) TSRMLS_CC) -PHP_HTTP_API const char *_http_request_method_name(http_request_method m TSRMLS_DC); - -#define http_request_method_exists(u, l, c) _http_request_method_exists((u), (l), (c) TSRMLS_CC) -PHP_HTTP_API unsigned long _http_request_method_exists(zend_bool by_name, unsigned long id, const char *name TSRMLS_DC); - -#define http_request_method_register(m) _http_request_method_register((m) TSRMLS_CC) -PHP_HTTP_API unsigned long _http_request_method_register(const char *method TSRMLS_DC); - -#define http_request_method_unregister(mn) _http_request_method_unregister((mn) TSRMLS_CC) -PHP_HTTP_API STATUS _http_request_method_unregister(unsigned long method TSRMLS_DC); +#define http_request_conv(ch, rs, rq) _http_request_conv((ch), (rs), (rq) TSRMLS_CC) +extern void _http_request_conv(CURL *ch, phpstr* response, phpstr *request TSRMLS_DC); #define http_request_body_new() _http_request_body_new(TSRMLS_C) PHP_HTTP_API http_request_body *_http_request_body_new(TSRMLS_D); @@ -119,33 +95,18 @@ PHP_HTTP_API void _http_request_body_dtor(http_request_body *body TSRMLS_DC); #define http_request_body_free(b) _http_request_body_free((b) TSRMLS_CC) PHP_HTTP_API void _http_request_body_free(http_request_body *body TSRMLS_DC); -#define http_request_pool_init(p) _http_request_pool_init((p) TSRMLS_CC) -PHP_HTTP_API http_request_pool *_http_request_pool_init(http_request_pool *pool TSRMLS_DC); - -#define http_request_pool_attach(p, r) _http_request_pool_attach((p), (r) TSRMLS_CC) -PHP_HTTP_API STATUS _http_request_pool_attach(http_request_pool *pool, zval *request TSRMLS_DC); - -#define http_request_pool_detach(p, r) _http_request_pool_detach((p), (r) TSRMLS_CC) -PHP_HTTP_API STATUS _http_request_pool_detach(http_request_pool *pool, zval *request TSRMLS_DC); +#define http_request_init(ch, meth, url, body, options) _http_request_init((ch), (meth), (url), (body), (options) TSRMLS_CC) +PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char *url, http_request_body *body, HashTable *options TSRMLS_DC); -#define http_request_pool_send(p) _http_request_pool_send((p) TSRMLS_CC) -PHP_HTTP_API STATUS _http_request_pool_send(http_request_pool *pool TSRMLS_DC); - -#define http_request_pool_dtor(p) _http_request_pool_dtor((p) TSRMLS_CC) -PHP_HTTP_API void _http_request_pool_dtor(http_request_pool *pool TSRMLS_DC); - -#define http_request_init(ch, meth, url, body, options, response) _http_request_init((ch), (meth), (url), (body), (options), (response) TSRMLS_CC) -PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, const char *url, http_request_body *body, HashTable *options, phpstr *response TSRMLS_DC); - -#define http_request_exec(ch, i) _http_request_exec((ch), (i) TSRMLS_CC) -PHP_HTTP_API STATUS _http_request_exec(CURL *ch, HashTable *info TSRMLS_DC); +#define http_request_exec(ch, i, response, request) _http_request_exec((ch), (i), (response), (request) TSRMLS_CC) +PHP_HTTP_API STATUS _http_request_exec(CURL *ch, HashTable *info, phpstr *response, phpstr *request TSRMLS_DC); #define http_request_info(ch, i) _http_request_info((ch), (i) TSRMLS_CC) PHP_HTTP_API void _http_request_info(CURL *ch, HashTable *info TSRMLS_DC); #define http_request(meth, url, body, opt, info, resp) _http_request_ex(NULL, (meth), (url), (body), (opt), (info), (resp) TSRMLS_CC) #define http_request_ex(ch, meth, url, body, opt, info, resp) _http_request_ex((ch), (meth), (url), (body), (opt), (info), (resp) TSRMLS_CC) -PHP_HTTP_API STATUS _http_request_ex(CURL *ch, http_request_method meth, const char *URL, http_request_body *body, HashTable *options, HashTable *info, phpstr *response TSRMLS_DC); +PHP_HTTP_API STATUS _http_request_ex(CURL *ch, http_request_method meth, char *URL, http_request_body *body, HashTable *options, HashTable *info, phpstr *response TSRMLS_DC); #define http_get(u, o, i, r) _http_request_ex(NULL, HTTP_GET, (u), NULL, (o), (i), (r) TSRMLS_CC) #define http_get_ex(c, u, o, i, r) _http_request_ex((c), HTTP_GET, (u), NULL, (o), (i), (r) TSRMLS_CC) @@ -159,6 +120,7 @@ PHP_HTTP_API STATUS _http_request_ex(CURL *ch, http_request_method meth, const c #define http_put(u, b, o, i, r) _http_request_ex(NULL, HTTP_PUT, (u), (b), (o), (i), (r) TSRMLS_CC) #define http_put_ex(c, u, b, o, i, r) _http_request_ex((c), HTTP_PUT, (u), (b), (o), (i), (r) TSRMLS_CC) +#endif #endif /*