X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_curl_api.c;h=9fc04fb2dbe1a473eaf1273c66cacd6ac7b3958f;hp=da38a35efc59bb09a827622ea923c98e1ce3bbe7;hb=81a242054e9c75651ef3d2fd9e9ea836517c92aa;hpb=01a7fd61aae8bfb11ce8cb1e39c0653511de665b diff --git a/http_curl_api.c b/http_curl_api.c index da38a35..9fc04fb 100644 --- a/http_curl_api.c +++ b/http_curl_api.c @@ -20,104 +20,78 @@ #endif #ifdef PHP_WIN32 -# define _WINSOCKAPI_ -# define ZEND_INCLUDE_FULL_WINDOWS_HEADERS # include -# include #endif #include -#include + +#include "phpstr/phpstr.h" #include "php.h" #include "php_http.h" +#include "php_http_std_defs.h" #include "php_http_api.h" #include "php_http_curl_api.h" -#include "php_http_std_defs.h" +#include "php_http_url_api.h" -#ifdef ZEND_ENGINE_2 -# include "ext/standard/php_http.h" -#endif +ZEND_EXTERN_MODULE_GLOBALS(http) -#include "ext/standard/php_smart_str.h" +#if LIBCURL_VERSION_NUM >= 0x070c01 +# define http_curl_reset(ch) curl_easy_reset(ch) +#else +# define http_curl_reset(ch) +#endif -ZEND_DECLARE_MODULE_GLOBALS(http) +#if LIBCURL_VERSION_NUM < 0x070c00 +# define http_curl_error(dummy) HTTP_G(curlerr) +# define curl_easy_strerror(code) "unkown error" +#else +# define http_curl_error(code) curl_easy_strerror(code) +#endif -#define http_curl_startup(ch, clean_curl, URL, options) \ +#define http_curl_startup(ch, clean_curl, URL, options, response) \ if (!ch) { \ if (!(ch = curl_easy_init())) { \ - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not initialize curl"); \ + http_error(E_WARNING, HTTP_E_CURL, "Could not initialize curl"); \ return FAILURE; \ } \ clean_curl = 1; \ + } else { \ + http_curl_reset(ch); \ } \ - http_curl_initbuf(); \ - http_curl_setopts(ch, URL, options); + http_curl_setopts(ch, URL, options, response); +#define http_curl_perform(ch, clean_curl, response) \ + { \ + CURLcode result; \ + if (CURLE_OK != (result = curl_easy_perform(ch))) { \ + http_error_ex(E_WARNING, HTTP_E_CURL, "Could not perform request: %s", curl_easy_strerror(result)); \ + http_curl_cleanup(ch, clean_curl, response); \ + return FAILURE; \ + } \ + } -#define http_curl_cleanup(ch, clean_curl) \ - http_curl_freestr(); \ - http_curl_freebuf(); \ +#define http_curl_cleanup(ch, clean_curl, response) \ + zend_llist_clean(&HTTP_G(to_free)); \ if (clean_curl) { \ curl_easy_cleanup(ch); \ ch = NULL; \ - } - -#define http_curl_freestr() \ - zend_llist_clean(&HTTP_G(to_free)) - -#define http_curl_initbuf() http_curl_initbuf_ex(0) - -#define http_curl_initbuf_ex(chunk_size) \ - { \ - size_t size = (chunk_size > 0) ? chunk_size : HTTP_CURLBUF_SIZE; \ - http_curl_freebuf(); \ - HTTP_G(curlbuf).data = emalloc(size); \ - HTTP_G(curlbuf).free = size; \ - HTTP_G(curlbuf).size = size; \ - } - -#define http_curl_freebuf() \ - if (HTTP_G(curlbuf).data) { \ - efree(HTTP_G(curlbuf).data); \ - HTTP_G(curlbuf).data = NULL; \ } \ - HTTP_G(curlbuf).used = 0; \ - HTTP_G(curlbuf).free = 0; \ - HTTP_G(curlbuf).size = 0; - -#define http_curl_copybuf(data, size) \ - * size = HTTP_G(curlbuf).used; \ - * data = ecalloc(1, HTTP_G(curlbuf).used + 1); \ - memcpy(* data, HTTP_G(curlbuf).data, * size); - -#define http_curl_sizebuf(for_size) \ - { \ - size_t size = (for_size); \ - if (size > HTTP_G(curlbuf).free) { \ - size_t bsize = HTTP_G(curlbuf).size; \ - while (size > bsize) { \ - bsize *= 2; \ - } \ - HTTP_G(curlbuf).data = erealloc(HTTP_G(curlbuf).data, HTTP_G(curlbuf).used + bsize); \ - HTTP_G(curlbuf).free += bsize; \ - } \ - } - + phpstr_fix(PHPSTR(response)) #define http_curl_copystr(s) _http_curl_copystr((s) TSRMLS_CC) static inline char *_http_curl_copystr(const char *str TSRMLS_DC); -#define http_curl_setopts(c, u, o) _http_curl_setopts((c), (u), (o) TSRMLS_CC) -static inline void _http_curl_setopts(CURL *ch, const char *url, HashTable *options TSRMLS_DC); +#define http_curl_setopts(c, u, o, r) _http_curl_setopts((c), (u), (o), (r) TSRMLS_CC) +static void _http_curl_setopts(CURL *ch, const char *url, HashTable *options, phpstr *response TSRMLS_DC); -#define http_curl_getopt(o, k) _http_curl_getopt((o), (k) TSRMLS_CC, 0) -#define http_curl_getopt1(o, k, t1) _http_curl_getopt((o), (k) TSRMLS_CC, 1, (t1)) -#define http_curl_getopt2(o, k, t1, t2) _http_curl_getopt((o), (k) TSRMLS_CC, 2, (t1), (t2)) -static inline zval *_http_curl_getopt(HashTable *options, char *key TSRMLS_DC, int checks, ...); +#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_body_callback(char *, size_t, size_t, void *); -static size_t http_curl_hdrs_callback(char *, size_t, size_t, void *); +static size_t http_curl_write_callback(char *, size_t, size_t, void *); +static int http_curl_progress_callback(void *, double, double, double, double); +static int http_curl_debug_callback(CURL *, curl_infotype, char *, size_t, void *); #define http_curl_getinfo(c, h) _http_curl_getinfo((c), (h) TSRMLS_CC) static inline void _http_curl_getinfo(CURL *ch, HashTable *info TSRMLS_DC); @@ -131,206 +105,342 @@ static inline char *_http_curl_copystr(const char *str TSRMLS_DC) } /* }}} */ -/* {{{ static size_t http_curl_body_callback(char *, size_t, size_t, void *) */ -static size_t http_curl_body_callback(char *buf, size_t len, size_t n, void *s) +/* {{{ static size_t http_curl_write_callback(char *, size_t, size_t, void *) */ +static size_t http_curl_write_callback(char *buf, size_t len, size_t n, void *s) { + return s ? phpstr_append(PHPSTR(s), buf, len * n) : len * n; +} +/* }}} */ + +/* {{{ 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, *func = (zval *) data; TSRMLS_FETCH(); - http_curl_sizebuf(len *= n); + params_pass[0] = ¶ms_local[0]; + params_pass[1] = ¶ms_local[1]; + params_pass[2] = ¶ms_local[2]; + params_pass[3] = ¶ms_local[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); - memcpy(HTTP_G(curlbuf).data + HTTP_G(curlbuf).used, buf, len); - HTTP_G(curlbuf).free -= len; - HTTP_G(curlbuf).used += len; - return len; + return call_user_function(EG(function_table), NULL, func, &retval, 4, params_pass TSRMLS_CC); } /* }}} */ -/* {{{ static size_t http_curl_hdrs_callback(char *, size_t, size_t, void *) */ -static size_t http_curl_hdrs_callback(char *buf, size_t len, size_t n, void *s) +static int http_curl_debug_callback(CURL *ch, curl_infotype type, char *string, size_t length, void *data) { + zval *params_pass[2], params_local[2], retval, *func = (zval *) data; TSRMLS_FETCH(); - /* discard previous headers */ - if ((HTTP_G(curlbuf).used) && (!strncmp(buf, "HTTP/1.", sizeof("HTTP/1.") - 1))) { - http_curl_initbuf(); - } - http_curl_sizebuf(len *= n); + params_pass[0] = ¶ms_local[0]; + params_pass[1] = ¶ms_local[1]; - memcpy(HTTP_G(curlbuf).data + HTTP_G(curlbuf).used, buf, len); - HTTP_G(curlbuf).free -= len; - HTTP_G(curlbuf).used += len; - return len; -} -/* }}} */ + ZVAL_LONG(params_pass[0], type); + ZVAL_STRINGL(params_pass[1], string, length, 1); -/* {{{ static inline zval *http_curl_getopt(HashTable *, char *, int, ...) */ -static inline zval *_http_curl_getopt(HashTable *options, char *key TSRMLS_DC, int checks, ...) + call_user_function(EG(function_table), NULL, func, &retval, 2, params_pass TSRMLS_CC); + + 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) { zval **zoption; - va_list types; - int i; - if (SUCCESS != zend_hash_find(options, key, strlen(key) + 1, (void **) &zoption)) { + if (!options || (SUCCESS != zend_hash_find(options, key, keylen, (void **) &zoption))) { return NULL; } - if (checks < 1) { - return *zoption; - } - va_start(types, checks); - for (i = 0; i < checks; ++i) { - if ((va_arg(types, int)) == (Z_TYPE_PP(zoption))) { - va_end(types); - return *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; } } - va_end(types); - return NULL; + + return *zoption; } /* }}} */ -/* {{{ static inline void http_curl_setopts(CURL *, char *, HashTable *) */ -static inline void _http_curl_setopts(CURL *ch, const char *url, HashTable *options TSRMLS_DC) +/* {{{ static void http_curl_setopts(CURL *, char *, HashTable *, phpstr *) */ +static void _http_curl_setopts(CURL *ch, const char *url, HashTable *options, phpstr *response TSRMLS_DC) { zval *zoption; + zend_bool range_req = 0; + +#define HTTP_CURL_OPT(OPTION, p) curl_easy_setopt(ch, CURLOPT_##OPTION, (p)) /* standard options */ - curl_easy_setopt(ch, CURLOPT_URL, url); - curl_easy_setopt(ch, CURLOPT_HEADER, 0); - curl_easy_setopt(ch, CURLOPT_NOPROGRESS, 1); - curl_easy_setopt(ch, CURLOPT_AUTOREFERER, 1); - curl_easy_setopt(ch, CURLOPT_WRITEFUNCTION, http_curl_body_callback); - curl_easy_setopt(ch, CURLOPT_HEADERFUNCTION, http_curl_hdrs_callback); + if (url) { + HTTP_CURL_OPT(URL, url); + } + + HTTP_CURL_OPT(HEADER, 0); + HTTP_CURL_OPT(FILETIME, 1); + HTTP_CURL_OPT(NOPROGRESS, 1); + HTTP_CURL_OPT(AUTOREFERER, 1); + HTTP_CURL_OPT(WRITEFUNCTION, http_curl_write_callback); + HTTP_CURL_OPT(HEADERFUNCTION, http_curl_write_callback); + + if (response) { + HTTP_CURL_OPT(WRITEDATA, response); + HTTP_CURL_OPT(WRITEHEADER, response); + } + #if defined(ZTS) && (LIBCURL_VERSION_NUM >= 0x070a00) - curl_easy_setopt(ch, CURLOPT_NOSIGNAL, 1); + HTTP_CURL_OPT(NOSIGNAL, 1); +#endif +#if LIBCURL_VERSION_NUM < 0x070c00 + HTTP_CURL_OPT(ERRORBUFFER, HTTP_G(curlerr)); #endif - if ((!options) || (1 > zend_hash_num_elements(options))) { - return; + /* 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, zoption); + } else { + HTTP_CURL_OPT(NOPROGRESS, 1); } - /* redirects, defaults to 0 */ - if (zoption = http_curl_getopt1(options, "redirect", IS_LONG)) { - curl_easy_setopt(ch, CURLOPT_FOLLOWLOCATION, Z_LVAL_P(zoption) ? 1 : 0); - curl_easy_setopt(ch, CURLOPT_MAXREDIRS, Z_LVAL_P(zoption)); - if (zoption = http_curl_getopt2(options, "unrestrictedauth", IS_LONG, IS_BOOL)) { - curl_easy_setopt(ch, CURLOPT_UNRESTRICTED_AUTH, Z_LVAL_P(zoption)); - } + /* debug callback */ + if (zoption = http_curl_getopt(options, "ondebug", 0)) { + HTTP_CURL_OPT(VERBOSE, 1); + HTTP_CURL_OPT(DEBUGFUNCTION, http_curl_debug_callback); + HTTP_CURL_OPT(DEBUGDATA, zoption); } else { - curl_easy_setopt(ch, CURLOPT_FOLLOWLOCATION, 0); + HTTP_CURL_OPT(VERBOSE, 0); } /* proxy */ - if (zoption = http_curl_getopt1(options, "proxyhost", IS_STRING)) { - curl_easy_setopt(ch, CURLOPT_PROXY, http_curl_copystr(Z_STRVAL_P(zoption))); + if (zoption = http_curl_getopt(options, "proxyhost", IS_STRING)) { + HTTP_CURL_OPT(PROXY, http_curl_copystr(Z_STRVAL_P(zoption))); /* port */ - if (zoption = http_curl_getopt1(options, "proxyport", IS_LONG)) { - curl_easy_setopt(ch, CURLOPT_PROXYPORT, Z_LVAL_P(zoption)); + if (zoption = http_curl_getopt(options, "proxyport", IS_LONG)) { + HTTP_CURL_OPT(PROXYPORT, Z_LVAL_P(zoption)); } /* user:pass */ - if (zoption = http_curl_getopt1(options, "proxyauth", IS_STRING)) { - curl_easy_setopt(ch, CURLOPT_PROXYUSERPWD, http_curl_copystr(Z_STRVAL_P(zoption))); + if (zoption = http_curl_getopt(options, "proxyauth", IS_STRING)) { + HTTP_CURL_OPT(PROXYUSERPWD, http_curl_copystr(Z_STRVAL_P(zoption))); } -#if LIBCURL_VERSION_NUM > 0x070a06 +#if LIBCURL_VERSION_NUM >= 0x070a07 /* auth method */ - if (zoption = http_curl_getopt1(options, "proxyauthtype", IS_LONG)) { - curl_easy_setopt(ch, CURLOPT_PROXYAUTH, Z_LVAL_P(zoption)); + if (zoption = http_curl_getopt(options, "proxyauthtype", IS_LONG)) { + HTTP_CURL_OPT(PROXYAUTH, Z_LVAL_P(zoption)); } #endif } + /* outgoing interface */ + if (zoption = http_curl_getopt(options, "interface", IS_STRING)) { + HTTP_CURL_OPT(INTERFACE, http_curl_copystr(Z_STRVAL_P(zoption))); + } + + /* another port */ + if (zoption = http_curl_getopt(options, "port", IS_LONG)) { + HTTP_CURL_OPT(PORT, Z_LVAL_P(zoption)); + } + /* auth */ - if (zoption = http_curl_getopt1(options, "httpauth", IS_STRING)) { - curl_easy_setopt(ch, CURLOPT_USERPWD, http_curl_copystr(Z_STRVAL_P(zoption))); + if (zoption = http_curl_getopt(options, "httpauth", IS_STRING)) { + HTTP_CURL_OPT(USERPWD, http_curl_copystr(Z_STRVAL_P(zoption))); } -#if LIBCURL_VERSION_NUM > 0x070a05 - if (zoption = http_curl_getopt1(options, "httpauthtype", IS_LONG)) { - curl_easy_setopt(ch, CURLOPT_HTTPAUTH, Z_LVAL_P(zoption)); +#if LIBCURL_VERSION_NUM >= 0x070a06 + if (zoption = http_curl_getopt(options, "httpauthtype", IS_LONG)) { + HTTP_CURL_OPT(HTTPAUTH, Z_LVAL_P(zoption)); } #endif - /* compress, enabled by default (empty string enables deflate and gzip) */ - if (zoption = http_curl_getopt2(options, "compress", IS_LONG, IS_BOOL)) { + /* compress, empty string enables deflate and gzip */ + if (zoption = http_curl_getopt(options, "compress", IS_BOOL)) { if (Z_LVAL_P(zoption)) { - curl_easy_setopt(ch, CURLOPT_ENCODING, ""); + HTTP_CURL_OPT(ENCODING, http_curl_copystr("")); } } - /* another port */ - if (zoption = http_curl_getopt1(options, "port", IS_LONG)) { - curl_easy_setopt(ch, CURLOPT_PORT, 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)); + } + } else { + HTTP_CURL_OPT(FOLLOWLOCATION, 0); } /* referer */ - if (zoption = http_curl_getopt1(options, "referer", IS_STRING)) { - curl_easy_setopt(ch, CURLOPT_REFERER, http_curl_copystr(Z_STRVAL_P(zoption))); + if (zoption = http_curl_getopt(options, "referer", IS_STRING)) { + HTTP_CURL_OPT(REFERER, http_curl_copystr(Z_STRVAL_P(zoption))); } /* useragent, default "PECL::HTTP/version (PHP/version)" */ - if (zoption = http_curl_getopt1(options, "useragent", IS_STRING)) { - curl_easy_setopt(ch, CURLOPT_USERAGENT, http_curl_copystr(Z_STRVAL_P(zoption))); + if (zoption = http_curl_getopt(options, "useragent", IS_STRING)) { + HTTP_CURL_OPT(USERAGENT, http_curl_copystr(Z_STRVAL_P(zoption))); } else { - curl_easy_setopt(ch, CURLOPT_USERAGENT, - "PECL::HTTP/" PHP_EXT_HTTP_VERSION " (PHP/" PHP_VERSION ")"); + HTTP_CURL_OPT(USERAGENT, + "PECL::HTTP/" HTTP_PEXT_VERSION " (PHP/" PHP_VERSION ")"); + } + + /* additional headers, array('name' => 'value') */ + if (zoption = http_curl_getopt(options, "headers", IS_ARRAY)) { + char *header_key; + long header_idx; + struct curl_slist *headers = NULL; + + FOREACH_KEY(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)) { + char header[1024] = {0}; + snprintf(header, 1023, "%s: %s", header_key, Z_STRVAL_PP(header_val)); + headers = curl_slist_append(headers, http_curl_copystr(header)); + } + + /* reset */ + header_key = NULL; + } + } + + if (headers) { + HTTP_CURL_OPT(HTTPHEADER, headers); + } } /* cookies, array('name' => 'value') */ - if (zoption = http_curl_getopt1(options, "cookies", IS_ARRAY)) { + if (zoption = http_curl_getopt(options, "cookies", IS_ARRAY)) { char *cookie_key = NULL; long cookie_idx = 0; - smart_str qstr = {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)) { - smart_str_appends(&qstr, cookie_key); - smart_str_appendl(&qstr, "=", 1); - smart_str_appendl(&qstr, Z_STRVAL_PP(cookie_val), Z_STRLEN_PP(cookie_val)); - smart_str_appendl(&qstr, "; ", 2); + phpstr_appendf(qstr, "%s=%s; ", cookie_key, Z_STRVAL_PP(cookie_val)); } - + /* reset */ cookie_key = NULL; } } - smart_str_0(&qstr); - if (qstr.c) { - curl_easy_setopt(ch, CURLOPT_COOKIE, http_curl_copystr(qstr.c)); - efree(qstr.c); + if (qstr->used) { + phpstr_fix(qstr); + HTTP_CURL_OPT(COOKIE, http_curl_copystr(qstr->data)); } + phpstr_free(qstr); } /* cookiestore */ - if (zoption = http_curl_getopt1(options, "cookiestore", IS_STRING)) { - curl_easy_setopt(ch, CURLOPT_COOKIEFILE, http_curl_copystr(Z_STRVAL_P(zoption))); - curl_easy_setopt(ch, CURLOPT_COOKIEJAR, http_curl_copystr(Z_STRVAL_P(zoption))); + if (zoption = http_curl_getopt(options, "cookiestore", IS_STRING)) { + HTTP_CURL_OPT(COOKIEFILE, http_curl_copystr(Z_STRVAL_P(zoption))); + HTTP_CURL_OPT(COOKIEJAR, http_curl_copystr(Z_STRVAL_P(zoption))); } - /* additional headers, array('name' => 'value') */ - if (zoption = http_curl_getopt1(options, "headers", IS_ARRAY)) { - char *header_key; - long header_idx; - struct curl_slist *headers = NULL; + /* resume */ + if (zoption = http_curl_getopt(options, "resume", IS_LONG)) { + range_req = 1; + HTTP_CURL_OPT(RESUME_FROM, Z_LVAL_P(zoption)); + } - FOREACH_KEY(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)) { - char header[1024] = {0}; - snprintf(header, 1023, "%s: %s", header_key, Z_STRVAL_PP(header_val)); - headers = curl_slist_append(headers, http_curl_copystr(header)); - } - - /* reset */ - header_key = NULL; + /* maxfilesize */ + if (zoption = http_curl_getopt(options, "maxfilesize", IS_LONG)) { + HTTP_CURL_OPT(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)); + } + + /* timeout */ + if (zoption = http_curl_getopt(options, "timeout", IS_LONG)) { + HTTP_CURL_OPT(TIMEOUT, Z_LVAL_P(zoption)); + } + + /* connecttimeout, defaults to 1 */ + if (zoption = http_curl_getopt(options, "connecttimeout", IS_LONG)) { + HTTP_CURL_OPT(CONNECTTIMEOUT, Z_LVAL_P(zoption)); + } else { + HTTP_CURL_OPT(CONNECTTIMEOUT, 1); + } + + /* ssl */ + if (zoption = http_curl_getopt(options, "ssl", IS_ARRAY)) { +#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_curl_copystr(Z_STRVAL_PP(param))); \ + 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_EX(keyname, optname) \ + if (!strcasecmp(key, #keyname)) { \ + convert_to_long_ex(param); \ + HTTP_CURL_OPT(optname, Z_LVAL_PP(param)); \ + key = NULL; \ + continue; \ + } + + long idx; + char *key = NULL; + zval **param; + + FOREACH_KEYVAL(zoption, key, idx, param) { + if (key) {fprintf(stderr, "%s\n", 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_SSL_STRING(KEY); + HTTP_CURL_OPT_SSL_STRING(KEYTYPE); + HTTP_CURL_OPT_SSL_STRING(KEYPASSWD); + + HTTP_CURL_OPT_SSL_STRING(ENGINE); + HTTP_CURL_OPT_SSL_LONG(VERSION); + + HTTP_CURL_OPT_SSL_LONG_(VERIFYPEER); + HTTP_CURL_OPT_SSL_LONG_(VERIFYHOST); + HTTP_CURL_OPT_SSL_STRING_(CIPHER_LIST); + + + 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); + + /* reset key */ + key = NULL; } } - - if (headers) { - curl_easy_setopt(ch, CURLOPT_HTTPHEADER, headers); - } + } else { + /* disable SSL verification by default */ + HTTP_CURL_OPT(SSL_VERIFYPEER, 0); + HTTP_CURL_OPT(SSL_VERIFYHOST, 0); } } /* }}} */ @@ -371,197 +481,161 @@ static inline void _http_curl_getinfo(CURL *ch, HashTable *info TSRMLS_DC) } \ } \ break; \ - } \ + } - /* CURLINFO_EFFECTIVE_URL = CURLINFO_STRING +1, */ HTTP_CURL_INFO(EFFECTIVE_URL); -#if LIBCURL_VERSION_NUM > 0x070a06 - /* CURLINFO_RESPONSE_CODE = CURLINFO_LONG +2, */ + +#if LIBCURL_VERSION_NUM >= 0x070a07 HTTP_CURL_INFO(RESPONSE_CODE); #else HTTP_CURL_INFO_EX(HTTP_CODE, RESPONSE_CODE); #endif - /* CURLINFO_TOTAL_TIME = CURLINFO_DOUBLE +3, */ + HTTP_CURL_INFO(HTTP_CONNECTCODE); + +#if LIBCURL_VERSION_NUM >= 0x070500 + HTTP_CURL_INFO(FILETIME); +#endif HTTP_CURL_INFO(TOTAL_TIME); - /* CURLINFO_NAMELOOKUP_TIME = CURLINFO_DOUBLE +4, */ HTTP_CURL_INFO(NAMELOOKUP_TIME); - /* CURLINFO_CONNECT_TIME = CURLINFO_DOUBLE +5, */ HTTP_CURL_INFO(CONNECT_TIME); - /* CURLINFO_PRETRANSFER_TIME = CURLINFO_DOUBLE +6, */ HTTP_CURL_INFO(PRETRANSFER_TIME); - /* CURLINFO_SIZE_UPLOAD = CURLINFO_DOUBLE +7, */ + 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); - /* CURLINFO_SIZE_DOWNLOAD = CURLINFO_DOUBLE +8, */ HTTP_CURL_INFO(SIZE_DOWNLOAD); - /* CURLINFO_SPEED_DOWNLOAD = CURLINFO_DOUBLE +9, */ HTTP_CURL_INFO(SPEED_DOWNLOAD); - /* CURLINFO_SPEED_UPLOAD = CURLINFO_DOUBLE +10, */ HTTP_CURL_INFO(SPEED_UPLOAD); - /* CURLINFO_HEADER_SIZE = CURLINFO_LONG +11, */ + HTTP_CURL_INFO(HEADER_SIZE); - /* CURLINFO_REQUEST_SIZE = CURLINFO_LONG +12, */ HTTP_CURL_INFO(REQUEST_SIZE); - /* CURLINFO_SSL_VERIFYRESULT = CURLINFO_LONG +13, */ + HTTP_CURL_INFO(SSL_VERIFYRESULT); - /* CURLINFO_FILETIME = CURLINFO_LONG +14, */ - HTTP_CURL_INFO(FILETIME); - /* CURLINFO_CONTENT_LENGTH_DOWNLOAD = CURLINFO_DOUBLE +15, */ +#if LIBCURL_VERSION_NUM >= 0x070c03 + /*HTTP_CURL_INFO(SSL_ENGINES); + todo: CURLINFO_SLIST */ +#endif + HTTP_CURL_INFO(CONTENT_LENGTH_DOWNLOAD); - /* CURLINFO_CONTENT_LENGTH_UPLOAD = CURLINFO_DOUBLE +16, */ HTTP_CURL_INFO(CONTENT_LENGTH_UPLOAD); - /* CURLINFO_STARTTRANSFER_TIME = CURLINFO_DOUBLE +17, */ - HTTP_CURL_INFO(STARTTRANSFER_TIME); - /* CURLINFO_CONTENT_TYPE = CURLINFO_STRING +18, */ HTTP_CURL_INFO(CONTENT_TYPE); - /* CURLINFO_REDIRECT_TIME = CURLINFO_DOUBLE +19, */ - HTTP_CURL_INFO(REDIRECT_TIME); - /* CURLINFO_REDIRECT_COUNT = CURLINFO_LONG +20, */ - HTTP_CURL_INFO(REDIRECT_COUNT); - /* CURLINFO_PRIVATE = CURLINFO_STRING +21, */ - HTTP_CURL_INFO(PRIVATE); - /* CURLINFO_HTTP_CONNECTCODE = CURLINFO_LONG +22, */ - HTTP_CURL_INFO(HTTP_CONNECTCODE); -#if LIBCURL_VERSION_NUM > 0x070a07 - /* CURLINFO_HTTPAUTH_AVAIL = CURLINFO_LONG +23, */ + +#if LIBCURL_VERSION_NUM >= 0x070a03 + /*HTTP_CURL_INFO(PRIVATE);*/ +#endif + +#if LIBCURL_VERSION_NUM >= 0x070a08 HTTP_CURL_INFO(HTTPAUTH_AVAIL); - /* CURLINFO_PROXYAUTH_AVAIL = CURLINFO_LONG +24, */ 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_get_ex(CURL *, char *, HashTable *, HashTable *, char **, size_t *) */ -PHP_HTTP_API STATUS _http_get_ex(CURL *ch, const char *URL, HashTable *options, - HashTable *info, char **data, size_t *data_len TSRMLS_DC) +/* {{{ STATUS http_get_ex(CURL *, char *, HashTable *, HashTable *, phpstr *) */ +PHP_HTTP_API STATUS _http_get_ex(CURL *ch, const char *URL, HashTable *options, HashTable *info, phpstr *response TSRMLS_DC) { zend_bool clean_curl = 0; - http_curl_startup(ch, clean_curl, URL, options); - curl_easy_setopt(ch, CURLOPT_NOBODY, 0); - curl_easy_setopt(ch, CURLOPT_POST, 0); - - if (CURLE_OK != curl_easy_perform(ch)) { - http_curl_cleanup(ch, clean_curl); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not perform request"); - return FAILURE; - } + http_curl_startup(ch, clean_curl, URL, options, response); + curl_easy_setopt(ch, CURLOPT_HTTPGET, 1); + http_curl_perform(ch, clean_curl, response); if (info) { http_curl_getinfo(ch, info); } - http_curl_copybuf(data, data_len); - http_curl_cleanup(ch, clean_curl); + http_curl_cleanup(ch, clean_curl, response); return SUCCESS; } -/* {{{ STATUS http_head_ex(CURL *, char *, HashTable *, HashTable *, char **data, size_t *) */ -PHP_HTTP_API STATUS _http_head_ex(CURL *ch, const char *URL, HashTable *options, - HashTable *info, char **data, size_t *data_len TSRMLS_DC) +/* {{{ STATUS http_head_ex(CURL *, char *, HashTable *, HashTable *, phpstr *) */ +PHP_HTTP_API STATUS _http_head_ex(CURL *ch, const char *URL, HashTable *options,HashTable *info, phpstr *response TSRMLS_DC) { zend_bool clean_curl = 0; - http_curl_startup(ch, clean_curl, URL, options); + http_curl_startup(ch, clean_curl, URL, options, response); curl_easy_setopt(ch, CURLOPT_NOBODY, 1); - curl_easy_setopt(ch, CURLOPT_POST, 0); - - if (CURLE_OK != curl_easy_perform(ch)) { - http_curl_cleanup(ch, clean_curl); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not perform request"); - return FAILURE; - } + http_curl_perform(ch, clean_curl, response); if (info) { http_curl_getinfo(ch, info); } - http_curl_copybuf(data, data_len); - http_curl_cleanup(ch, clean_curl); + http_curl_cleanup(ch, clean_curl, response); return SUCCESS; } -/* {{{ STATUS http_post_data_ex(CURL *, char *, char *, size_t, HashTable *, HashTable *, char **, size_t *) */ +/* {{{ STATUS http_post_data_ex(CURL *, char *, char *, size_t, HashTable *, HashTable *, phpstr *) */ PHP_HTTP_API STATUS _http_post_data_ex(CURL *ch, const char *URL, char *postdata, - size_t postdata_len, HashTable *options, HashTable *info, char **data, - size_t *data_len TSRMLS_DC) + size_t postdata_len, HashTable *options, HashTable *info, phpstr *response TSRMLS_DC) { zend_bool clean_curl = 0; - http_curl_startup(ch, clean_curl, URL, options); + http_curl_startup(ch, clean_curl, URL, options, response); curl_easy_setopt(ch, CURLOPT_POST, 1); curl_easy_setopt(ch, CURLOPT_POSTFIELDS, postdata); curl_easy_setopt(ch, CURLOPT_POSTFIELDSIZE, postdata_len); - - if (CURLE_OK != curl_easy_perform(ch)) { - http_curl_cleanup(ch, clean_curl); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not perform request"); - return FAILURE; - } + http_curl_perform(ch, clean_curl, response); if (info) { http_curl_getinfo(ch, info); } - http_curl_copybuf(data, data_len); - http_curl_cleanup(ch, clean_curl); + http_curl_cleanup(ch, clean_curl, response); return SUCCESS; } /* }}} */ -/* {{{ STATUS http_post_array_ex(CURL *, char *, HashTable *, HashTable *, HashTable *, char **, size_t *) */ +/* {{{ STATUS http_post_array_ex(CURL *, char *, HashTable *, HashTable *, HashTable *, phpstr *) */ PHP_HTTP_API STATUS _http_post_array_ex(CURL *ch, const char *URL, HashTable *postarray, - HashTable *options, HashTable *info, char **data, size_t *data_len TSRMLS_DC) + HashTable *options, HashTable *info, phpstr *response TSRMLS_DC) { - smart_str qstr = {0}; STATUS status; + char *encoded; + size_t encoded_len; - HTTP_URL_ARGSEP_OVERRIDE; - if (php_url_encode_hash_ex(postarray, &qstr, NULL,0,NULL,0,NULL,0,NULL TSRMLS_CC) != SUCCESS) { - if (qstr.c) { - efree(qstr.c); - } - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not encode post data"); - HTTP_URL_ARGSEP_RESTORE; + if (SUCCESS != http_urlencode_hash_ex(postarray, 1, NULL, 0, &encoded, &encoded_len)) { + http_error(E_WARNING, HTTP_E_ENCODE, "Could not encode post data"); return FAILURE; } - smart_str_0(&qstr); - HTTP_URL_ARGSEP_RESTORE; - status = http_post_data_ex(ch, URL, qstr.c, qstr.len, options, info, data, data_len); + status = http_post_data_ex(ch, URL, encoded, encoded_len, options, info, response); + efree(encoded); - if (qstr.c) { - efree(qstr.c); - } return status; } /* }}} */ -/* {{{ STATUS http_post_curldata_ex(CURL *, char *, curl_httppost *, HashTable *, HashTable *, char **, size_t *) */ -PHP_HTTP_API STATUS _http_post_curldata_ex(CURL *ch, const char *URL, - struct curl_httppost *curldata, HashTable *options, HashTable *info, - char **data, size_t *data_len TSRMLS_DC) +/* {{{ STATUS http_post_curldata_ex(CURL *, char *, curl_httppost *, HashTable *, HashTable *, phpstr *) */ +PHP_HTTP_API STATUS _http_post_curldata_ex(CURL *ch, const char *URL, struct curl_httppost *curldata, + HashTable *options, HashTable *info, phpstr *response TSRMLS_DC) { zend_bool clean_curl = 0; - http_curl_startup(ch, clean_curl, URL, options); + http_curl_startup(ch, clean_curl, URL, options, response); curl_easy_setopt(ch, CURLOPT_POST, 1); curl_easy_setopt(ch, CURLOPT_HTTPPOST, curldata); - - if (CURLE_OK != curl_easy_perform(ch)) { - http_curl_cleanup(ch, clean_curl); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not perform request"); - return FAILURE; - } + http_curl_perform(ch, clean_curl, response); if (info) { http_curl_getinfo(ch, info); } - http_curl_copybuf(data, data_len); - http_curl_cleanup(ch, clean_curl); + http_curl_cleanup(ch, clean_curl, response); return SUCCESS; } @@ -575,4 +649,3 @@ PHP_HTTP_API STATUS _http_post_curldata_ex(CURL *ch, const char *URL, * vim600: noet sw=4 ts=4 fdm=marker * vim<600: noet sw=4 ts=4 */ -