X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_curl_api.c;h=b576b2f473dee05d5841e4c379295655d5e8a8bd;hp=371f39fb3b0832bd7ddd1b537f48222a37d31d9a;hb=2253ca28b6a5699a8e2d62a0458ced3cb7a3107a;hpb=71904cb99d728c43ebebb10b695fbb9ac580e66f diff --git a/http_curl_api.c b/http_curl_api.c index 371f39f..b576b2f 100644 --- a/http_curl_api.c +++ b/http_curl_api.c @@ -25,19 +25,16 @@ #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" - -#ifdef ZEND_ENGINE_2 -# include "ext/standard/php_http.h" -#endif - -#include "phpstr/phpstr.h" +#include "php_http_url_api.h" -ZEND_DECLARE_MODULE_GLOBALS(http) +ZEND_EXTERN_MODULE_GLOBALS(http) #if LIBCURL_VERSION_NUM >= 0x070c01 # define http_curl_reset(ch) curl_easy_reset(ch) @@ -46,7 +43,10 @@ ZEND_DECLARE_MODULE_GLOBALS(http) #endif #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) \ @@ -72,7 +72,7 @@ ZEND_DECLARE_MODULE_GLOBALS(http) } #define http_curl_cleanup(ch, clean_curl) \ - phpstr_free(&HTTP_G(curlbuf)); \ + phpstr_dtor(&HTTP_G(curlbuf)); \ zend_llist_clean(&HTTP_G(to_free)); \ if (clean_curl) { \ curl_easy_cleanup(ch); \ @@ -112,7 +112,6 @@ static inline char *_http_curl_copystr(const char *str TSRMLS_DC) static size_t http_curl_body_callback(char *buf, size_t len, size_t n, void *s) { TSRMLS_FETCH(); - phpstr_append(&HTTP_G(curlbuf), buf, len *= n); return len; } @@ -127,7 +126,6 @@ static size_t http_curl_hdrs_callback(char *buf, size_t len, size_t n, void *s) if (HTTP_G(curlbuf).used && (!strncmp(buf, "HTTP/1.", sizeof("HTTP/1.") - 1))) { phpstr_free(&HTTP_G(curlbuf)); } - phpstr_append(&HTTP_G(curlbuf), buf, len *= n); return len; } @@ -165,16 +163,21 @@ static void _http_curl_setopts(CURL *ch, const char *url, HashTable *options TSR 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_FILETIME, 1); - 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); + 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_body_callback); + HTTP_CURL_OPT(HEADERFUNCTION, http_curl_hdrs_callback); #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))) { @@ -183,71 +186,71 @@ static void _http_curl_setopts(CURL *ch, const char *url, HashTable *options TSR /* proxy */ if (zoption = http_curl_getopt1(options, "proxyhost", IS_STRING)) { - curl_easy_setopt(ch, CURLOPT_PROXY, http_curl_copystr(Z_STRVAL_P(zoption))); + 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)); + 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))); + HTTP_CURL_OPT(PROXYUSERPWD, http_curl_copystr(Z_STRVAL_P(zoption))); } #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)); + HTTP_CURL_OPT(PROXYAUTH, Z_LVAL_P(zoption)); } #endif } /* outgoing interface */ if (zoption = http_curl_getopt1(options, "interface", IS_STRING)) { - curl_easy_setopt(ch, CURLOPT_INTERFACE, http_curl_copystr(Z_STRVAL_P(zoption))); + HTTP_CURL_OPT(INTERFACE, http_curl_copystr(Z_STRVAL_P(zoption))); } /* another port */ if (zoption = http_curl_getopt1(options, "port", IS_LONG)) { - curl_easy_setopt(ch, CURLOPT_PORT, Z_LVAL_P(zoption)); + 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))); + HTTP_CURL_OPT(USERPWD, http_curl_copystr(Z_STRVAL_P(zoption))); } #if LIBCURL_VERSION_NUM >= 0x070a06 if (zoption = http_curl_getopt1(options, "httpauthtype", IS_LONG)) { - curl_easy_setopt(ch, CURLOPT_HTTPAUTH, Z_LVAL_P(zoption)); + HTTP_CURL_OPT(HTTPAUTH, Z_LVAL_P(zoption)); } #endif /* compress, empty string enables deflate and gzip */ if (zoption = http_curl_getopt2(options, "compress", IS_LONG, IS_BOOL)) { if (Z_LVAL_P(zoption)) { - curl_easy_setopt(ch, CURLOPT_ENCODING, ""); + HTTP_CURL_OPT(ENCODING, ""); } } /* 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)); + HTTP_CURL_OPT(FOLLOWLOCATION, Z_LVAL_P(zoption) ? 1 : 0); + HTTP_CURL_OPT(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)); + HTTP_CURL_OPT(UNRESTRICTED_AUTH, Z_LVAL_P(zoption)); } } else { - curl_easy_setopt(ch, CURLOPT_FOLLOWLOCATION, 0); + 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))); + 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))); + HTTP_CURL_OPT(USERAGENT, http_curl_copystr(Z_STRVAL_P(zoption))); } else { - curl_easy_setopt(ch, CURLOPT_USERAGENT, + HTTP_CURL_OPT(USERAGENT, "PECL::HTTP/" HTTP_PEXT_VERSION " (PHP/" PHP_VERSION ")"); } @@ -272,7 +275,7 @@ static void _http_curl_setopts(CURL *ch, const char *url, HashTable *options TSR } if (headers) { - curl_easy_setopt(ch, CURLOPT_HTTPHEADER, headers); + HTTP_CURL_OPT(HTTPHEADER, headers); } } @@ -296,42 +299,102 @@ static void _http_curl_setopts(CURL *ch, const char *url, HashTable *options TSR if (qstr->used) { phpstr_fix(qstr); - curl_easy_setopt(ch, CURLOPT_COOKIE, http_curl_copystr(qstr->data)); + HTTP_CURL_OPT(COOKIE, http_curl_copystr(qstr->data)); } - phpstr_dtor(qstr); + 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))); + HTTP_CURL_OPT(COOKIEFILE, http_curl_copystr(Z_STRVAL_P(zoption))); + HTTP_CURL_OPT(COOKIEJAR, http_curl_copystr(Z_STRVAL_P(zoption))); } /* resume */ if (zoption = http_curl_getopt1(options, "resume", IS_LONG)) { range_req = 1; - curl_easy_setopt(ch, CURLOPT_RESUME_FROM, Z_LVAL_P(zoption)); + HTTP_CURL_OPT(RESUME_FROM, Z_LVAL_P(zoption)); } /* maxfilesize */ if (zoption = http_curl_getopt1(options, "maxfilesize", IS_LONG)) { - curl_easy_setopt(ch, CURLOPT_MAXFILESIZE, Z_LVAL_P(zoption)); + HTTP_CURL_OPT(MAXFILESIZE, Z_LVAL_P(zoption)); } /* lastmodified */ if (zoption = http_curl_getopt1(options, "lastmodified", IS_LONG)) { - curl_easy_setopt(ch, CURLOPT_TIMECONDITION, range_req ? CURL_TIMECOND_IFUNMODSINCE : CURL_TIMECOND_IFMODSINCE); - curl_easy_setopt(ch, CURLOPT_TIMEVALUE, Z_LVAL_P(zoption)); + 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_getopt1(options, "timeout", IS_LONG)) { - curl_easy_setopt(ch, CURLOPT_TIMEOUT, Z_LVAL_P(zoption)); + HTTP_CURL_OPT(TIMEOUT, Z_LVAL_P(zoption)); } /* connecttimeout */ if (zoption = http_curl_getopt1(options, "connecttimeout", IS_LONG)) { - curl_easy_setopt(ch, CURLOPT_CONNECTTIMEOUT, Z_LVAL_P(zoption)); + HTTP_CURL_OPT(CONNECTTIMEOUT, Z_LVAL_P(zoption)); + } + + /* ssl */ + if (zoption = http_curl_getopt1(options, "ssl", IS_ARRAY)) { + long idx; + char *key = NULL; + zval **param; + +#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, 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; \ + } + + FOREACH_KEYVAL(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_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; + } + } } } /* }}} */ @@ -512,7 +575,7 @@ PHP_HTTP_API STATUS _http_post_array_ex(CURL *ch, const char *URL, HashTable *po status = http_post_data_ex(ch, URL, encoded, encoded_len, options, info, data, data_len); efree(encoded); - + return status; } /* }}} */ @@ -548,4 +611,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 */ -