X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_request_api.c;h=06b69f719e8039b72788da31a6f3043417258dca;hp=5bb5b6580ad203939f80d56d1a34fcdeb75987e9;hb=669d2e6a8bdc642b6b52693f4593f199ddd7e8d2;hpb=62fd5b5f1e43cf04e0467a48578826726cfe5821 diff --git a/http_request_api.c b/http_request_api.c index 5bb5b65..06b69f7 100644 --- a/http_request_api.c +++ b/http_request_api.c @@ -1,59 +1,208 @@ /* - +----------------------------------------------------------------------+ - | PECL :: http | - +----------------------------------------------------------------------+ - | This source file is subject to version 3.0 of the PHP license, that | - | is bundled with this package in the file LICENSE, and is available | - | through the world-wide-web at http://www.php.net/license/3_0.txt. | - | If you did not receive a copy of the PHP license and are unable to | - | obtain it through the world-wide-web, please send a note to | - | license@php.net so we can mail you a copy immediately. | - +----------------------------------------------------------------------+ - | Copyright (c) 2004-2005 Michael Wallner | - +----------------------------------------------------------------------+ + +--------------------------------------------------------------------+ + | PECL :: http | + +--------------------------------------------------------------------+ + | Redistribution and use in source and binary forms, with or without | + | modification, are permitted provided that the conditions mentioned | + | in the accompanying LICENSE file are met. | + +--------------------------------------------------------------------+ + | Copyright (c) 2004-2006, Michael Wallner | + +--------------------------------------------------------------------+ */ /* $Id$ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif -#include "php.h" +#define HTTP_WANT_SAPI +#define HTTP_WANT_CURL +#include "php_http.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_url_api.h" + #ifdef ZEND_ENGINE_2 # include "php_http_request_object.h" #endif -#include "phpstr/phpstr.h" +/* {{{ cruft for thread safe SSL crypto locks */ +#if defined(ZTS) && defined(HTTP_HAVE_SSL) +# ifdef PHP_WIN32 +# define HTTP_NEED_OPENSSL_TSL +# include +# else /* !PHP_WIN32 */ +# if defined(HTTP_HAVE_OPENSSL) +# if defined(HAVE_OPENSSL_CRYPTO_H) +# define HTTP_NEED_OPENSSL_TSL +# include +# else +# warning \ + "libcurl was compiled with OpenSSL support, but configure could not find " \ + "openssl/crypto.h; thus no SSL crypto locking callbacks will be set, which may " \ + "cause random crashes on SSL requests" +# endif +# elif defined(HTTP_HAVE_GNUTLS) +# if defined(HAVE_GCRYPT_H) +# define HTTP_NEED_GNUTLS_TSL +# include +# else +# warning \ + "libcurl was compiled with GnuTLS support, but configure could not find " \ + "gcrypt.h; thus no SSL crypto locking callbacks will be set, which may " \ + "cause random crashes on SSL requests" +# endif +# else +# warning \ + "libcurl was compiled with SSL support, but configure could not determine which" \ + "library was used; thus no SSL crypto locking callbacks will be set, which may " \ + "cause random crashes on SSL requests" +# endif /* HTTP_HAVE_OPENSSL || HTTP_HAVE_GNUTLS */ +# endif /* PHP_WIN32 */ +#endif /* ZTS && HTTP_HAVE_SSL */ + +#ifdef HTTP_NEED_OPENSSL_TSL +static MUTEX_T *http_openssl_tsl = NULL; + +static void http_openssl_thread_lock(int mode, int n, const char * file, int line) +{ + if (mode & CRYPTO_LOCK) { + tsrm_mutex_lock(http_openssl_tsl[n]); + } else { + tsrm_mutex_unlock(http_openssl_tsl[n]); + } +} -#ifdef PHP_WIN32 -# include +static ulong http_openssl_thread_id(void) +{ + return (ulong) tsrm_thread_id(); +} #endif +#ifdef HTTP_NEED_GNUTLS_TSL +static int http_gnutls_mutex_create(void **m) +{ + if (*((MUTEX_T *) m) = tsrm_mutex_alloc()) { + return SUCCESS; + } else { + return FAILURE; + } +} -#include +static int http_gnutls_mutex_destroy(void **m) +{ + tsrm_mutex_free(*((MUTEX_T *) m)); + return SUCCESS; +} -ZEND_EXTERN_MODULE_GLOBALS(http); +static int http_gnutls_mutex_lock(void **m) +{ + return tsrm_mutex_lock(*((MUTEX_T *) m)); +} -#if LIBCURL_VERSION_NUM < 0x070c00 -# define curl_easy_strerror(code) HTTP_G(request).error +static int http_gnutls_mutex_unlock(void **m) +{ + return tsrm_mutex_unlock(*((MUTEX_T *) m)); +} + +static struct gcry_thread_cbs http_gnutls_tsl = { + GCRY_THREAD_OPTION_USER, + NULL, + http_gnutls_mutex_create, + http_gnutls_mutex_destroy, + http_gnutls_mutex_lock, + http_gnutls_mutex_unlock +}; +#endif +/* }}} */ + +/* {{{ MINIT */ +PHP_MINIT_FUNCTION(http_request) +{ +#ifdef HTTP_NEED_OPENSSL_TSL + int i, c = CRYPTO_num_locks(); + + http_openssl_tsl = malloc(c * sizeof(MUTEX_T)); + + for (i = 0; i < c; ++i) { + http_openssl_tsl[i] = tsrm_mutex_alloc(); + } + + CRYPTO_set_id_callback(http_openssl_thread_id); + CRYPTO_set_locking_callback(http_openssl_thread_lock); +#endif +#ifdef HTTP_NED_GNUTLS_TSL + gcry_control(GCRYCTL_SET_THREAD_CBS, &http_gnutls_tsl); #endif -#define HTTP_CURL_INFO(I) HTTP_CURL_INFO_EX(I, I) + if (CURLE_OK != curl_global_init(CURL_GLOBAL_ALL)) { + return FAILURE; + } + + HTTP_LONG_CONSTANT("HTTP_AUTH_BASIC", CURLAUTH_BASIC); + HTTP_LONG_CONSTANT("HTTP_AUTH_DIGEST", CURLAUTH_DIGEST); + HTTP_LONG_CONSTANT("HTTP_AUTH_NTLM", CURLAUTH_NTLM); + HTTP_LONG_CONSTANT("HTTP_AUTH_ANY", CURLAUTH_ANY); + + HTTP_LONG_CONSTANT("HTTP_VERSION_NONE", CURL_HTTP_VERSION_NONE); + HTTP_LONG_CONSTANT("HTTP_VERSION_1_0", CURL_HTTP_VERSION_1_0); + HTTP_LONG_CONSTANT("HTTP_VERSION_1_1", CURL_HTTP_VERSION_1_1); + +#if HTTP_CURL_VERSION(7,15,2) + HTTP_LONG_CONSTANT("HTTP_PROXY_SOCKS4", CURLPROXY_SOCKS4); +#endif + HTTP_LONG_CONSTANT("HTTP_PROXY_SOCKS5", CURLPROXY_SOCKS5); + HTTP_LONG_CONSTANT("HTTP_PROXY_HTTP", CURLPROXY_HTTP); + return SUCCESS; +} +/* }}} */ + +/* {{{ MSHUTDOWN */ +PHP_MSHUTDOWN_FUNCTION(http_request) +{ +#ifdef HTTP_NEED_OPENSSL_TSL + CRYPTO_set_id_callback(http_openssl_thread_id); + CRYPTO_set_locking_callback(http_openssl_thread_lock); +#endif + curl_global_cleanup(); +#ifdef HTTP_NEED_OPENSSL_TSL + if (http_openssl_tsl) { + int i, c = CRYPTO_num_locks(); + + CRYPTO_set_id_callback(NULL); + CRYPTO_set_locking_callback(NULL); + + for (i = 0; i < c; ++i) { + tsrm_mutex_free(http_openssl_tsl[i]); + } + + free(http_openssl_tsl); + http_openssl_tsl = NULL; + } +#endif + return SUCCESS; +} +/* }}} */ + +/* {{{ MACROS */ +#ifndef HAVE_CURL_EASY_STRERROR +# define curl_easy_strerror(dummy) "unknown error" +#endif + +#define HTTP_CURL_INFO(I) \ + { \ + char *N = #I; \ + HTTP_CURL_INFO_EX(I, N+lenof("CURLINFO_")); \ + } #define HTTP_CURL_INFO_EX(I, X) \ - switch (CURLINFO_ ##I & ~CURLINFO_MASK) \ + switch (I & ~CURLINFO_MASK) \ { \ case CURLINFO_STRING: \ { \ char *c; \ - if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_ ##I, &c)) { \ - add_assoc_string(&array, pretty_key(http_request_data_copy(COPY_STRING, #X), sizeof(#X)-1, 0, 0), c ? c : "", 1); \ + if (CURLE_OK == curl_easy_getinfo(request->ch, I, &c)) { \ + char *key = estrndup(X, strlen(X)); \ + add_assoc_string(&array, pretty_key(key, strlen(X), 0, 0), c ? c : "", 1); \ + efree(key); \ } \ } \ break; \ @@ -61,8 +210,10 @@ ZEND_EXTERN_MODULE_GLOBALS(http); case CURLINFO_DOUBLE: \ { \ double d; \ - if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_ ##I, &d)) { \ - add_assoc_double(&array, pretty_key(http_request_data_copy(COPY_STRING, #X), sizeof(#X)-1, 0, 0), d); \ + if (CURLE_OK == curl_easy_getinfo(request->ch, I, &d)) { \ + char *key = estrndup(X, strlen(X)); \ + add_assoc_double(&array, pretty_key(key, strlen(X), 0, 0), d); \ + efree(key); \ } \ } \ break; \ @@ -70,557 +221,682 @@ ZEND_EXTERN_MODULE_GLOBALS(http); case CURLINFO_LONG: \ { \ long l; \ - if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_ ##I, &l)) { \ - add_assoc_long(&array, pretty_key(http_request_data_copy(COPY_STRING, #X), sizeof(#X)-1, 0, 0), l); \ + if (CURLE_OK == curl_easy_getinfo(request->ch, I, &l)) { \ + char *key = estrndup(X, strlen(X)); \ + add_assoc_long(&array, pretty_key(key, strlen(X), 0, 0), l); \ + efree(key); \ } \ } \ break; \ +\ + case CURLINFO_SLIST: \ + { \ + struct curl_slist *l, *p; \ + if (CURLE_OK == curl_easy_getinfo(request->ch, I, &l)) { \ + zval *subarray; \ + char *key = estrndup(X, strlen(X)); \ + MAKE_STD_ZVAL(subarray); \ + array_init(subarray); \ + for (p = l; p; p = p->next) { \ + add_next_index_string(subarray, p->data, 1); \ + } \ + add_assoc_zval(&array, pretty_key(key, strlen(X), 0, 0), subarray); \ + curl_slist_free_all(l); \ + efree(key); \ + } \ + } \ } -#define HTTP_CURL_OPT(OPTION, p) curl_easy_setopt(ch, CURLOPT_##OPTION, (p)) -#define HTTP_CURL_OPT_STRING(keyname) HTTP_CURL_OPT_STRING_EX(keyname, keyname) -#define HTTP_CURL_OPT_SSL_STRING(keyname) HTTP_CURL_OPT_STRING_EX(keyname, SSL##keyname) -#define HTTP_CURL_OPT_SSL_STRING_(keyname) HTTP_CURL_OPT_STRING_EX(keyname, SSL_##keyname) -#define HTTP_CURL_OPT_STRING_EX(keyname, optname) \ - if (!strcasecmp(key, #keyname)) { \ - convert_to_string_ex(param); \ - HTTP_CURL_OPT(optname, http_request_data_copy(COPY_STRING, Z_STRVAL_PP(param))); \ +#define HTTP_CURL_OPT(OPTION, p) HTTP_CURL_OPT_EX(request->ch, OPTION, (p)) +#define HTTP_CURL_OPT_EX(ch, OPTION, p) curl_easy_setopt((ch), OPTION, (p)) + +#define HTTP_CURL_OPT_STRING(OPTION, ldiff, obdc) \ + { \ + char *K = #OPTION; \ + HTTP_CURL_OPT_STRING_EX(K+lenof("CURLOPT_KEY")+ldiff, OPTION, obdc); \ + } +#define HTTP_CURL_OPT_STRING_EX(keyname, optname, obdc) \ + if (!strcasecmp(key, keyname)) { \ + zval *copy = http_request_option_cache(request, keyname, zval_copy(IS_STRING, *param)); \ + if (obdc) { \ + HTTP_CHECK_OPEN_BASEDIR(Z_STRVAL_P(copy), return FAILURE); \ + } \ + HTTP_CURL_OPT(optname, Z_STRVAL_P(copy)); \ key = NULL; \ continue; \ } -#define HTTP_CURL_OPT_LONG(keyname) HTTP_OPT_SSL_LONG_EX(keyname, keyname) -#define HTTP_CURL_OPT_SSL_LONG(keyname) HTTP_CURL_OPT_LONG_EX(keyname, SSL##keyname) -#define HTTP_CURL_OPT_SSL_LONG_(keyname) HTTP_CURL_OPT_LONG_EX(keyname, SSL_##keyname) +#define HTTP_CURL_OPT_LONG(OPTION, ldiff) \ + { \ + char *K = #OPTION; \ + HTTP_CURL_OPT_LONG_EX(K+lenof("CURLOPT_KEY")+ldiff, OPTION); \ + } #define HTTP_CURL_OPT_LONG_EX(keyname, optname) \ - if (!strcasecmp(key, #keyname)) { \ - convert_to_long_ex(param); \ - HTTP_CURL_OPT(optname, Z_LVAL_PP(param)); \ + if (!strcasecmp(key, keyname)) { \ + zval *copy = http_request_option_cache(request, keyname, zval_copy(IS_LONG, *param)); \ + HTTP_CURL_OPT(optname, Z_LVAL_P(copy)); \ key = NULL; \ continue; \ } +/* }}} */ + +/* {{{ forward declarations */ +#define http_request_option(r, o, k, t) _http_request_option_ex((r), (o), (k), sizeof(k), (t) TSRMLS_CC) +#define http_request_option_ex(r, o, k, l, t) _http_request_option_ex((r), (o), (k), (l), (t) TSRMLS_CC) +static inline zval *_http_request_option_ex(http_request *request, HashTable *options, char *key, size_t keylen, int type TSRMLS_DC); +#define http_request_option_cache(r, k, z) _http_request_option_cache_ex((r), (k), sizeof(k), 0, (z) TSRMLS_CC) +#define http_request_option_cache_ex(r, k, kl, h, z) _http_request_option_cache_ex((r), (k), (kl), (h), (z) TSRMLS_CC) +static inline zval *_http_request_option_cache_ex(http_request *r, char *key, size_t keylen, ulong h, zval *opt TSRMLS_DC); -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); static size_t http_curl_read_callback(void *, size_t, size_t, void *); 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; } +static curlioerr http_curl_ioctl_callback(CURL *, curliocmd, void *); +/* }}} */ -#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); - - -/* {{{ void *http_request_data_copy(int, void *) */ -void *_http_request_data_copy(int type, void *data TSRMLS_DC) +/* {{{ CURL *http_curl_init(http_request *) */ +PHP_HTTP_API CURL * _http_curl_init_ex(CURL *ch, http_request *request) { - switch (type) - { - case COPY_STRING: - { - char *new_str = estrdup(data); - zend_llist_add_element(&HTTP_G(request).copies.strings, &new_str); - return new_str; - } - - case COPY_SLIST: - { - zend_llist_add_element(&HTTP_G(request).copies.slists, &data); - return data; - } - - case COPY_CONTEXT: - { - zend_llist_add_element(&HTTP_G(request).copies.contexts, &data); - return data; - } - - case COPY_CONV: - { - zend_llist_add_element(&HTTP_G(request).copies.convs, &data); - return data; - } - - default: - { - return data; + if (ch || (ch = curl_easy_init())) { +#if defined(ZTS) + HTTP_CURL_OPT_EX(ch, CURLOPT_NOSIGNAL, 1); +#endif + HTTP_CURL_OPT_EX(ch, CURLOPT_HEADER, 0); + HTTP_CURL_OPT_EX(ch, CURLOPT_FILETIME, 1); + HTTP_CURL_OPT_EX(ch, CURLOPT_AUTOREFERER, 1); + HTTP_CURL_OPT_EX(ch, CURLOPT_VERBOSE, 1); + HTTP_CURL_OPT_EX(ch, CURLOPT_HEADERFUNCTION, NULL); + HTTP_CURL_OPT_EX(ch, CURLOPT_DEBUGFUNCTION, http_curl_raw_callback); + HTTP_CURL_OPT_EX(ch, CURLOPT_READFUNCTION, http_curl_read_callback); + HTTP_CURL_OPT_EX(ch, CURLOPT_IOCTLFUNCTION, http_curl_ioctl_callback); + HTTP_CURL_OPT_EX(ch, CURLOPT_WRITEFUNCTION, http_curl_dummy_callback); + + /* set context */ + if (request) { + HTTP_CURL_OPT_EX(ch, CURLOPT_PRIVATE, request); + HTTP_CURL_OPT_EX(ch, CURLOPT_DEBUGDATA, request); + HTTP_CURL_OPT_EX(ch, CURLOPT_ERRORBUFFER, request->_error); + + /* attach curl handle */ + request->ch = ch; + /* set defaults (also in http_request_reset()) */ + http_request_defaults(request); } } + + return ch; } /* }}} */ -/* {{{ void http_request_data_free_string(char **) */ -void _http_request_data_free_string(void *string) +/* {{{ void http_curl_free(CURL **) */ +PHP_HTTP_API void _http_curl_free(CURL **ch) { - efree(*((char **)string)); -} -/* }}} */ - -/* {{{ void http_request_data_free_slist(struct curl_slist **) */ -void _http_request_data_free_slist(void *list) -{ - curl_slist_free_all(*((struct curl_slist **) list)); + if (*ch) { + /* avoid nasty segfaults with already cleaned up callbacks */ + HTTP_CURL_OPT_EX(*ch, CURLOPT_NOPROGRESS, 1); + HTTP_CURL_OPT_EX(*ch, CURLOPT_PROGRESSFUNCTION, NULL); + HTTP_CURL_OPT_EX(*ch, CURLOPT_VERBOSE, 0); + HTTP_CURL_OPT_EX(*ch, CURLOPT_DEBUGFUNCTION, NULL); + curl_easy_cleanup(*ch); + *ch = NULL; + } } /* }}} */ -/* {{{ _http_request_data_free_context(http_curl_callback_ctx **) */ -void _http_request_data_free_context(void *context) +/* {{{ http_request *http_request_init(http_request *) */ +PHP_HTTP_API http_request *_http_request_init_ex(http_request *request, CURL *ch, http_request_method meth, const char *url ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC TSRMLS_DC) { - efree(*((http_curl_callback_ctx **) context)); + http_request *r; + + if (request) { + r = request; + } else { + r = emalloc_rel(sizeof(http_request)); + } + memset(r, 0, sizeof(http_request)); + + r->ch = ch; + r->url = (url) ? http_absolute_url(url) : NULL; + r->meth = (meth > 0) ? meth : HTTP_GET; + + phpstr_init(&r->conv.request); + phpstr_init_ex(&r->conv.response, HTTP_CURLBUF_SIZE, 0); + phpstr_init(&r->_cache.cookies); + zend_hash_init(&r->_cache.options, 0, NULL, ZVAL_PTR_DTOR, 0); + + TSRMLS_SET_CTX(r->tsrm_ls); + + return r; } /* }}} */ -/* {{{ _http_request_data_free_conv(http_curl_conv **) */ -void _http_request_data_free_conv(void *conv) +/* {{{ void http_request_dtor(http_request *) */ +PHP_HTTP_API void _http_request_dtor(http_request *request) { - efree(*((http_curl_conv **) conv)); + TSRMLS_FETCH_FROM_CTX(request->tsrm_ls); + + http_curl_free(&request->ch); + http_request_reset(request); + + phpstr_dtor(&request->_cache.cookies); + zend_hash_destroy(&request->_cache.options); + if (request->_cache.headers) { + curl_slist_free_all(request->_cache.headers); + request->_cache.headers = NULL; + } + if (request->_progress_callback) { + zval_ptr_dtor(&request->_progress_callback); + request->_progress_callback = NULL; + } } /* }}} */ -/* {{{ http_request_body *http_request_body_new() */ -PHP_HTTP_API http_request_body *_http_request_body_new(TSRMLS_D) +/* {{{ void http_request_free(http_request **) */ +PHP_HTTP_API void _http_request_free(http_request **request) { - http_request_body *body = ecalloc(1, sizeof(http_request_body)); - return body; + if (*request) { + TSRMLS_FETCH_FROM_CTX((*request)->tsrm_ls); + http_request_body_free(&(*request)->body); + http_request_dtor(*request); + efree(*request); + *request = NULL; + } } /* }}} */ -/* {{{ STATUS http_request_body_fill(http_request_body *body, HashTable *, HashTable *) */ -PHP_HTTP_API STATUS _http_request_body_fill(http_request_body *body, HashTable *fields, HashTable *files TSRMLS_DC) +/* {{{ void http_request_reset(http_request *) */ +PHP_HTTP_API void _http_request_reset(http_request *request) { - if (files && (zend_hash_num_elements(files) > 0)) { - char *key = NULL; - ulong idx; - zval **data; - struct curl_httppost *http_post_data[2] = {NULL, NULL}; - - /* normal data */ - FOREACH_HASH_KEYVAL(fields, key, idx, data) { - CURLcode err; - if (key) { - convert_to_string_ex(data); - 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_END - ); - if (CURLE_OK != 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; - } - - /* reset */ - key = NULL; - } - } - - /* file data */ - FOREACH_HASH_VAL(files, data) { - CURLcode err; - zval **file, **type, **name; - if ( SUCCESS == zend_hash_find(Z_ARRVAL_PP(data), "name", sizeof("name"), (void **) &name) && - SUCCESS == zend_hash_find(Z_ARRVAL_PP(data), "type", sizeof("type"), (void **) &type) && - SUCCESS == zend_hash_find(Z_ARRVAL_PP(data), "file", sizeof("file"), (void **) &file)) { - err = curl_formadd(&http_post_data[0], &http_post_data[1], - CURLFORM_COPYNAME, Z_STRVAL_PP(name), - CURLFORM_FILE, Z_STRVAL_PP(file), - CURLFORM_CONTENTTYPE, Z_STRVAL_PP(type), - CURLFORM_END - ); - if (CURLE_OK != 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(HE_NOTICE, HTTP_E_INVALID_PARAM, "Post file array entry misses either 'name', 'type' or 'file' entry"); - } - } - - body->type = HTTP_REQUEST_BODY_CURLPOST; - body->data = http_post_data[0]; - body->size = 0; - - } else { - char *encoded; - size_t encoded_len; - - if (SUCCESS != http_urlencode_hash_ex(fields, 1, NULL, 0, &encoded, &encoded_len)) { - http_error(HE_WARNING, HTTP_E_ENCODING, "Could not encode post data"); - return FAILURE; - } - - body->type = HTTP_REQUEST_BODY_CSTRING; - body->data = encoded; - body->size = encoded_len; + TSRMLS_FETCH_FROM_CTX(request->tsrm_ls); + STR_SET(request->url, NULL); + request->conv.last_type = 0; + phpstr_dtor(&request->conv.request); + phpstr_dtor(&request->conv.response); + http_request_body_dtor(request->body); + + if (request->ch) { + http_request_defaults(request); } - - return SUCCESS; + request->_error[0] = '\0'; } /* }}} */ -/* {{{ void http_request_body_dtor(http_request_body *) */ -PHP_HTTP_API void _http_request_body_dtor(http_request_body *body TSRMLS_DC) +/* {{{ void http_request_defaults(http_request *) */ +PHP_HTTP_API void _http_request_defaults(http_request *request) { - if (body) { - switch (body->type) - { - case HTTP_REQUEST_BODY_CSTRING: - if (body->data) { - efree(body->data); - } - break; - - case HTTP_REQUEST_BODY_CURLPOST: - curl_formfree(body->data); - break; - - case HTTP_REQUEST_BODY_UPLOADFILE: - php_stream_close(body->data); - break; - } + if (request->ch) { + HTTP_CURL_OPT(CURLOPT_PROGRESSFUNCTION, NULL); + HTTP_CURL_OPT(CURLOPT_URL, NULL); + HTTP_CURL_OPT(CURLOPT_NOPROGRESS, 1); + HTTP_CURL_OPT(CURLOPT_PROXY, NULL); + HTTP_CURL_OPT(CURLOPT_PROXYPORT, 0); + HTTP_CURL_OPT(CURLOPT_PROXYTYPE, 0); + HTTP_CURL_OPT(CURLOPT_PROXYUSERPWD, NULL); + HTTP_CURL_OPT(CURLOPT_PROXYAUTH, 0); + HTTP_CURL_OPT(CURLOPT_INTERFACE, NULL); + HTTP_CURL_OPT(CURLOPT_PORT, 0); +#if HTTP_CURL_VERSION(7,15,2) + HTTP_CURL_OPT(CURLOPT_LOCALPORT, 0); + HTTP_CURL_OPT(CURLOPT_LOCALPORTRANGE, 0); +#endif + HTTP_CURL_OPT(CURLOPT_USERPWD, NULL); + HTTP_CURL_OPT(CURLOPT_HTTPAUTH, 0); + HTTP_CURL_OPT(CURLOPT_ENCODING, NULL); + HTTP_CURL_OPT(CURLOPT_FOLLOWLOCATION, 0); + HTTP_CURL_OPT(CURLOPT_UNRESTRICTED_AUTH, 0); + HTTP_CURL_OPT(CURLOPT_REFERER, NULL); + HTTP_CURL_OPT(CURLOPT_USERAGENT, "PECL::HTTP/" PHP_EXT_HTTP_VERSION " (PHP/" PHP_VERSION ")"); + HTTP_CURL_OPT(CURLOPT_HTTPHEADER, NULL); + HTTP_CURL_OPT(CURLOPT_COOKIE, NULL); +#if HTTP_CURL_VERSION(7,14,1) + HTTP_CURL_OPT(CURLOPT_COOKIELIST, NULL); +#endif + HTTP_CURL_OPT(CURLOPT_COOKIEFILE, NULL); + HTTP_CURL_OPT(CURLOPT_COOKIEJAR, NULL); + HTTP_CURL_OPT(CURLOPT_RANGE, NULL); + HTTP_CURL_OPT(CURLOPT_RESUME_FROM, 0); + HTTP_CURL_OPT(CURLOPT_MAXFILESIZE, 0); + HTTP_CURL_OPT(CURLOPT_TIMECONDITION, 0); + HTTP_CURL_OPT(CURLOPT_TIMEVALUE, 0); + HTTP_CURL_OPT(CURLOPT_TIMEOUT, 0); + HTTP_CURL_OPT(CURLOPT_CONNECTTIMEOUT, 3); + HTTP_CURL_OPT(CURLOPT_SSLCERT, NULL); + HTTP_CURL_OPT(CURLOPT_SSLCERTTYPE, NULL); + HTTP_CURL_OPT(CURLOPT_SSLCERTPASSWD, NULL); + HTTP_CURL_OPT(CURLOPT_SSLKEY, NULL); + HTTP_CURL_OPT(CURLOPT_SSLKEYTYPE, NULL); + HTTP_CURL_OPT(CURLOPT_SSLKEYPASSWD, NULL); + HTTP_CURL_OPT(CURLOPT_SSLENGINE, NULL); + HTTP_CURL_OPT(CURLOPT_SSLVERSION, 0); + HTTP_CURL_OPT(CURLOPT_SSL_VERIFYPEER, 0); + HTTP_CURL_OPT(CURLOPT_SSL_VERIFYHOST, 0); + HTTP_CURL_OPT(CURLOPT_SSL_CIPHER_LIST, NULL); + HTTP_CURL_OPT(CURLOPT_CAINFO, NULL); + HTTP_CURL_OPT(CURLOPT_CAPATH, NULL); + HTTP_CURL_OPT(CURLOPT_RANDOM_FILE, NULL); + HTTP_CURL_OPT(CURLOPT_EGDSOCKET, NULL); + HTTP_CURL_OPT(CURLOPT_POSTFIELDS, NULL); + HTTP_CURL_OPT(CURLOPT_POSTFIELDSIZE, 0); + HTTP_CURL_OPT(CURLOPT_HTTPPOST, NULL); + HTTP_CURL_OPT(CURLOPT_IOCTLDATA, NULL); + HTTP_CURL_OPT(CURLOPT_READDATA, NULL); + HTTP_CURL_OPT(CURLOPT_INFILESIZE, 0); + HTTP_CURL_OPT(CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_NONE); + HTTP_CURL_OPT(CURLOPT_CUSTOMREQUEST, NULL); + HTTP_CURL_OPT(CURLOPT_NOBODY, 0); + HTTP_CURL_OPT(CURLOPT_POST, 0); + HTTP_CURL_OPT(CURLOPT_UPLOAD, 0); + HTTP_CURL_OPT(CURLOPT_HTTPGET, 1); } } /* }}} */ -/* {{{ void http_request_body_free(http_request_body *) */ -PHP_HTTP_API void _http_request_body_free(http_request_body *body TSRMLS_DC) +PHP_HTTP_API void _http_request_set_progress_callback(http_request *request, zval *cb) { - if (body) { - http_request_body_dtor(body); - efree(body); + TSRMLS_FETCH_FROM_CTX(request->tsrm_ls); + + if (request->_progress_callback) { + zval_ptr_dtor(&request->_progress_callback); + } + if ((request->_progress_callback = cb)) { + ZVAL_ADDREF(cb); + HTTP_CURL_OPT(CURLOPT_NOPROGRESS, 0); + HTTP_CURL_OPT(CURLOPT_PROGRESSDATA, request); + HTTP_CURL_OPT(CURLOPT_PROGRESSFUNCTION, http_curl_progress_callback); + } else { + HTTP_CURL_OPT(CURLOPT_NOPROGRESS, 1); + HTTP_CURL_OPT(CURLOPT_PROGRESSDATA, NULL); + HTTP_CURL_OPT(CURLOPT_PROGRESSFUNCTION, NULL); } } -/* }}} */ -/* {{{ STATUS http_request_init(CURL *, http_request_method, char *, http_request_body *, HashTable *) */ -PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char *url, http_request_body *body, HashTable *options TSRMLS_DC) +/* {{{ STATUS http_request_prepare(http_request *, HashTable *) */ +PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *options) { zval *zoption; zend_bool range_req = 0; - /* reset CURL handle */ -#if LIBCURL_VERSION_NUM >= 0x070c01 - curl_easy_reset(ch); -#endif - + TSRMLS_FETCH_FROM_CTX(request->tsrm_ls); + + HTTP_CHECK_CURL_INIT(request->ch, http_curl_init(request), return FAILURE); + /* set options */ - if (url) { - HTTP_CURL_OPT(URL, http_request_data_copy(COPY_STRING, url)); - } - - HTTP_CURL_OPT(HEADER, 0); - HTTP_CURL_OPT(FILETIME, 1); - HTTP_CURL_OPT(AUTOREFERER, 1); - HTTP_CURL_OPT(READFUNCTION, http_curl_read_callback); - /* we'll get all data through the debug function */ - HTTP_CURL_OPT(WRITEFUNCTION, http_curl_dummy_callback); - HTTP_CURL_OPT(HEADERFUNCTION, NULL); - - HTTP_CURL_OPT(VERBOSE, 1); - HTTP_CURL_OPT(DEBUGFUNCTION, http_curl_raw_callback); - -#if defined(ZTS) && (LIBCURL_VERSION_NUM >= 0x070a00) - HTTP_CURL_OPT(NOSIGNAL, 1); -#endif -#if LIBCURL_VERSION_NUM < 0x070c00 - HTTP_CURL_OPT(ERRORBUFFER, HTTP_G(request).error); -#endif + HTTP_CURL_OPT(CURLOPT_URL, request->url); /* progress callback */ - 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)); - } else { - HTTP_CURL_OPT(NOPROGRESS, 1); + if ((zoption = http_request_option(request, options, "onprogress", -1))) { + http_request_set_progress_callback(request, zoption); } /* proxy */ - if (zoption = http_curl_getopt(options, "proxyhost", IS_STRING)) { - HTTP_CURL_OPT(PROXY, http_request_data_copy(COPY_STRING, Z_STRVAL_P(zoption))); + if ((zoption = http_request_option(request, options, "proxyhost", IS_STRING))) { + if (Z_STRLEN_P(zoption)) { + HTTP_CURL_OPT(CURLOPT_PROXY, Z_STRVAL_P(zoption)); + } + /* type */ + if ((zoption = http_request_option(request, options, "proxytype", IS_LONG))) { + HTTP_CURL_OPT(CURLOPT_PROXYTYPE, Z_LVAL_P(zoption)); + } /* port */ - if (zoption = http_curl_getopt(options, "proxyport", IS_LONG)) { - HTTP_CURL_OPT(PROXYPORT, Z_LVAL_P(zoption)); + if ((zoption = http_request_option(request, options, "proxyport", IS_LONG))) { + HTTP_CURL_OPT(CURLOPT_PROXYPORT, Z_LVAL_P(zoption)); } /* user:pass */ - if (zoption = http_curl_getopt(options, "proxyauth", IS_STRING)) { - HTTP_CURL_OPT(PROXYUSERPWD, http_request_data_copy(COPY_STRING, Z_STRVAL_P(zoption))); + if ((zoption = http_request_option(request, options, "proxyauth", IS_STRING)) && Z_STRLEN_P(zoption)) { + HTTP_CURL_OPT(CURLOPT_PROXYUSERPWD, Z_STRVAL_P(zoption)); } -#if LIBCURL_VERSION_NUM >= 0x070a07 /* auth method */ - if (zoption = http_curl_getopt(options, "proxyauthtype", IS_LONG)) { - HTTP_CURL_OPT(PROXYAUTH, Z_LVAL_P(zoption)); + if ((zoption = http_request_option(request, options, "proxyauthtype", IS_LONG))) { + HTTP_CURL_OPT(CURLOPT_PROXYAUTH, Z_LVAL_P(zoption)); } -#endif } /* outgoing interface */ - if (zoption = http_curl_getopt(options, "interface", IS_STRING)) { - HTTP_CURL_OPT(INTERFACE, http_request_data_copy(COPY_STRING, Z_STRVAL_P(zoption))); + if ((zoption = http_request_option(request, options, "interface", IS_STRING))) { + HTTP_CURL_OPT(CURLOPT_INTERFACE, Z_STRVAL_P(zoption)); + +#if HTTP_CURL_VERSION(7,15,2) + if ((zoption = http_request_option(request, options, "portrange", IS_ARRAY))) { + zval **prs, **pre; + + zend_hash_internal_pointer_reset(Z_ARRVAL_P(zoption)); + if (SUCCESS == zend_hash_get_current_data(Z_ARRVAL_P(zoption), (void *) &prs)) { + zend_hash_move_forward(Z_ARRVAL_P(zoption)); + if (SUCCESS == zend_hash_get_current_data(Z_ARRVAL_P(zoption), (void *) &pre)) { + zval *prs_cpy = zval_copy(IS_LONG, *prs), *pre_cpy = zval_copy(IS_LONG, *pre); + + if (Z_LVAL_P(prs_cpy) && Z_LVAL_P(pre_cpy)) { + HTTP_CURL_OPT(CURLOPT_LOCALPORT, MIN(Z_LVAL_P(prs_cpy), Z_LVAL_P(pre_cpy))); + HTTP_CURL_OPT(CURLOPT_LOCALPORTRANGE, labs(Z_LVAL_P(prs_cpy)-Z_LVAL_P(pre_cpy))+1L); + } + zval_free(&prs_cpy); + zval_free(&pre_cpy); + } + } + } +#endif } /* another port */ - if (zoption = http_curl_getopt(options, "port", IS_LONG)) { - HTTP_CURL_OPT(PORT, Z_LVAL_P(zoption)); + if ((zoption = http_request_option(request, options, "port", IS_LONG))) { + HTTP_CURL_OPT(CURLOPT_PORT, Z_LVAL_P(zoption)); } /* auth */ - if (zoption = http_curl_getopt(options, "httpauth", IS_STRING)) { - HTTP_CURL_OPT(USERPWD, http_request_data_copy(COPY_STRING, Z_STRVAL_P(zoption))); - } -#if LIBCURL_VERSION_NUM >= 0x070a06 - if (zoption = http_curl_getopt(options, "httpauthtype", IS_LONG)) { - HTTP_CURL_OPT(HTTPAUTH, Z_LVAL_P(zoption)); + if ((zoption = http_request_option(request, options, "httpauth", IS_STRING)) && Z_STRLEN_P(zoption)) { + HTTP_CURL_OPT(CURLOPT_USERPWD, Z_STRVAL_P(zoption)); } -#endif - - /* compress, empty string enables deflate and gzip */ - if ((zoption = http_curl_getopt(options, "compress", IS_BOOL)) && Z_LVAL_P(zoption)) { - HTTP_CURL_OPT(ENCODING, ""); - } else { - HTTP_CURL_OPT(ENCODING, 0); + if ((zoption = http_request_option(request, options, "httpauthtype", IS_LONG))) { + HTTP_CURL_OPT(CURLOPT_HTTPAUTH, Z_LVAL_P(zoption)); } /* redirects, defaults to 0 */ - if (zoption = http_curl_getopt(options, "redirect", IS_LONG)) { - HTTP_CURL_OPT(FOLLOWLOCATION, Z_LVAL_P(zoption) ? 1 : 0); - HTTP_CURL_OPT(MAXREDIRS, Z_LVAL_P(zoption)); - if (zoption = http_curl_getopt(options, "unrestrictedauth", IS_BOOL)) { - HTTP_CURL_OPT(UNRESTRICTED_AUTH, Z_LVAL_P(zoption)); + if ((zoption = http_request_option(request, options, "redirect", IS_LONG))) { + HTTP_CURL_OPT(CURLOPT_FOLLOWLOCATION, Z_LVAL_P(zoption) ? 1 : 0); + HTTP_CURL_OPT(CURLOPT_MAXREDIRS, Z_LVAL_P(zoption)); + if ((zoption = http_request_option(request, options, "unrestrictedauth", IS_BOOL))) { + HTTP_CURL_OPT(CURLOPT_UNRESTRICTED_AUTH, Z_LVAL_P(zoption)); } - } else { - HTTP_CURL_OPT(FOLLOWLOCATION, 0); } /* referer */ - if (zoption = http_curl_getopt(options, "referer", IS_STRING)) { - HTTP_CURL_OPT(REFERER, http_request_data_copy(COPY_STRING, Z_STRVAL_P(zoption))); - } else { - HTTP_CURL_OPT(REFERER, NULL); + if ((zoption = http_request_option(request, options, "referer", IS_STRING)) && Z_STRLEN_P(zoption)) { + HTTP_CURL_OPT(CURLOPT_REFERER, Z_STRVAL_P(zoption)); } /* useragent, default "PECL::HTTP/version (PHP/version)" */ - if (zoption = http_curl_getopt(options, "useragent", IS_STRING)) { - HTTP_CURL_OPT(USERAGENT, http_request_data_copy(COPY_STRING, Z_STRVAL_P(zoption))); - } else { - HTTP_CURL_OPT(USERAGENT, "PECL::HTTP/" HTTP_PEXT_VERSION " (PHP/" PHP_VERSION ")"); + if ((zoption = http_request_option(request, options, "useragent", IS_STRING))) { + /* allow to send no user agent, not even default one */ + if (Z_STRLEN_P(zoption)) { + HTTP_CURL_OPT(CURLOPT_USERAGENT, Z_STRVAL_P(zoption)); + } else { + HTTP_CURL_OPT(CURLOPT_USERAGENT, NULL); + } + } + + /* resume */ + if ((zoption = http_request_option(request, options, "resume", IS_LONG)) && (Z_LVAL_P(zoption) != 0)) { + range_req = 1; + HTTP_CURL_OPT(CURLOPT_RESUME_FROM, Z_LVAL_P(zoption)); + } + /* or range of kind array(array(0,499), array(100,1499)) */ + else if ((zoption = http_request_option(request, options, "range", IS_ARRAY)) && zend_hash_num_elements(Z_ARRVAL_P(zoption))) { + HashPosition pos1, pos2; + zval **rr, **rb, **re; + phpstr rs; + + phpstr_init(&rs); + FOREACH_VAL(pos1, zoption, rr) { + if (Z_TYPE_PP(rr) == IS_ARRAY) { + zend_hash_internal_pointer_reset_ex(Z_ARRVAL_PP(rr), &pos2); + if (SUCCESS == zend_hash_get_current_data_ex(Z_ARRVAL_PP(rr), (void *) &rb, &pos2)) { + zend_hash_move_forward_ex(Z_ARRVAL_PP(rr), &pos2); + if (SUCCESS == zend_hash_get_current_data_ex(Z_ARRVAL_PP(rr), (void *) &re, &pos2)) { + if ( ((Z_TYPE_PP(rb) == IS_LONG) || ((Z_TYPE_PP(rb) == IS_STRING) && is_numeric_string(Z_STRVAL_PP(rb), Z_STRLEN_PP(rb), NULL, NULL, 1))) && + ((Z_TYPE_PP(re) == IS_LONG) || ((Z_TYPE_PP(re) == IS_STRING) && is_numeric_string(Z_STRVAL_PP(re), Z_STRLEN_PP(re), NULL, NULL, 1)))) { + zval *rbl = zval_copy(IS_LONG, *rb), *rel = zval_copy(IS_LONG, *re); + + if ((Z_LVAL_P(rbl) >= 0) && (Z_LVAL_P(rel) >= 0)) { + phpstr_appendf(&rs, "%ld-%ld,", Z_LVAL_P(rbl), Z_LVAL_P(rel)); + } + zval_free(&rbl); + zval_free(&rel); + } + } + } + } + } + + if (PHPSTR_LEN(&rs)) { + zval *cached_range; + + /* ditch last comma */ + PHPSTR_VAL(&rs)[PHPSTR_LEN(&rs)-- -1] = '\0'; + /* cache string */ + MAKE_STD_ZVAL(cached_range); + ZVAL_STRINGL(cached_range, PHPSTR_VAL(&rs), PHPSTR_LEN(&rs), 0); + HTTP_CURL_OPT(CURLOPT_RANGE, Z_STRVAL_P(http_request_option_cache(request, "range", cached_range))); + zval_ptr_dtor(&cached_range); + } } /* additional headers, array('name' => 'value') */ - if (zoption = http_curl_getopt(options, "headers", IS_ARRAY)) { + if (request->_cache.headers) { + curl_slist_free_all(request->_cache.headers); + request->_cache.headers = NULL; + } + if ((zoption = http_request_option(request, options, "headers", IS_ARRAY))) { char *header_key; ulong header_idx; - struct curl_slist *headers = NULL; + HashPosition pos; - FOREACH_KEY(zoption, header_key, header_idx) { + FOREACH_KEY(pos, zoption, header_key, header_idx) { if (header_key) { zval **header_val; - if (SUCCESS == zend_hash_get_current_data(Z_ARRVAL_P(zoption), (void **) &header_val)) { + if (SUCCESS == zend_hash_get_current_data_ex(Z_ARRVAL_P(zoption), (void *) &header_val, &pos)) { char header[1024] = {0}; - snprintf(header, 1023, "%s: %s", header_key, Z_STRVAL_PP(header_val)); - headers = curl_slist_append(headers, http_request_data_copy(COPY_STRING, header)); + + ZVAL_ADDREF(*header_val); + convert_to_string_ex(header_val); + if (!strcasecmp(header_key, "range")) { + range_req = 1; + } + snprintf(header, lenof(header), "%s: %s", header_key, Z_STRVAL_PP(header_val)); + request->_cache.headers = curl_slist_append(request->_cache.headers, header); + zval_ptr_dtor(header_val); } /* reset */ header_key = NULL; } } + } + /* etag */ + if ((zoption = http_request_option(request, options, "etag", IS_STRING)) && Z_STRLEN_P(zoption)) { + char match_header[1024] = {0}, *quoted_etag = NULL; + + if ((Z_STRVAL_P(zoption)[0] != '"') || (Z_STRVAL_P(zoption)[Z_STRLEN_P(zoption)-1] != '"')) { + spprintf("ed_etag, 0, "\"%s\"", Z_STRVAL_P(zoption)); + } + snprintf(match_header, lenof(match_header), "%s: %s", range_req?"If-Match":"If-None-Match", quoted_etag?quoted_etag:Z_STRVAL_P(zoption)); + request->_cache.headers = curl_slist_append(request->_cache.headers, match_header); + STR_FREE(quoted_etag); + } + /* compression */ + if ((zoption = http_request_option(request, options, "compress", IS_BOOL)) && Z_LVAL_P(zoption)) { + request->_cache.headers = curl_slist_append(request->_cache.headers, "Accept-Encoding: gzip;q=1.0,deflate;q=0.5"); + } + HTTP_CURL_OPT(CURLOPT_HTTPHEADER, request->_cache.headers); - if (headers) { - HTTP_CURL_OPT(HTTPHEADER, http_request_data_copy(COPY_SLIST, headers)); + /* lastmodified */ + if ((zoption = http_request_option(request, options, "lastmodified", IS_LONG))) { + if (Z_LVAL_P(zoption)) { + if (Z_LVAL_P(zoption) > 0) { + HTTP_CURL_OPT(CURLOPT_TIMEVALUE, Z_LVAL_P(zoption)); + } else { + HTTP_CURL_OPT(CURLOPT_TIMEVALUE, HTTP_GET_REQUEST_TIME() + Z_LVAL_P(zoption)); + } + HTTP_CURL_OPT(CURLOPT_TIMECONDITION, range_req ? CURL_TIMECOND_IFUNMODSINCE : CURL_TIMECOND_IFMODSINCE); + } else { + HTTP_CURL_OPT(CURLOPT_TIMECONDITION, CURL_TIMECOND_NONE); } - } else { - HTTP_CURL_OPT(HTTPHEADER, NULL); } /* cookies, array('name' => 'value') */ - if (zoption = http_curl_getopt(options, "cookies", IS_ARRAY)) { - char *cookie_key = NULL; - ulong cookie_idx = 0; - phpstr *qstr = phpstr_new(); - - FOREACH_KEY(zoption, cookie_key, cookie_idx) { - if (cookie_key) { - zval **cookie_val; - if (SUCCESS == zend_hash_get_current_data(Z_ARRVAL_P(zoption), (void **) &cookie_val)) { - phpstr_appendf(qstr, "%s=%s; ", cookie_key, Z_STRVAL_PP(cookie_val)); + if ((zoption = http_request_option(request, options, "cookies", IS_ARRAY))) { + phpstr_dtor(&request->_cache.cookies); + if (zend_hash_num_elements(Z_ARRVAL_P(zoption))) { + zval *urlenc_cookies = NULL; + /* check whether cookies should not be urlencoded; default is to urlencode them */ + if ((!(urlenc_cookies = http_request_option(request, options, "encodecookies", IS_BOOL))) || Z_BVAL_P(urlenc_cookies)) { + if (SUCCESS == http_urlencode_hash_recursive(HASH_OF(zoption), &request->_cache.cookies, "; ", lenof("; "), NULL, 0)) { + phpstr_fix(&request->_cache.cookies); + HTTP_CURL_OPT(CURLOPT_COOKIE, request->_cache.cookies.data); + } + } else { + HashPosition pos; + char *cookie_key = NULL; + ulong cookie_idx; + + FOREACH_KEY(pos, zoption, cookie_key, cookie_idx) { + if (cookie_key) { + zval **cookie_val; + if (SUCCESS == zend_hash_get_current_data_ex(Z_ARRVAL_P(zoption), (void *) &cookie_val, &pos)) { + zval *val = zval_copy(IS_STRING, *cookie_val); + phpstr_appendf(&request->_cache.cookies, "%s=%s; ", cookie_key, Z_STRVAL_P(val)); + zval_free(&val); + } + + /* reset */ + cookie_key = NULL; + } + } + + phpstr_fix(&request->_cache.cookies); + if (PHPSTR_LEN(&request->_cache.cookies)) { + HTTP_CURL_OPT(CURLOPT_COOKIE, PHPSTR_VAL(&request->_cache.cookies)); } - - /* reset */ - cookie_key = NULL; } } - - if (qstr->used) { - phpstr_fix(qstr); - HTTP_CURL_OPT(COOKIE, http_request_data_copy(COPY_STRING, qstr->data)); - } - phpstr_free(qstr); - } else { - HTTP_CURL_OPT(COOKIE, NULL); } +#if HTTP_CURL_VERSION(7,14,1) + /* reset cookies */ + if ((zoption = http_request_option(request, options, "resetcookies", IS_BOOL)) && Z_LVAL_P(zoption)) { + HTTP_CURL_OPT(CURLOPT_COOKIELIST, "ALL"); + } +#endif + /* session cookies */ - if (zoption = http_curl_getopt(options, "cookiesession", IS_BOOL)) { + if ((zoption = http_request_option(request, options, "cookiesession", IS_BOOL))) { if (Z_LVAL_P(zoption)) { /* accept cookies for this session */ - HTTP_CURL_OPT(COOKIEFILE, ""); + HTTP_CURL_OPT(CURLOPT_COOKIEFILE, ""); } else { /* reset session cookies */ - HTTP_CURL_OPT(COOKIESESSION, 1); + HTTP_CURL_OPT(CURLOPT_COOKIESESSION, 1); } - } else { - HTTP_CURL_OPT(COOKIEFILE, NULL); } /* cookiestore, read initial cookies from that file and store cookies back into that file */ - if ((zoption = http_curl_getopt(options, "cookiestore", IS_STRING)) && Z_STRLEN_P(zoption)) { - HTTP_CURL_OPT(COOKIEFILE, http_request_data_copy(COPY_STRING, Z_STRVAL_P(zoption))); - HTTP_CURL_OPT(COOKIEJAR, http_request_data_copy(COPY_STRING, Z_STRVAL_P(zoption))); - } else { - HTTP_CURL_OPT(COOKIEFILE, NULL); - HTTP_CURL_OPT(COOKIEJAR, NULL); - } - - /* resume */ - if (zoption = http_curl_getopt(options, "resume", IS_LONG)) { - range_req = 1; - HTTP_CURL_OPT(RESUME_FROM, Z_LVAL_P(zoption)); - } else { - HTTP_CURL_OPT(RESUME_FROM, 0); + if ((zoption = http_request_option(request, options, "cookiestore", IS_STRING)) && Z_STRLEN_P(zoption)) { + HTTP_CHECK_OPEN_BASEDIR(Z_STRVAL_P(zoption), return FAILURE); + HTTP_CURL_OPT(CURLOPT_COOKIEFILE, Z_STRVAL_P(zoption)); + HTTP_CURL_OPT(CURLOPT_COOKIEJAR, Z_STRVAL_P(zoption)); } /* maxfilesize */ - if (zoption = http_curl_getopt(options, "maxfilesize", IS_LONG)) { - HTTP_CURL_OPT(MAXFILESIZE, Z_LVAL_P(zoption)); - } else { - HTTP_CURL_OPT(MAXFILESIZE, 0); + if ((zoption = http_request_option(request, options, "maxfilesize", IS_LONG))) { + HTTP_CURL_OPT(CURLOPT_MAXFILESIZE, Z_LVAL_P(zoption)); } - /* lastmodified */ - if (zoption = http_curl_getopt(options, "lastmodified", IS_LONG)) { - HTTP_CURL_OPT(TIMECONDITION, range_req ? CURL_TIMECOND_IFUNMODSINCE : CURL_TIMECOND_IFMODSINCE); - HTTP_CURL_OPT(TIMEVALUE, Z_LVAL_P(zoption)); - } else { - HTTP_CURL_OPT(TIMEVALUE, 0); + /* http protocol */ + if ((zoption = http_request_option(request, options, "protocol", IS_LONG))) { + HTTP_CURL_OPT(CURLOPT_HTTP_VERSION, Z_LVAL_P(zoption)); } - /* timeout, defaults to 3 */ - if (zoption = http_curl_getopt(options, "timeout", IS_LONG)) { - HTTP_CURL_OPT(TIMEOUT, Z_LVAL_P(zoption)); - } else { - HTTP_CURL_OPT(TIMEOUT, 3); + /* timeout, defaults to 0 */ + if ((zoption = http_request_option(request, options, "timeout", IS_LONG))) { + HTTP_CURL_OPT(CURLOPT_TIMEOUT, Z_LVAL_P(zoption)); } - /* connecttimeout, defaults to 3 */ - if (zoption = http_curl_getopt(options, "connecttimeout", IS_LONG)) { - HTTP_CURL_OPT(CONNECTTIMEOUT, Z_LVAL_P(zoption)); - } else { - HTTP_CURL_OPT(CONNECTTIMEOUT, 3); + /* connecttimeout, defaults to 0 */ + if ((zoption = http_request_option(request, options, "connecttimeout", IS_LONG))) { + HTTP_CURL_OPT(CURLOPT_CONNECTTIMEOUT, Z_LVAL_P(zoption)); } /* ssl */ - if (zoption = http_curl_getopt(options, "ssl", IS_ARRAY)) { + if ((zoption = http_request_option(request, options, "ssl", IS_ARRAY))) { ulong idx; char *key = NULL; zval **param; + HashPosition pos; - FOREACH_KEYVAL(zoption, key, idx, param) { + FOREACH_KEYVAL(pos, zoption, key, idx, param) { if (key) { - HTTP_CURL_OPT_SSL_STRING(CERT); -#if LIBCURL_VERSION_NUM >= 0x070903 - HTTP_CURL_OPT_SSL_STRING(CERTTYPE); -#endif - HTTP_CURL_OPT_SSL_STRING(CERTPASSWD); + HTTP_CURL_OPT_STRING(CURLOPT_SSLCERT, 0, 1); + HTTP_CURL_OPT_STRING(CURLOPT_SSLCERTTYPE, 0, 0); + HTTP_CURL_OPT_STRING(CURLOPT_SSLCERTPASSWD, 0, 0); - HTTP_CURL_OPT_SSL_STRING(KEY); - HTTP_CURL_OPT_SSL_STRING(KEYTYPE); - HTTP_CURL_OPT_SSL_STRING(KEYPASSWD); + HTTP_CURL_OPT_STRING(CURLOPT_SSLKEY, 0, 0); + HTTP_CURL_OPT_STRING(CURLOPT_SSLKEYTYPE, 0, 0); + HTTP_CURL_OPT_STRING(CURLOPT_SSLKEYPASSWD, 0, 0); - HTTP_CURL_OPT_SSL_STRING(ENGINE); - HTTP_CURL_OPT_SSL_LONG(VERSION); + HTTP_CURL_OPT_STRING(CURLOPT_SSLENGINE, 0, 0); + HTTP_CURL_OPT_LONG(CURLOPT_SSLVERSION, 0); - HTTP_CURL_OPT_SSL_LONG_(VERIFYPEER); - HTTP_CURL_OPT_SSL_LONG_(VERIFYHOST); - HTTP_CURL_OPT_SSL_STRING_(CIPHER_LIST); + HTTP_CURL_OPT_LONG(CURLOPT_SSL_VERIFYPEER, 1); + HTTP_CURL_OPT_LONG(CURLOPT_SSL_VERIFYHOST, 1); + HTTP_CURL_OPT_STRING(CURLOPT_SSL_CIPHER_LIST, 1, 0); - - HTTP_CURL_OPT_STRING(CAINFO); -#if LIBCURL_VERSION_NUM >= 0x070908 - HTTP_CURL_OPT_STRING(CAPATH); -#endif - HTTP_CURL_OPT_STRING(RANDOM_FILE); - HTTP_CURL_OPT_STRING(EGDSOCKET); + HTTP_CURL_OPT_STRING(CURLOPT_CAINFO, -3, 1); + HTTP_CURL_OPT_STRING(CURLOPT_CAPATH, -3, 1); + HTTP_CURL_OPT_STRING(CURLOPT_RANDOM_FILE, -3, 1); + HTTP_CURL_OPT_STRING(CURLOPT_EGDSOCKET, -3, 1); /* reset key */ key = NULL; } } - } else { - /* disable SSL verification by default */ - HTTP_CURL_OPT(SSL_VERIFYPEER, 0); - HTTP_CURL_OPT(SSL_VERIFYHOST, 0); } /* request method */ - switch (meth) + switch (request->meth) { case HTTP_GET: - curl_easy_setopt(ch, CURLOPT_HTTPGET, 1); + HTTP_CURL_OPT(CURLOPT_HTTPGET, 1); break; case HTTP_HEAD: - curl_easy_setopt(ch, CURLOPT_NOBODY, 1); + HTTP_CURL_OPT(CURLOPT_NOBODY, 1); break; case HTTP_POST: - curl_easy_setopt(ch, CURLOPT_POST, 1); + HTTP_CURL_OPT(CURLOPT_POST, 1); break; case HTTP_PUT: - curl_easy_setopt(ch, CURLOPT_UPLOAD, 1); + HTTP_CURL_OPT(CURLOPT_UPLOAD, 1); break; default: - if (http_request_method_exists(0, meth, NULL)) { - curl_easy_setopt(ch, CURLOPT_CUSTOMREQUEST, http_request_method_name(meth)); + if (http_request_method_exists(0, request->meth, NULL)) { + HTTP_CURL_OPT(CURLOPT_CUSTOMREQUEST, http_request_method_name(request->meth)); } else { - http_error_ex(HE_WARNING, HTTP_E_REQUEST_METHOD, "Unsupported request method: %d", meth); + http_error_ex(HE_WARNING, HTTP_E_REQUEST_METHOD, "Unsupported request method: %d (%s)", request->meth, request->url); return FAILURE; } break; } /* attach request body */ - if (body && (meth != HTTP_GET) && (meth != HTTP_HEAD)) { - switch (body->type) + if (request->body && (request->meth != HTTP_GET) && (request->meth != HTTP_HEAD) && (request->meth != HTTP_OPTIONS)) { + switch (request->body->type) { - case HTTP_REQUEST_BODY_CSTRING: - curl_easy_setopt(ch, CURLOPT_POSTFIELDS, body->data); - curl_easy_setopt(ch, CURLOPT_POSTFIELDSIZE, body->size); + case HTTP_REQUEST_BODY_EMPTY: + /* nothing */ break; - + case HTTP_REQUEST_BODY_CURLPOST: - curl_easy_setopt(ch, CURLOPT_HTTPPOST, (struct curl_httppost *) body->data); + HTTP_CURL_OPT(CURLOPT_HTTPPOST, (struct curl_httppost *) request->body->data); break; + case HTTP_REQUEST_BODY_CSTRING: + if (request->meth != HTTP_PUT) { + HTTP_CURL_OPT(CURLOPT_POSTFIELDS, request->body->data); + HTTP_CURL_OPT(CURLOPT_POSTFIELDSIZE, request->body->size); + break; + } + /* fallthrough, PUT/UPLOAD _needs_ READDATA */ case HTTP_REQUEST_BODY_UPLOADFILE: - curl_easy_setopt(ch, CURLOPT_READDATA, http_curl_callback_data(body)); - curl_easy_setopt(ch, CURLOPT_INFILESIZE, body->size); + HTTP_CURL_OPT(CURLOPT_IOCTLDATA, request); + HTTP_CURL_OPT(CURLOPT_READDATA, request); + HTTP_CURL_OPT(CURLOPT_INFILESIZE, request->body->size); break; default: /* shouldn't ever happen */ - http_error_ex(HE_ERROR, 0, "Unknown request body type: %d", body->type); + http_error_ex(HE_ERROR, 0, "Unknown request body type: %d (%s)", request->body->type, request->url); return FAILURE; break; } @@ -630,351 +906,242 @@ 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_curl_conv *conv = emalloc(sizeof(http_curl_conv)); - conv->response = response; - conv->request = request; - conv->last_info = -1; - HTTP_CURL_OPT(DEBUGDATA, http_curl_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) +/* {{{ void http_request_exec(http_request *) */ +PHP_HTTP_API void _http_request_exec(http_request *request) { CURLcode result; - - http_request_conv(ch, response, request); - - /* perform request */ - if (CURLE_OK != (result = curl_easy_perform(ch))) { - http_error_ex(HE_WARNING, HTTP_E_REQUEST, "Could not perform request: %s", curl_easy_strerror(result)); - return FAILURE; - } else { - /* get curl info */ - if (info) { - http_request_info(ch, info); - } - return SUCCESS; + TSRMLS_FETCH_FROM_CTX(request->tsrm_ls); + + if (CURLE_OK != (result = curl_easy_perform(request->ch))) { + http_error_ex(HE_WARNING, HTTP_E_REQUEST, "%s; %s (%s)", curl_easy_strerror(result), request->_error, request->url); } } /* }}} */ -/* {{{ void http_request_info(CURL *, HashTable *) */ -PHP_HTTP_API void _http_request_info(CURL *ch, HashTable *info TSRMLS_DC) +/* {{{ void http_request_info(http_request *, HashTable *) */ +PHP_HTTP_API void _http_request_info(http_request *request, HashTable *info) { zval array; - Z_ARRVAL(array) = info; - - HTTP_CURL_INFO(EFFECTIVE_URL); -#if LIBCURL_VERSION_NUM >= 0x070a07 - HTTP_CURL_INFO(RESPONSE_CODE); -#else - HTTP_CURL_INFO_EX(HTTP_CODE, RESPONSE_CODE); -#endif - HTTP_CURL_INFO(HTTP_CONNECTCODE); -#if LIBCURL_VERSION_NUM >= 0x070500 - HTTP_CURL_INFO(FILETIME); -#endif - HTTP_CURL_INFO(TOTAL_TIME); - HTTP_CURL_INFO(NAMELOOKUP_TIME); - HTTP_CURL_INFO(CONNECT_TIME); - HTTP_CURL_INFO(PRETRANSFER_TIME); - HTTP_CURL_INFO(STARTTRANSFER_TIME); -#if LIBCURL_VERSION_NUM >= 0x070907 - HTTP_CURL_INFO(REDIRECT_TIME); - HTTP_CURL_INFO(REDIRECT_COUNT); -#endif - HTTP_CURL_INFO(SIZE_UPLOAD); - HTTP_CURL_INFO(SIZE_DOWNLOAD); - HTTP_CURL_INFO(SPEED_DOWNLOAD); - HTTP_CURL_INFO(SPEED_UPLOAD); - HTTP_CURL_INFO(HEADER_SIZE); - HTTP_CURL_INFO(REQUEST_SIZE); - HTTP_CURL_INFO(SSL_VERIFYRESULT); -#if LIBCURL_VERSION_NUM >= 0x070c03 - /*HTTP_CURL_INFO(SSL_ENGINES); todo: CURLINFO_SLIST */ + INIT_ZARR(array, info); + + HTTP_CURL_INFO(CURLINFO_EFFECTIVE_URL); + HTTP_CURL_INFO(CURLINFO_RESPONSE_CODE); + HTTP_CURL_INFO_EX(CURLINFO_HTTP_CONNECTCODE, "connect_code"); + HTTP_CURL_INFO(CURLINFO_FILETIME); + HTTP_CURL_INFO(CURLINFO_TOTAL_TIME); + HTTP_CURL_INFO(CURLINFO_NAMELOOKUP_TIME); + HTTP_CURL_INFO(CURLINFO_CONNECT_TIME); + HTTP_CURL_INFO(CURLINFO_PRETRANSFER_TIME); + HTTP_CURL_INFO(CURLINFO_STARTTRANSFER_TIME); + HTTP_CURL_INFO(CURLINFO_REDIRECT_TIME); + HTTP_CURL_INFO(CURLINFO_REDIRECT_COUNT); + HTTP_CURL_INFO(CURLINFO_SIZE_UPLOAD); + HTTP_CURL_INFO(CURLINFO_SIZE_DOWNLOAD); + HTTP_CURL_INFO(CURLINFO_SPEED_DOWNLOAD); + HTTP_CURL_INFO(CURLINFO_SPEED_UPLOAD); + HTTP_CURL_INFO(CURLINFO_HEADER_SIZE); + HTTP_CURL_INFO(CURLINFO_REQUEST_SIZE); + HTTP_CURL_INFO(CURLINFO_SSL_VERIFYRESULT); + HTTP_CURL_INFO(CURLINFO_SSL_ENGINES); + HTTP_CURL_INFO(CURLINFO_CONTENT_LENGTH_DOWNLOAD); + HTTP_CURL_INFO(CURLINFO_CONTENT_LENGTH_UPLOAD); + HTTP_CURL_INFO(CURLINFO_CONTENT_TYPE); + HTTP_CURL_INFO(CURLINFO_HTTPAUTH_AVAIL); + HTTP_CURL_INFO(CURLINFO_PROXYAUTH_AVAIL); + HTTP_CURL_INFO(CURLINFO_NUM_CONNECTS); +#if HTTP_CURL_VERSION(7,14,1) + HTTP_CURL_INFO_EX(CURLINFO_COOKIELIST, "cookies"); #endif - HTTP_CURL_INFO(CONTENT_LENGTH_DOWNLOAD); - HTTP_CURL_INFO(CONTENT_LENGTH_UPLOAD); - HTTP_CURL_INFO(CONTENT_TYPE); -#if LIBCURL_VERSION_NUM >= 0x070a03 - /*HTTP_CURL_INFO(PRIVATE);*/ -#endif -#if LIBCURL_VERSION_NUM >= 0x070a08 - HTTP_CURL_INFO(HTTPAUTH_AVAIL); - HTTP_CURL_INFO(PROXYAUTH_AVAIL); -#endif -#if LIBCURL_VERSION_NUM >= 0x070c02 - /*HTTP_CURL_INFO(OS_ERRNO);*/ -#endif -#if LIBCURL_VERSION_NUM >= 0x070c03 - HTTP_CURL_INFO(NUM_CONNECTS); -#endif -} -/* }}} */ - -/* {{{ STATUS http_request_ex(CURL *, http_request_method, char *, http_request_body, HashTable, HashTable, phpstr *) */ -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) -{ - STATUS status; - zend_bool clean_curl; - - if ((clean_curl = (!ch))) { - if (!(ch = curl_easy_init())) { - http_error(HE_WARNING, HTTP_E_REQUEST, "Could not initialize curl."); - return FAILURE; - } - } - - status = ((SUCCESS == http_request_init(ch, meth, url, body, options)) && - (SUCCESS == http_request_exec(ch, info, response, NULL))) ? SUCCESS : FAILURE; - - if (clean_curl) { - curl_easy_cleanup(ch); - } - return status; -} -/* }}} */ - -/* {{{ 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]; + HTTP_CURL_INFO(CURLINFO_OS_ERRNO); + add_assoc_string(&array, "error", request->_error, 1); } /* }}} */ -/* {{{ 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) +/* {{{ 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 *ctx) { - 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; - } - } + http_request *request = (http_request *) ctx; + TSRMLS_FETCH_FROM_CTX(request->tsrm_ls); + + if (request->body) { + switch (request->body->type) { - 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; + case HTTP_REQUEST_BODY_CSTRING: + { + size_t out = MIN(len * n, request->body->size - request->body->priv); + + if (out) { + memcpy(data, ((char *) request->body->data) + request->body->priv, out); + request->body->priv += out; + return out; } } + break; + + case HTTP_REQUEST_BODY_UPLOADFILE: + return php_stream_read((php_stream *) request->body->data, data, len * n); + break; } - 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; } + return 0; } /* }}} */ -/* {{{ unsigned long http_request_method_register(char *) */ -PHP_HTTP_API unsigned long _http_request_method_register(const char *method TSRMLS_DC) +/* {{{ static int http_curl_progress_callback(void *, double, double, double, double) */ +static int http_curl_progress_callback(void *ctx, double dltotal, double dlnow, double ultotal, double ulnow) { - 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; + zval *param, retval; + http_request *request = (http_request *) ctx; + TSRMLS_FETCH_FROM_CTX(request->tsrm_ls); + + INIT_PZVAL(&retval); + ZVAL_NULL(&retval); + + MAKE_STD_ZVAL(param); + array_init(param); + add_assoc_double(param, "dltotal", dltotal); + add_assoc_double(param, "dlnow", dlnow); + add_assoc_double(param, "ultotal", ultotal); + add_assoc_double(param, "ulnow", ulnow); + + call_user_function(EG(function_table), NULL, request->_progress_callback, &retval, 1, ¶m TSRMLS_CC); + + zval_ptr_dtor(¶m); + zval_dtor(&retval); + + return 0; } /* }}} */ -/* {{{ STATUS http_request_method_unregister(usngigned long) */ -PHP_HTTP_API STATUS _http_request_method_unregister(unsigned long method TSRMLS_DC) +/* {{{ static curlioerr http_curl_ioctl_callback(CURL *, curliocmd, void *) */ +static curlioerr http_curl_ioctl_callback(CURL *ch, curliocmd cmd, void *ctx) { - 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(HE_NOTICE, HTTP_E_REQUEST_METHOD, "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(HE_NOTICE, HTTP_E_REQUEST_METHOD, "Could not unregister request method: %s", http_method); - efree(http_method); - return FAILURE; + http_request *request = (http_request *) ctx; + TSRMLS_FETCH_FROM_CTX(request->tsrm_ls); + + if (cmd != CURLIOCMD_RESTARTREAD) { + return CURLIOE_UNKNOWNCMD; } - - 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); - - if (body->type != HTTP_REQUEST_BODY_UPLOADFILE) { - return 0; + + if (request->body) { + switch (request->body->type) + { + case HTTP_REQUEST_BODY_CSTRING: + request->body->priv = 0; + return CURLIOE_OK; + break; + + case HTTP_REQUEST_BODY_UPLOADFILE: + if (SUCCESS == php_stream_rewind((php_stream *) request->body->data)) { + return CURLIOE_OK; + } + break; + } } - return php_stream_read((php_stream *) body->data, data, len * n); -} -/* }}} */ - -/* {{{ 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); - - params_pass[0] = ¶ms_local[0]; - params_pass[1] = ¶ms_local[1]; - params_pass[2] = ¶ms_local[2]; - params_pass[3] = ¶ms_local[3]; - - INIT_PZVAL(params_pass[0]); - INIT_PZVAL(params_pass[1]); - INIT_PZVAL(params_pass[2]); - INIT_PZVAL(params_pass[3]); - ZVAL_DOUBLE(params_pass[0], dltotal); - ZVAL_DOUBLE(params_pass[1], dlnow); - ZVAL_DOUBLE(params_pass[2], ultotal); - ZVAL_DOUBLE(params_pass[3], ulnow); - - return call_user_function(EG(function_table), NULL, func, &retval, 4, params_pass TSRMLS_CC); + + return CURLIOE_FAILRESTART; } /* }}} */ /* {{{ 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 *request = (http_request *) ctx; switch (type) { case CURLINFO_DATA_IN: - if (conv->response && conv->last_info == CURLINFO_HEADER_IN) { - phpstr_appends(conv->response, HTTP_CRLF); + if (request->conv.last_type == CURLINFO_HEADER_IN) { + phpstr_appends(&request->conv.response, HTTP_CRLF); } case CURLINFO_HEADER_IN: - if (conv->response) { - phpstr_append(conv->response, data, length); - } + phpstr_append(&request->conv.response, data, length); break; case CURLINFO_DATA_OUT: - if (conv->request && conv->last_info == CURLINFO_HEADER_OUT) { - phpstr_appends(conv->request, HTTP_CRLF); + if (request->conv.last_type == CURLINFO_HEADER_OUT) { + phpstr_appends(&request->conv.request, HTTP_CRLF); } case CURLINFO_HEADER_OUT: - if (conv->request) { - phpstr_append(conv->request, data, length); + phpstr_append(&request->conv.request, data, length); + break; + default: +#if 0 + fprintf(stderr, "## ", type); + if (!type) { + fprintf(stderr, "%s", data); + } else { + ulong i; + for (i = 1; i <= length; ++i) { + fprintf(stderr, "%02X ", data[i-1] & 0xFF); + if (!(i % 20)) { + fprintf(stderr, "\n## "); + } + } + fprintf(stderr, "\n"); } + if (data[length-1] != 0xa) { + fprintf(stderr, "\n"); + } +#endif break; } if (type) { - conv->last_info = type; + request->conv.last_type = type; } return 0; } /* }}} */ -/* {{{ static inline zval *http_curl_getopt(HashTable *, char *, size_t, int) */ -static inline zval *_http_curl_getopt_ex(HashTable *options, char *key, size_t keylen, int type TSRMLS_DC) +/* {{{ static inline zval *http_request_option(http_request *, HashTable *, char *, size_t, int) */ +static inline zval *_http_request_option_ex(http_request *r, HashTable *options, char *key, size_t keylen, int type TSRMLS_DC) { zval **zoption; - - if (!options || (SUCCESS != zend_hash_find(options, key, keylen, (void **) &zoption))) { +#ifdef ZEND_ENGINE_2 + ulong h = zend_get_hash_value(key, keylen); +#else + ulong h = 0; +#endif + + if (!options || +#ifdef ZEND_ENGINE_2 + (SUCCESS != zend_hash_quick_find(options, key, keylen, h, (void *) &zoption)) +#else + (SUCCESS != zend_hash_find(options, key, keylen, (void *) &zoption)) +#endif + ) { return NULL; } + + return http_request_option_cache_ex(r, key, keylen, h, zval_copy(type, *zoption)); +} +/* }}} */ - if (Z_TYPE_PP(zoption) != type) { - switch (type) - { - case IS_BOOL: convert_to_boolean_ex(zoption); break; - case IS_LONG: convert_to_long_ex(zoption); break; - case IS_DOUBLE: convert_to_double_ex(zoption); break; - case IS_STRING: convert_to_string_ex(zoption); break; - case IS_ARRAY: convert_to_array_ex(zoption); break; - case IS_OBJECT: convert_to_object_ex(zoption); break; - default: - break; +/* {{{ static inline zval *http_request_option_cache(http_request *, char *key, zval *) */ +static inline zval *_http_request_option_cache_ex(http_request *r, char *key, size_t keylen, ulong h, zval *opt TSRMLS_DC) +{ + ZVAL_ADDREF(opt); + +#ifdef ZEND_ENGINE_2 + if (h) { + _zend_hash_quick_add_or_update(&r->_cache.options, key, keylen, h, &opt, sizeof(zval *), NULL, + zend_hash_quick_exists(&r->_cache.options, key, keylen, h)?HASH_UPDATE:HASH_ADD ZEND_FILE_LINE_CC); + } + else +#endif + { + if (zend_hash_exists(&r->_cache.options, key, keylen)) { + zend_hash_update(&r->_cache.options, key, keylen, &opt, sizeof(zval *), NULL); + } else { + zend_hash_add(&r->_cache.options, key, keylen, &opt, sizeof(zval *), NULL); } } - - return *zoption; + + return opt; } /* }}} */ -#endif +#endif /* HTTP_HAVE_CURL */ /* * Local variables: