X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_request_api.c;h=06b69f719e8039b72788da31a6f3043417258dca;hp=26b4b0992cccd8db395c8cb3e772823b4c5d8ca8;hb=669d2e6a8bdc642b6b52693f4593f199ddd7e8d2;hpb=df2638b79da782a9d3a927fcdd426d0067e33c6b diff --git a/http_request_api.c b/http_request_api.c index 26b4b09..06b69f7 100644 --- a/http_request_api.c +++ b/http_request_api.c @@ -6,16 +6,13 @@ | modification, are permitted provided that the conditions mentioned | | in the accompanying LICENSE file are met. | +--------------------------------------------------------------------+ - | Copyright (c) 2004-2005, Michael Wallner | + | Copyright (c) 2004-2006, Michael Wallner | +--------------------------------------------------------------------+ */ /* $Id$ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif - +#define HTTP_WANT_SAPI #define HTTP_WANT_CURL #include "php_http.h" @@ -29,18 +26,14 @@ # include "php_http_request_object.h" #endif -ZEND_EXTERN_MODULE_GLOBALS(http); - /* {{{ cruft for thread safe SSL crypto locks */ #if defined(ZTS) && defined(HTTP_HAVE_SSL) # ifdef PHP_WIN32 -# define HTTP_NEED_SSL_TSL # define HTTP_NEED_OPENSSL_TSL # include # else /* !PHP_WIN32 */ # if defined(HTTP_HAVE_OPENSSL) # if defined(HAVE_OPENSSL_CRYPTO_H) -# define HTTP_NEED_SSL_TSL # define HTTP_NEED_OPENSSL_TSL # include # else @@ -51,7 +44,6 @@ ZEND_EXTERN_MODULE_GLOBALS(http); # endif # elif defined(HTTP_HAVE_GNUTLS) # if defined(HAVE_GCRYPT_H) -# define HTTP_NEED_SSL_TSL # define HTTP_NEED_GNUTLS_TSL # include # else @@ -69,17 +61,77 @@ ZEND_EXTERN_MODULE_GLOBALS(http); # endif /* PHP_WIN32 */ #endif /* ZTS && HTTP_HAVE_SSL */ -#ifdef HTTP_NEED_SSL_TSL -static inline void http_ssl_init(void); -static inline void http_ssl_cleanup(void); +#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]); + } +} + +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; + } +} + +static int http_gnutls_mutex_destroy(void **m) +{ + tsrm_mutex_free(*((MUTEX_T *) m)); + return SUCCESS; +} + +static int http_gnutls_mutex_lock(void **m) +{ + return tsrm_mutex_lock(*((MUTEX_T *) m)); +} + +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_SSL_TSL - http_ssl_init(); +#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 if (CURLE_OK != curl_global_init(CURL_GLOBAL_ALL)) { @@ -90,7 +142,16 @@ PHP_MINIT_FUNCTION(http_request) 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; } /* }}} */ @@ -98,9 +159,25 @@ PHP_MINIT_FUNCTION(http_request) /* {{{ 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_SSL_TSL - http_ssl_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; } @@ -108,19 +185,23 @@ PHP_MSHUTDOWN_FUNCTION(http_request) /* {{{ MACROS */ #ifndef HAVE_CURL_EASY_STRERROR -# define curl_easy_strerror(dummy) "unkown error" +# define curl_easy_strerror(dummy) "unknown error" #endif -#define HTTP_CURL_INFO(I) HTTP_CURL_INFO_EX(I, I) +#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(request->ch, CURLINFO_ ##I, &c)) { \ - char *key = estrndup(#X, lenof(#X)); \ - add_assoc_string(&array, pretty_key(key, lenof(#X), 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); \ } \ } \ @@ -129,9 +210,9 @@ PHP_MSHUTDOWN_FUNCTION(http_request) case CURLINFO_DOUBLE: \ { \ double d; \ - if (CURLE_OK == curl_easy_getinfo(request->ch, CURLINFO_ ##I, &d)) { \ - char *key = estrndup(#X, lenof(#X)); \ - add_assoc_double(&array, pretty_key(key, lenof(#X), 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); \ } \ } \ @@ -140,9 +221,9 @@ PHP_MSHUTDOWN_FUNCTION(http_request) case CURLINFO_LONG: \ { \ long l; \ - if (CURLE_OK == curl_easy_getinfo(request->ch, CURLINFO_ ##I, &l)) { \ - char *key = estrndup(#X, lenof(#X)); \ - add_assoc_long(&array, pretty_key(key, lenof(#X), 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); \ } \ } \ @@ -151,49 +232,48 @@ PHP_MSHUTDOWN_FUNCTION(http_request) case CURLINFO_SLIST: \ { \ struct curl_slist *l, *p; \ - if (CURLE_OK == curl_easy_getinfo(request->ch, CURLINFO_ ##I, &l)) { \ + if (CURLE_OK == curl_easy_getinfo(request->ch, I, &l)) { \ zval *subarray; \ - char *key = estrndup(#X, lenof(#X)); \ + 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, lenof(#X), 0, 0), subarray); \ + 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(request->ch, CURLOPT_##OPTION, (p)) -#define HTTP_CURL_OPT_STRING(keyname, obdc) HTTP_CURL_OPT_STRING_EX(keyname, keyname, obdc) -#define HTTP_CURL_OPT_SSL_STRING(keyname, obdc) HTTP_CURL_OPT_STRING_EX(keyname, SSL##keyname, obdc) -#define HTTP_CURL_OPT_SSL_STRING_(keyname,obdc ) HTTP_CURL_OPT_STRING_EX(keyname, SSL_##keyname, obdc) +#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)) { \ - int ok = 1; \ - zval *orig = *param; \ - convert_to_string_ex(param); \ + 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_PP(param), ok = 0); \ + HTTP_CHECK_OPEN_BASEDIR(Z_STRVAL_P(copy), return FAILURE); \ } \ + HTTP_CURL_OPT(optname, Z_STRVAL_P(copy)); \ key = NULL; \ - if (ok) { \ - HTTP_CURL_OPT(optname, Z_STRVAL_PP(param)); \ - if (orig != *param) zval_ptr_dtor(param); \ - continue; \ - } \ - if (orig != *param) zval_ptr_dtor(param); \ - return FAILURE; \ + continue; \ + } +#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(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_EX(keyname, optname) \ - if (!strcasecmp(key, #keyname)) { \ - convert_to_long(*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; \ } @@ -203,6 +283,9 @@ PHP_MSHUTDOWN_FUNCTION(http_request) #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 size_t http_curl_read_callback(void *, size_t, size_t, void *); static int http_curl_progress_callback(void *, double, double, double, double); @@ -211,6 +294,55 @@ static int http_curl_dummy_callback(char *data, size_t n, size_t l, void *s) { r static curlioerr http_curl_ioctl_callback(CURL *, curliocmd, void *); /* }}} */ +/* {{{ CURL *http_curl_init(http_request *) */ +PHP_HTTP_API CURL * _http_curl_init_ex(CURL *ch, http_request *request) +{ + 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_curl_free(CURL **) */ +PHP_HTTP_API void _http_curl_free(CURL **ch) +{ + 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 *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) { @@ -224,7 +356,7 @@ PHP_HTTP_API http_request *_http_request_init_ex(http_request *request, CURL *ch memset(r, 0, sizeof(http_request)); r->ch = ch; - r->url = (url && *url) ? estrdup(url) : NULL; + r->url = (url) ? http_absolute_url(url) : NULL; r->meth = (meth > 0) ? meth : HTTP_GET; phpstr_init(&r->conv.request); @@ -243,16 +375,7 @@ PHP_HTTP_API void _http_request_dtor(http_request *request) { TSRMLS_FETCH_FROM_CTX(request->tsrm_ls); - if (request->ch) { - /* avoid nasty segfaults with already cleaned up callbacks */ - curl_easy_setopt(request->ch, CURLOPT_NOPROGRESS, 1); - curl_easy_setopt(request->ch, CURLOPT_PROGRESSFUNCTION, NULL); - curl_easy_setopt(request->ch, CURLOPT_VERBOSE, 0); - curl_easy_setopt(request->ch, CURLOPT_DEBUGFUNCTION, NULL); - curl_easy_cleanup(request->ch); - request->ch = NULL; - } - + http_curl_free(&request->ch); http_request_reset(request); phpstr_dtor(&request->_cache.cookies); @@ -290,6 +413,11 @@ PHP_HTTP_API void _http_request_reset(http_request *request) phpstr_dtor(&request->conv.request); phpstr_dtor(&request->conv.response); http_request_body_dtor(request->body); + + if (request->ch) { + http_request_defaults(request); + } + request->_error[0] = '\0'; } /* }}} */ @@ -297,70 +425,68 @@ PHP_HTTP_API void _http_request_reset(http_request *request) PHP_HTTP_API void _http_request_defaults(http_request *request) { if (request->ch) { -#ifdef HAVE_CURL_EASY_RESET - curl_easy_reset(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 -#if defined(ZTS) - HTTP_CURL_OPT(NOSIGNAL, 1); + 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(PRIVATE, request); - HTTP_CURL_OPT(ERRORBUFFER, request->_error); - HTTP_CURL_OPT(HEADER, 0); - HTTP_CURL_OPT(FILETIME, 1); - HTTP_CURL_OPT(AUTOREFERER, 1); - HTTP_CURL_OPT(VERBOSE, 1); - HTTP_CURL_OPT(HEADERFUNCTION, NULL); - HTTP_CURL_OPT(DEBUGFUNCTION, http_curl_raw_callback); - HTTP_CURL_OPT(READFUNCTION, http_curl_read_callback); - HTTP_CURL_OPT(IOCTLFUNCTION, http_curl_ioctl_callback); - HTTP_CURL_OPT(WRITEFUNCTION, http_curl_dummy_callback); - HTTP_CURL_OPT(PROGRESSFUNCTION, NULL); - HTTP_CURL_OPT(URL, NULL); - HTTP_CURL_OPT(NOPROGRESS, 1); - HTTP_CURL_OPT(PROXY, NULL); - HTTP_CURL_OPT(PROXYPORT, 0); - HTTP_CURL_OPT(PROXYUSERPWD, NULL); - HTTP_CURL_OPT(PROXYAUTH, 0); - HTTP_CURL_OPT(INTERFACE, NULL); - HTTP_CURL_OPT(PORT, 0); - HTTP_CURL_OPT(USERPWD, NULL); - HTTP_CURL_OPT(HTTPAUTH, 0); - HTTP_CURL_OPT(ENCODING, NULL); - HTTP_CURL_OPT(FOLLOWLOCATION, 0); - HTTP_CURL_OPT(UNRESTRICTED_AUTH, 0); - HTTP_CURL_OPT(REFERER, NULL); - HTTP_CURL_OPT(USERAGENT, "PECL::HTTP/" PHP_EXT_HTTP_VERSION " (PHP/" PHP_VERSION ")"); - HTTP_CURL_OPT(HTTPHEADER, NULL); - HTTP_CURL_OPT(COOKIE, NULL); - HTTP_CURL_OPT(COOKIEFILE, NULL); - HTTP_CURL_OPT(COOKIEJAR, NULL); - HTTP_CURL_OPT(RESUME_FROM, 0); - HTTP_CURL_OPT(MAXFILESIZE, 0); - HTTP_CURL_OPT(TIMECONDITION, 0); - HTTP_CURL_OPT(TIMEVALUE, 0); - HTTP_CURL_OPT(TIMEOUT, 0); - HTTP_CURL_OPT(CONNECTTIMEOUT, 3); - HTTP_CURL_OPT(SSLCERT, NULL); - HTTP_CURL_OPT(SSLCERTTYPE, NULL); - HTTP_CURL_OPT(SSLCERTPASSWD, NULL); - HTTP_CURL_OPT(SSLKEY, NULL); - HTTP_CURL_OPT(SSLKEYTYPE, NULL); - HTTP_CURL_OPT(SSLKEYPASSWD, NULL); - HTTP_CURL_OPT(SSLENGINE, NULL); - HTTP_CURL_OPT(SSLVERSION, 0); - HTTP_CURL_OPT(SSL_VERIFYPEER, 0); - HTTP_CURL_OPT(SSL_VERIFYHOST, 0); - HTTP_CURL_OPT(SSL_CIPHER_LIST, NULL); - HTTP_CURL_OPT(CAINFO, NULL); - HTTP_CURL_OPT(CAPATH, NULL); - HTTP_CURL_OPT(RANDOM_FILE, NULL); - HTTP_CURL_OPT(EGDSOCKET, NULL); - HTTP_CURL_OPT(POSTFIELDS, NULL); - HTTP_CURL_OPT(POSTFIELDSIZE, 0); - HTTP_CURL_OPT(HTTPPOST, NULL); - HTTP_CURL_OPT(IOCTLDATA, NULL); - HTTP_CURL_OPT(READDATA, NULL); - HTTP_CURL_OPT(INFILESIZE, 0); + 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); } } /* }}} */ @@ -372,10 +498,16 @@ PHP_HTTP_API void _http_request_set_progress_callback(http_request *request, zva if (request->_progress_callback) { zval_ptr_dtor(&request->_progress_callback); } - if (cb) { + 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); } - request->_progress_callback = cb; } /* {{{ STATUS http_request_prepare(http_request *, HashTable *) */ @@ -386,74 +518,146 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti TSRMLS_FETCH_FROM_CTX(request->tsrm_ls); - HTTP_CHECK_CURL_INIT(request->ch, curl_easy_init(), return FAILURE); - - http_request_defaults(request); + HTTP_CHECK_CURL_INIT(request->ch, http_curl_init(request), return FAILURE); /* set options */ - HTTP_CURL_OPT(DEBUGDATA, request); - HTTP_CURL_OPT(URL, request->url); + HTTP_CURL_OPT(CURLOPT_URL, request->url); /* progress callback */ - if ((zoption = http_request_option(request, options, "onprogress", 0))) { - HTTP_CURL_OPT(NOPROGRESS, 0); - HTTP_CURL_OPT(PROGRESSDATA, request); - HTTP_CURL_OPT(PROGRESSFUNCTION, http_curl_progress_callback); + if ((zoption = http_request_option(request, options, "onprogress", -1))) { http_request_set_progress_callback(request, zoption); } /* proxy */ if ((zoption = http_request_option(request, options, "proxyhost", IS_STRING))) { - HTTP_CURL_OPT(PROXY, Z_STRVAL_P(zoption)); + 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_request_option(request, options, "proxyport", IS_LONG))) { - HTTP_CURL_OPT(PROXYPORT, Z_LVAL_P(zoption)); + HTTP_CURL_OPT(CURLOPT_PROXYPORT, Z_LVAL_P(zoption)); } /* user:pass */ - if ((zoption = http_request_option(request, options, "proxyauth", IS_STRING))) { - HTTP_CURL_OPT(PROXYUSERPWD, 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)); } /* auth method */ if ((zoption = http_request_option(request, options, "proxyauthtype", IS_LONG))) { - HTTP_CURL_OPT(PROXYAUTH, Z_LVAL_P(zoption)); + HTTP_CURL_OPT(CURLOPT_PROXYAUTH, Z_LVAL_P(zoption)); } } /* outgoing interface */ if ((zoption = http_request_option(request, options, "interface", IS_STRING))) { - HTTP_CURL_OPT(INTERFACE, Z_STRVAL_P(zoption)); + 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_request_option(request, options, "port", IS_LONG))) { - HTTP_CURL_OPT(PORT, Z_LVAL_P(zoption)); + HTTP_CURL_OPT(CURLOPT_PORT, Z_LVAL_P(zoption)); } /* auth */ - if ((zoption = http_request_option(request, options, "httpauth", IS_STRING))) { - HTTP_CURL_OPT(USERPWD, Z_STRVAL_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)); } if ((zoption = http_request_option(request, options, "httpauthtype", IS_LONG))) { - HTTP_CURL_OPT(HTTPAUTH, Z_LVAL_P(zoption)); + HTTP_CURL_OPT(CURLOPT_HTTPAUTH, Z_LVAL_P(zoption)); } /* redirects, defaults to 0 */ if ((zoption = http_request_option(request, options, "redirect", IS_LONG))) { - HTTP_CURL_OPT(FOLLOWLOCATION, Z_LVAL_P(zoption) ? 1 : 0); - HTTP_CURL_OPT(MAXREDIRS, Z_LVAL_P(zoption)); + 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(UNRESTRICTED_AUTH, Z_LVAL_P(zoption)); + HTTP_CURL_OPT(CURLOPT_UNRESTRICTED_AUTH, Z_LVAL_P(zoption)); } } /* referer */ - if ((zoption = http_request_option(request, options, "referer", IS_STRING))) { - HTTP_CURL_OPT(REFERER, Z_STRVAL_P(zoption)); + 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_request_option(request, options, "useragent", IS_STRING))) { - HTTP_CURL_OPT(USERAGENT, Z_STRVAL_P(zoption)); + /* 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') */ @@ -469,18 +673,17 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti FOREACH_KEY(pos, zoption, header_key, header_idx) { if (header_key) { zval **header_val; - if (SUCCESS == zend_hash_get_current_data_ex(Z_ARRVAL_P(zoption), (void **) &header_val, &pos)) { + if (SUCCESS == zend_hash_get_current_data_ex(Z_ARRVAL_P(zoption), (void *) &header_val, &pos)) { char header[1024] = {0}; - zval val; - val = **header_val; - zval_copy_ctor(&val); - INIT_PZVAL(&val); - convert_to_string(&val); - - snprintf(header, 1023, "%s: %s", header_key, Z_STRVAL(val)); + 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_dtor(&val); + zval_ptr_dtor(header_val); } /* reset */ @@ -488,50 +691,79 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti } } } + /* 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,*;q=0.1"); + 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); + + /* 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); + } } - HTTP_CURL_OPT(HTTPHEADER, request->_cache.headers); /* cookies, array('name' => 'value') */ if ((zoption = http_request_option(request, options, "cookies", IS_ARRAY))) { - char *cookie_key = NULL; - ulong cookie_idx = 0; - HashPosition pos; - phpstr_dtor(&request->_cache.cookies); - - 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; - - val = **cookie_val; - INIT_PZVAL(&val); - zval_copy_ctor(&val); - convert_to_string(&val); - - phpstr_appendf(&request->_cache.cookies, "%s=%s; ", cookie_key, Z_STRVAL(val)); - - zval_dtor(&val); + 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 (request->_cache.cookies.used) { - phpstr_fix(&request->_cache.cookies); - HTTP_CURL_OPT(COOKIE, request->_cache.cookies.data); - } } -#if LIBCURL_VERSIONNUM >= 0x070f01 +#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(COOKIELIST, "ALL"); + HTTP_CURL_OPT(CURLOPT_COOKIELIST, "ALL"); } #endif @@ -539,53 +771,38 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti 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); } } /* cookiestore, read initial cookies from that file and store cookies back into that file */ 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(COOKIEFILE, Z_STRVAL_P(zoption)); - HTTP_CURL_OPT(COOKIEJAR, Z_STRVAL_P(zoption)); - } - - /* resume */ - if ((zoption = http_request_option(request, options, "resume", IS_LONG)) && (Z_LVAL_P(zoption) != 0)) { - range_req = 1; - HTTP_CURL_OPT(RESUME_FROM, Z_LVAL_P(zoption)); + HTTP_CURL_OPT(CURLOPT_COOKIEFILE, Z_STRVAL_P(zoption)); + HTTP_CURL_OPT(CURLOPT_COOKIEJAR, Z_STRVAL_P(zoption)); } /* maxfilesize */ if ((zoption = http_request_option(request, options, "maxfilesize", IS_LONG))) { - HTTP_CURL_OPT(MAXFILESIZE, Z_LVAL_P(zoption)); + HTTP_CURL_OPT(CURLOPT_MAXFILESIZE, Z_LVAL_P(zoption)); } - /* 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(TIMEVALUE, Z_LVAL_P(zoption)); - } else { - HTTP_CURL_OPT(TIMEVALUE, time(NULL) + Z_LVAL_P(zoption)); - } - HTTP_CURL_OPT(TIMECONDITION, range_req ? CURL_TIMECOND_IFUNMODSINCE : CURL_TIMECOND_IFMODSINCE); - } else { - HTTP_CURL_OPT(TIMECONDITION, CURL_TIMECOND_NONE); - } + /* 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 0 */ if ((zoption = http_request_option(request, options, "timeout", IS_LONG))) { - HTTP_CURL_OPT(TIMEOUT, Z_LVAL_P(zoption)); + HTTP_CURL_OPT(CURLOPT_TIMEOUT, Z_LVAL_P(zoption)); } - /* connecttimeout, defaults to 3 */ + /* connecttimeout, defaults to 0 */ if ((zoption = http_request_option(request, options, "connecttimeout", IS_LONG))) { - HTTP_CURL_OPT(CONNECTTIMEOUT, Z_LVAL_P(zoption)); + HTTP_CURL_OPT(CURLOPT_CONNECTTIMEOUT, Z_LVAL_P(zoption)); } /* ssl */ @@ -597,25 +814,25 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti FOREACH_KEYVAL(pos, zoption, key, idx, param) { if (key) { - HTTP_CURL_OPT_SSL_STRING(CERT, 1); - HTTP_CURL_OPT_SSL_STRING(CERTTYPE, 0); - HTTP_CURL_OPT_SSL_STRING(CERTPASSWD, 0); + 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, 0); - HTTP_CURL_OPT_SSL_STRING(KEYTYPE, 0); - HTTP_CURL_OPT_SSL_STRING(KEYPASSWD, 0); + 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, 0); - 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, 0); + 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, 1); - HTTP_CURL_OPT_STRING(CAPATH, 1); - HTTP_CURL_OPT_STRING(RANDOM_FILE, 1); - HTTP_CURL_OPT_STRING(EGDSOCKET, 1); + 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; @@ -627,24 +844,24 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti switch (request->meth) { case HTTP_GET: - curl_easy_setopt(request->ch, CURLOPT_HTTPGET, 1); + HTTP_CURL_OPT(CURLOPT_HTTPGET, 1); break; case HTTP_HEAD: - curl_easy_setopt(request->ch, CURLOPT_NOBODY, 1); + HTTP_CURL_OPT(CURLOPT_NOBODY, 1); break; case HTTP_POST: - curl_easy_setopt(request->ch, CURLOPT_POST, 1); + HTTP_CURL_OPT(CURLOPT_POST, 1); break; case HTTP_PUT: - curl_easy_setopt(request->ch, CURLOPT_UPLOAD, 1); + HTTP_CURL_OPT(CURLOPT_UPLOAD, 1); break; default: if (http_request_method_exists(0, request->meth, NULL)) { - curl_easy_setopt(request->ch, CURLOPT_CUSTOMREQUEST, http_request_method_name(request->meth)); + 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 (%s)", request->meth, request->url); return FAILURE; @@ -653,22 +870,28 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti } /* attach request body */ - if (request->body && (request->meth != HTTP_GET) && (request->meth != HTTP_HEAD)) { + 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(request->ch, CURLOPT_POSTFIELDS, request->body->data); - curl_easy_setopt(request->ch, CURLOPT_POSTFIELDSIZE, request->body->size); + case HTTP_REQUEST_BODY_EMPTY: + /* nothing */ break; - + case HTTP_REQUEST_BODY_CURLPOST: - curl_easy_setopt(request->ch, CURLOPT_HTTPPOST, (struct curl_httppost *) request->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(request->ch, CURLOPT_IOCTLDATA, request); - curl_easy_setopt(request->ch, CURLOPT_READDATA, request); - curl_easy_setopt(request->ch, CURLOPT_INFILESIZE, request->body->size); + HTTP_CURL_OPT(CURLOPT_IOCTLDATA, request); + HTTP_CURL_OPT(CURLOPT_READDATA, request); + HTTP_CURL_OPT(CURLOPT_INFILESIZE, request->body->size); break; default: @@ -701,35 +924,36 @@ PHP_HTTP_API void _http_request_info(http_request *request, HashTable *info) zval array; INIT_ZARR(array, info); - HTTP_CURL_INFO(EFFECTIVE_URL); - HTTP_CURL_INFO(RESPONSE_CODE); - HTTP_CURL_INFO_EX(HTTP_CONNECTCODE, connect_code); - HTTP_CURL_INFO(FILETIME); - 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); - HTTP_CURL_INFO(REDIRECT_TIME); - HTTP_CURL_INFO(REDIRECT_COUNT); - 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); - HTTP_CURL_INFO(SSL_ENGINES); - HTTP_CURL_INFO(CONTENT_LENGTH_DOWNLOAD); - HTTP_CURL_INFO(CONTENT_LENGTH_UPLOAD); - HTTP_CURL_INFO(CONTENT_TYPE); - HTTP_CURL_INFO(HTTPAUTH_AVAIL); - HTTP_CURL_INFO(PROXYAUTH_AVAIL); - /*HTTP_CURL_INFO(OS_ERRNO);*/ - HTTP_CURL_INFO(NUM_CONNECTS); -#if LIBCURL_VERSION_NUM >= 0x070e01 - HTTP_CURL_INFO_EX(COOKIELIST, cookies); + 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(CURLINFO_OS_ERRNO); + add_assoc_string(&array, "error", request->_error, 1); } /* }}} */ @@ -738,41 +962,54 @@ static size_t http_curl_read_callback(void *data, size_t len, size_t n, void *ct { http_request *request = (http_request *) ctx; TSRMLS_FETCH_FROM_CTX(request->tsrm_ls); - - if (request->body == NULL || request->body->type != HTTP_REQUEST_BODY_UPLOADFILE) { - return 0; + + if (request->body) { + switch (request->body->type) + { + 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 php_stream_read((php_stream *) request->body->data, data, len * n); + return 0; } /* }}} */ /* {{{ 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) { - int rc; - zval *params_pass[4], params_local[4], retval; + zval *param, retval; http_request *request = (http_request *) ctx; TSRMLS_FETCH_FROM_CTX(request->tsrm_ls); - 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); - INIT_PZVAL(&retval); ZVAL_NULL(&retval); - rc = call_user_function(EG(function_table), NULL, request->_progress_callback, &retval, 4, params_pass TSRMLS_CC); + + 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 rc; + + return 0; } /* }}} */ @@ -785,12 +1022,24 @@ static curlioerr http_curl_ioctl_callback(CURL *ch, curliocmd cmd, void *ctx) if (cmd != CURLIOCMD_RESTARTREAD) { return CURLIOE_UNKNOWNCMD; } - if ( request->body == NULL || - request->body->type != HTTP_REQUEST_BODY_UPLOADFILE || - SUCCESS != php_stream_rewind((php_stream *) request->body->data)) { - return CURLIOE_FAILRESTART; + + 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 CURLIOE_OK; + + return CURLIOE_FAILRESTART; } /* }}} */ @@ -850,145 +1099,46 @@ static inline zval *_http_request_option_ex(http_request *r, HashTable *options, zval **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)) + (SUCCESS != zend_hash_quick_find(options, key, keylen, h, (void *) &zoption)) #else - (SUCCESS != zend_hash_find(options, key, keylen, (void **) &zoption)) + (SUCCESS != zend_hash_find(options, key, keylen, (void *) &zoption)) #endif ) { return NULL; } - - 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; - } - } - /* cache strings */ - if (type == IS_STRING) { - ZVAL_ADDREF(*zoption); -#ifdef ZEND_ENGINE_2 - _zend_hash_quick_add_or_update(&r->_cache.options, key, keylen, h, zoption, sizeof(zval *), NULL, - zend_hash_quick_exists(&r->_cache.options, key, keylen, h)?HASH_UPDATE:HASH_ADD ZEND_FILE_LINE_CC); -#else - zend_hash_add_or_update(&r->_cache.options, key, keylen, zoption, sizeof(zval *), NULL, - zend_hash_exists(&r->_cache.options, key, keylen)?HASH_UPDATE:HASH_ADD); -#endif - } - - return *zoption; + return http_request_option_cache_ex(r, key, keylen, h, zval_copy(type, *zoption)); } /* }}} */ -#ifdef HTTP_NEED_OPENSSL_TSL -/* {{{ */ -static MUTEX_T *http_openssl_tsl = NULL; - -static void http_ssl_lock(int mode, int n, const char * file, int line) +/* {{{ 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) { - if (mode & CRYPTO_LOCK) { - tsrm_mutex_lock(http_openssl_tsl[n]); - } else { - tsrm_mutex_unlock(http_openssl_tsl[n]); - } -} - -static ulong http_ssl_id(void) -{ - return (ulong) tsrm_thread_id(); -} - -static inline void http_ssl_init(void) -{ - int i, c = CRYPTO_num_locks(); + ZVAL_ADDREF(opt); - http_openssl_tsl = malloc(c * sizeof(MUTEX_T)); - - for (i = 0; i < c; ++i) { - http_openssl_tsl[i] = tsrm_mutex_alloc(); +#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); } - - CRYPTO_set_id_callback(http_ssl_id); - CRYPTO_set_locking_callback(http_ssl_lock); -} - -static inline void http_ssl_cleanup(void) -{ - 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]); + 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); } - - free(http_openssl_tsl); - http_openssl_tsl = NULL; - } -} -#endif /* HTTP_NEED_OPENSSL_TSL */ -/* }}} */ - -#ifdef HTTP_NEED_GNUTLS_TSL -/* {{{ */ -static int http_ssl_mutex_create(void **m) -{ - if (*((MUTEX_T *) m) = tsrm_mutex_alloc()) { - return SUCCESS; - } else { - return FAILURE; } + + return opt; } - -static int http_ssl_mutex_destroy(void **m) -{ - tsrm_mutex_free(*((MUTEX_T *) m)); - return SUCCESS; -} - -static int http_ssl_mutex_lock(void **m) -{ - return tsrm_mutex_lock(*((MUTEX_T *) m)); -} - -static int http_ssl_mutex_unlock(void **m) -{ - return tsrm_mutex_unlock(*((MUTEX_T *) m)); -} - -static struct gcry_thread_cbs http_gnutls_tsl = { - GCRY_THREAD_OPTIONS_USER, - NULL, - http_ssl_mutex_create, - http_ssl_mutex_destroy, - http_ssl_mutex_lock, - http_ssl_mutex_unlock -}; - -static inline void http_ssl_init(void) -{ - gcry_control(GCRYCTL_SET_THREAD_CBS, &http_gnutls_tsl); -} - -static inline void http_ssl_cleanup(void) -{ - return; -} -#endif /* HTTP_NEED_GNUTLS_TSL */ /* }}} */ #endif /* HTTP_HAVE_CURL */