X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_request_api.c;h=2af5774c131f27e1ebbfb31355e6b0fb1ab5a366;hp=13a14e4e3b1cffff310b60ac37eef81b9cc20cee;hb=61ced187b8a3a3c21578d253e37d1a076aa0aed4;hpb=3f8d6ea256f520d439cebc37c46bb93c30b2660e diff --git a/http_request_api.c b/http_request_api.c index 13a14e4..2af5774 100644 --- a/http_request_api.c +++ b/http_request_api.c @@ -20,10 +20,13 @@ #endif #include "php.h" +#ifdef HTTP_HAVE_CURL + #include "php_http.h" #include "php_http_std_defs.h" #include "php_http_api.h" #include "php_http_request_api.h" +#include "php_http_request_method_api.h" #include "php_http_url_api.h" #ifdef ZEND_ENGINE_2 # include "php_http_request_object.h" @@ -39,11 +42,7 @@ ZEND_EXTERN_MODULE_GLOBALS(http); -#ifndef HTTP_CURL_USE_ZEND_MM -# define HTTP_CURL_USE_ZEND_MM 0 -#endif - -#if LIBCURL_VERSION_NUM < 0x070c00 +#ifndef HAVE_CURL_EASY_STRERROR # define curl_easy_strerror(code) HTTP_G(request).error #endif @@ -101,13 +100,6 @@ ZEND_EXTERN_MODULE_GLOBALS(http); continue; \ } -typedef struct _http_curl_conv { - phpstr *response; - phpstr *request; - curl_infotype last_info; -} http_curl_conv; - -static const char *const http_request_methods[HTTP_MAX_REQUEST_METHOD + 1]; #define http_curl_getopt(o, k, t) _http_curl_getopt_ex((o), (k), sizeof(k), (t) TSRMLS_CC) #define http_curl_getopt_ex(o, k, l, t) _http_curl_getopt_ex((o), (k), (l), (t) TSRMLS_CC) static inline zval *_http_curl_getopt_ex(HashTable *options, char *key, size_t keylen, int type TSRMLS_DC); @@ -116,41 +108,20 @@ static int http_curl_progress_callback(void *, double, double, double, double); static int http_curl_raw_callback(CURL *, curl_infotype, char *, size_t, void *); static int http_curl_dummy_callback(char *data, size_t n, size_t l, void *s) { return n*l; } -#define HTTP_CURL_CALLBACK_DATA(from, type, var) \ - http_curl_callback_ctx *__CTX = (http_curl_callback_ctx *) (from); \ - TSRMLS_FETCH_FROM_CTX(__CTX->tsrm_ctx); \ - type (var) = (type) (__CTX->data) - -#define http_curl_callback_data(data) _http_curl_callback_data((data) TSRMLS_CC) -static http_curl_callback_ctx *_http_curl_callback_data(void *data TSRMLS_DC); - -#if HTTP_CURL_USE_ZEND_MM -static void http_curl_free(void *p) { efree(p); } -static char *http_curl_strdup(const char *p) { return estrdup(p); } -static void *http_curl_malloc(size_t s) { return emalloc(s); } -static void *http_curl_realloc(void *p, size_t s) { return erealloc(p, s); } -static void *http_curl_calloc(size_t n, size_t s) { return ecalloc(n, s); } -#endif - -/* {{{ STATUS http_request_global_init() */ -STATUS _http_request_global_init(void) +/* {{{ http_request_callback_ctx http_request_callback_data(void *) */ +http_request_callback_ctx *_http_request_callback_data_ex(void *data, zend_bool cpy TSRMLS_DC) { -#if HTTP_CURL_USE_ZEND_MM - if (CURLE_OK != curl_global_init_mem(CURL_GLOBAL_ALL, - http_curl_malloc, - http_curl_free, - http_curl_realloc, - http_curl_strdup, - http_curl_calloc)) { - return FAILURE; - } -#else - if (CURLE_OK != curl_global_init(CURL_GLOBAL_ALL)) { - return FAILURE; + http_request_callback_ctx *ctx = emalloc(sizeof(http_request_callback_ctx)); + + TSRMLS_SET_CTX(ctx->tsrm_ctx); + ctx->data = data; + + if (cpy) { + return http_request_data_copy(COPY_CONTEXT, ctx); + } else { + return ctx; } -#endif - return SUCCESS; } /* }}} */ @@ -178,6 +149,12 @@ void *_http_request_data_copy(int type, void *data TSRMLS_DC) return data; } + case COPY_CONV: + { + zend_llist_add_element(&HTTP_G(request).copies.convs, &data); + return data; + } + default: { return data; @@ -200,10 +177,17 @@ void _http_request_data_free_slist(void *list) } /* }}} */ -/* {{{ _http_request_data_free_context(http_curl_callback_ctx **) */ +/* {{{ _http_request_data_free_context(http_request_callback_ctx **) */ void _http_request_data_free_context(void *context) { - efree(*((http_curl_callback_ctx **) context)); + efree(*((http_request_callback_ctx **) context)); +} +/* }}} */ + +/* {{{ _http_request_data_free_conv(http_request_conv **) */ +void _http_request_data_free_conv(void *conv) +{ + efree(*((http_request_conv **) conv)); } /* }}} */ @@ -232,11 +216,11 @@ PHP_HTTP_API STATUS _http_request_body_fill(http_request_body *body, HashTable * err = curl_formadd(&http_post_data[0], &http_post_data[1], CURLFORM_COPYNAME, key, CURLFORM_COPYCONTENTS, Z_STRVAL_PP(data), - CURLFORM_CONTENTSLENGTH, Z_STRLEN_PP(data), + CURLFORM_CONTENTSLENGTH, (long) Z_STRLEN_PP(data), CURLFORM_END ); if (CURLE_OK != err) { - http_error_ex(E_WARNING, HTTP_E_CURL, "Could not encode post fields: %s", curl_easy_strerror(err)); + http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Could not encode post fields: %s", curl_easy_strerror(err)); curl_formfree(http_post_data[0]); return FAILURE; } @@ -260,12 +244,12 @@ PHP_HTTP_API STATUS _http_request_body_fill(http_request_body *body, HashTable * CURLFORM_END ); if (CURLE_OK != err) { - http_error_ex(E_WARNING, HTTP_E_CURL, "Could not encode post files: %s", curl_easy_strerror(err)); + http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Could not encode post files: %s", curl_easy_strerror(err)); curl_formfree(http_post_data[0]); return FAILURE; } } else { - http_error(E_NOTICE, HTTP_E_PARAM, "Post file array entry misses either 'name', 'type' or 'file' entry"); + http_error(HE_NOTICE, HTTP_E_INVALID_PARAM, "Post file array entry misses either 'name', 'type' or 'file' entry"); } } @@ -278,7 +262,7 @@ PHP_HTTP_API STATUS _http_request_body_fill(http_request_body *body, HashTable * size_t encoded_len; if (SUCCESS != http_urlencode_hash_ex(fields, 1, NULL, 0, &encoded, &encoded_len)) { - http_error(E_WARNING, HTTP_E_ENCODE, "Could not encode post data"); + http_error(HE_WARNING, HTTP_E_ENCODING, "Could not encode post data"); return FAILURE; } @@ -363,7 +347,7 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char if (zoption = http_curl_getopt(options, "onprogress", 0)) { HTTP_CURL_OPT(NOPROGRESS, 0); HTTP_CURL_OPT(PROGRESSFUNCTION, http_curl_progress_callback); - HTTP_CURL_OPT(PROGRESSDATA, http_curl_callback_data(zoption)); + HTTP_CURL_OPT(PROGRESSDATA, http_request_callback_data(zoption)); } else { HTTP_CURL_OPT(NOPROGRESS, 1); } @@ -488,7 +472,7 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char phpstr_fix(qstr); HTTP_CURL_OPT(COOKIE, http_request_data_copy(COPY_STRING, qstr->data)); } - phpstr_free(qstr); + phpstr_free(&qstr); } else { HTTP_CURL_OPT(COOKIE, NULL); } @@ -516,7 +500,7 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char } /* resume */ - if (zoption = http_curl_getopt(options, "resume", IS_LONG)) { + if ((zoption = http_curl_getopt(options, "resume", IS_LONG)) && (Z_LVAL_P(zoption) != 0)) { range_req = 1; HTTP_CURL_OPT(RESUME_FROM, Z_LVAL_P(zoption)); } else { @@ -538,11 +522,11 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char HTTP_CURL_OPT(TIMEVALUE, 0); } - /* timeout, defaults to 3 */ + /* timeout, defaults to 0 */ if (zoption = http_curl_getopt(options, "timeout", IS_LONG)) { HTTP_CURL_OPT(TIMEOUT, Z_LVAL_P(zoption)); } else { - HTTP_CURL_OPT(TIMEOUT, 3); + HTTP_CURL_OPT(TIMEOUT, 0); } /* connecttimeout, defaults to 3 */ @@ -618,7 +602,7 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char if (http_request_method_exists(0, meth, NULL)) { curl_easy_setopt(ch, CURLOPT_CUSTOMREQUEST, http_request_method_name(meth)); } else { - http_error_ex(E_WARNING, HTTP_E_CURL, "Unsupported request method: %d", meth); + http_error_ex(HE_WARNING, HTTP_E_REQUEST_METHOD, "Unsupported request method: %d", meth); return FAILURE; } break; @@ -638,12 +622,13 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char break; case HTTP_REQUEST_BODY_UPLOADFILE: - curl_easy_setopt(ch, CURLOPT_READDATA, http_curl_callback_data(body)); + curl_easy_setopt(ch, CURLOPT_READDATA, http_request_callback_data(body)); curl_easy_setopt(ch, CURLOPT_INFILESIZE, body->size); break; default: - http_error_ex(E_WARNING, HTTP_E_CURL, "Unknown request body type: %d", body->type); + /* shouldn't ever happen */ + http_error_ex(HE_ERROR, 0, "Unknown request body type: %d", body->type); return FAILURE; break; } @@ -653,17 +638,27 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char } /* }}} */ +/* {{{ void http_request_conv(CURL *, phpstr *, phpstr *) */ +void _http_request_conv(CURL *ch, phpstr* response, phpstr *request TSRMLS_DC) +{ + http_request_conv *conv = emalloc(sizeof(http_request_conv)); + conv->response = response; + conv->request = request; + conv->last_info = -1; + HTTP_CURL_OPT(DEBUGDATA, http_request_callback_data(http_request_data_copy(COPY_CONV, conv))); +} +/* }}} */ + /* {{{ STATUS http_request_exec(CURL *, HashTable *) */ PHP_HTTP_API STATUS _http_request_exec(CURL *ch, HashTable *info, phpstr *response, phpstr *request TSRMLS_DC) { CURLcode result; - http_curl_conv conv = {response, request, -1}; - HTTP_CURL_OPT(DEBUGDATA, http_curl_callback_data(&conv)); + http_request_conv(ch, response, request); /* perform request */ if (CURLE_OK != (result = curl_easy_perform(ch))) { - http_error_ex(E_WARNING, HTTP_E_CURL, "Could not perform request: %s", curl_easy_strerror(result)); + http_error_ex(HE_WARNING, HTTP_E_REQUEST, "Could not perform request: %s", curl_easy_strerror(result)); return FAILURE; } else { /* get curl info */ @@ -737,7 +732,7 @@ PHP_HTTP_API STATUS _http_request_ex(CURL *ch, http_request_method meth, char *u if ((clean_curl = (!ch))) { if (!(ch = curl_easy_init())) { - http_error(E_WARNING, HTTP_E_CURL, "Could not initialize curl."); + http_error(HE_WARNING, HTTP_E_REQUEST, "Could not initialize curl."); return FAILURE; } } @@ -752,138 +747,10 @@ PHP_HTTP_API STATUS _http_request_ex(CURL *ch, http_request_method meth, char *u } /* }}} */ -/* {{{ char *http_request_method_name(http_request_method) */ -PHP_HTTP_API const char *_http_request_method_name(http_request_method m TSRMLS_DC) -{ - zval **meth; - - if (HTTP_STD_REQUEST_METHOD(m)) { - return http_request_methods[m]; - } - - if (SUCCESS == zend_hash_index_find(&HTTP_G(request).methods.custom, HTTP_CUSTOM_REQUEST_METHOD(m), (void **) &meth)) { - return Z_STRVAL_PP(meth); - } - - return http_request_methods[0]; -} -/* }}} */ - -/* {{{ unsigned long http_request_method_exists(zend_bool, unsigned long, char *) */ -PHP_HTTP_API unsigned long _http_request_method_exists(zend_bool by_name, unsigned long id, const char *name TSRMLS_DC) -{ - if (by_name) { - unsigned i; - - for (i = HTTP_NO_REQUEST_METHOD + 1; i < HTTP_MAX_REQUEST_METHOD; ++i) { - if (!strcmp(name, http_request_methods[i])) { - return i; - } - } - { - zval **data; - char *key; - ulong idx; - - FOREACH_HASH_KEYVAL(&HTTP_G(request).methods.custom, key, idx, data) { - if (!strcmp(name, Z_STRVAL_PP(data))) { - return idx + HTTP_MAX_REQUEST_METHOD; - } - } - } - return 0; - } else { - return HTTP_STD_REQUEST_METHOD(id) || zend_hash_index_exists(&HTTP_G(request).methods.custom, HTTP_CUSTOM_REQUEST_METHOD(id)) ? id : 0; - } -} -/* }}} */ - -/* {{{ unsigned long http_request_method_register(char *) */ -PHP_HTTP_API unsigned long _http_request_method_register(const char *method TSRMLS_DC) -{ - zval array; - char *http_method; - unsigned long meth_num = HTTP_G(request).methods.custom.nNextFreeElement + HTTP_MAX_REQUEST_METHOD; - - Z_ARRVAL(array) = &HTTP_G(request).methods.custom; - add_next_index_string(&array, estrdup(method), 0); - - spprintf(&http_method, 0, "HTTP_%s", method); - zend_register_long_constant(http_method, strlen(http_method) + 1, meth_num, CONST_CS, http_module_number TSRMLS_CC); - efree(http_method); - - return meth_num; -} -/* }}} */ - -/* {{{ STATUS http_request_method_unregister(usngigned long) */ -PHP_HTTP_API STATUS _http_request_method_unregister(unsigned long method TSRMLS_DC) -{ - zval **zmethod; - char *http_method; - - if (SUCCESS != zend_hash_index_find(&HTTP_G(request).methods.custom, HTTP_CUSTOM_REQUEST_METHOD(method), (void **) &zmethod)) { - http_error_ex(E_NOTICE, HTTP_E_PARAM, "Request method with id %lu does not exist", method); - return FAILURE; - } - - spprintf(&http_method, 0, "HTTP_%s", Z_STRVAL_PP(zmethod)); - - if ( (SUCCESS != zend_hash_index_del(&HTTP_G(request).methods.custom, HTTP_CUSTOM_REQUEST_METHOD(method))) - || (SUCCESS != zend_hash_del(EG(zend_constants), http_method, strlen(http_method) + 1))) { - http_error_ex(E_NOTICE, 0, "Could not unregister request method: %s", http_method); - efree(http_method); - return FAILURE; - } - - efree(http_method); - return SUCCESS; -} -/* }}} */ - - -/* {{{ char *http_request_methods[] */ -static const char *const http_request_methods[] = { - "UNKOWN", - /* HTTP/1.1 */ - "GET", - "HEAD", - "POST", - "PUT", - "DELETE", - "OPTIONS", - "TRACE", - "CONNECT", - /* WebDAV - RFC 2518 */ - "PROPFIND", - "PROPPATCH", - "MKCOL", - "COPY", - "MOVE", - "LOCK", - "UNLOCK", - /* WebDAV Versioning - RFC 3253 */ - "VERSION-CONTROL", - "REPORT", - "CHECKOUT", - "CHECKIN", - "UNCHECKOUT", - "MKWORKSPACE", - "UPDATE", - "LABEL", - "MERGE", - "BASELINE-CONTROL", - "MKACTIVITY", - /* WebDAV Access Control - RFC 3744 */ - "ACL", - NULL -}; -/* }}} */ - /* {{{ static size_t http_curl_read_callback(void *, size_t, size_t, void *) */ static size_t http_curl_read_callback(void *data, size_t len, size_t n, void *s) { - HTTP_CURL_CALLBACK_DATA(s, http_request_body *, body); + HTTP_REQUEST_CALLBACK_DATA(s, http_request_body *, body); if (body->type != HTTP_REQUEST_BODY_UPLOADFILE) { return 0; @@ -892,21 +759,11 @@ static size_t http_curl_read_callback(void *data, size_t len, size_t n, void *s) } /* }}} */ -/* {{{ http_curl_callback_ctx http_curl_callback_data(void *) */ -static http_curl_callback_ctx *_http_curl_callback_data(void *data TSRMLS_DC) -{ - http_curl_callback_ctx *ctx = emalloc(sizeof(http_curl_callback_ctx)); - TSRMLS_SET_CTX(ctx->tsrm_ctx); - ctx->data = data; - return http_request_data_copy(COPY_CONTEXT, ctx); -} -/* }}} */ - /* {{{ static int http_curl_progress_callback(void *, double, double, double, double) */ static int http_curl_progress_callback(void *data, double dltotal, double dlnow, double ultotal, double ulnow) { zval *params_pass[4], params_local[4], retval; - HTTP_CURL_CALLBACK_DATA(data, zval *, func); + HTTP_REQUEST_CALLBACK_DATA(data, zval *, func); params_pass[0] = ¶ms_local[0]; params_pass[1] = ¶ms_local[1]; @@ -929,7 +786,11 @@ static int http_curl_progress_callback(void *data, double dltotal, double dlnow, /* {{{ static int http_curl_raw_callback(CURL *, curl_infotype, char *, size_t, void *) */ static int http_curl_raw_callback(CURL *ch, curl_infotype type, char *data, size_t length, void *ctx) { - HTTP_CURL_CALLBACK_DATA(ctx, http_curl_conv *, conv); + HTTP_REQUEST_CALLBACK_DATA(ctx, http_request_conv *, conv); + +#if 0 + fprintf(stderr, "DEBUG: %s\n", data); +#endif switch (type) { @@ -987,6 +848,8 @@ static inline zval *_http_curl_getopt_ex(HashTable *options, char *key, size_t k } /* }}} */ +#endif + /* * Local variables: * tab-width: 4