X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http_request_api.c;h=3fa73e217e6c6ebe9d651ab3ee3eded5981399a1;hb=1052c4986a794b051dc48ba4118dbd6fd8f83c49;hp=0432582a638564f9f9f2195afca7c62095bd729b;hpb=b107c0deef9ce2be051c360e3992ab10b4c17d1c;p=m6w6%2Fext-http diff --git a/http_request_api.c b/http_request_api.c index 0432582..3fa73e2 100644 --- a/http_request_api.c +++ b/http_request_api.c @@ -244,10 +244,15 @@ PHP_MSHUTDOWN_FUNCTION(http_request) #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(keyname, obdc) HTTP_CURL_OPT_STRING_EX(keyname, keyname, obdc) + +#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 (!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); \ } \ @@ -255,10 +260,14 @@ PHP_MSHUTDOWN_FUNCTION(http_request) key = NULL; \ continue; \ } -#define HTTP_CURL_OPT_LONG(keyname) HTTP_CURL_OPT_LONG_EX(keyname, 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)) { \ - zval *copy = http_request_option_cache(request, #keyname, zval_copy(IS_LONG, *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; \ @@ -569,6 +578,12 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti } } + /* 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)); + } + /* additional headers, array('name' => 'value') */ if (request->_cache.headers) { curl_slist_free_all(request->_cache.headers); @@ -587,7 +602,10 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti ZVAL_ADDREF(*header_val); convert_to_string_ex(header_val); - snprintf(header, 1023, "%s: %s", header_key, Z_STRVAL_PP(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); } @@ -597,18 +615,72 @@ 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"); } 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); + } + } + /* cookies, array('name' => 'value') */ if ((zoption = http_request_option(request, options, "cookies", IS_ARRAY))) { phpstr_dtor(&request->_cache.cookies); if (zend_hash_num_elements(Z_ARRVAL_P(zoption))) { - if (SUCCESS == http_urlencode_hash_recursive(HASH_OF(zoption), &request->_cache.cookies, "; ", sizeof("; ")-1, NULL, 0)) { + 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; + zval *cookie_val = NULL; + 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); - HTTP_CURL_OPT(CURLOPT_COOKIE, request->_cache.cookies.data); + if (PHPSTR_LEN(&request->_cache.cookies)) { + HTTP_CURL_OPT(CURLOPT_COOKIE, PHPSTR_VAL(&request->_cache.cookies)); + } } } } @@ -638,12 +710,6 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti HTTP_CURL_OPT(CURLOPT_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(CURLOPT_RESUME_FROM, Z_LVAL_P(zoption)); - } - /* maxfilesize */ if ((zoption = http_request_option(request, options, "maxfilesize", IS_LONG))) { HTTP_CURL_OPT(CURLOPT_MAXFILESIZE, Z_LVAL_P(zoption)); @@ -654,26 +720,12 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti HTTP_CURL_OPT(CURLOPT_HTTP_VERSION, 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(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); - } - } - /* 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 */ + /* connecttimeout, defaults to 0 */ if ((zoption = http_request_option(request, options, "connecttimeout", IS_LONG))) { HTTP_CURL_OPT(CURLOPT_CONNECTTIMEOUT, Z_LVAL_P(zoption)); } @@ -687,25 +739,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_STRING(CURLOPT_SSLCERT, 1); - HTTP_CURL_OPT_STRING(CURLOPT_SSLCERTTYPE, 0); - HTTP_CURL_OPT_STRING(CURLOPT_SSLCERTPASSWD, 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_STRING(CURLOPT_SSLKEY, 0); - HTTP_CURL_OPT_STRING(CURLOPT_SSLKEYTYPE, 0); - HTTP_CURL_OPT_STRING(CURLOPT_SSLKEYPASSWD, 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_STRING(CURLOPT_SSLENGINE, 0); - HTTP_CURL_OPT_LONG(CURLOPT_SSLVERSION); + HTTP_CURL_OPT_STRING(CURLOPT_SSLENGINE, 0, 0); + HTTP_CURL_OPT_LONG(CURLOPT_SSLVERSION, 0); - HTTP_CURL_OPT_LONG(CURLOPT_SSL_VERIFYPEER); - HTTP_CURL_OPT_LONG(CURLOPT_SSL_VERIFYHOST); - HTTP_CURL_OPT_STRING(CURLOPT_SSL_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(CURLOPT_CAINFO, 1); - HTTP_CURL_OPT_STRING(CURLOPT_CAPATH, 1); - HTTP_CURL_OPT_STRING(CURLOPT_RANDOM_FILE, 1); - HTTP_CURL_OPT_STRING(CURLOPT_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; @@ -819,7 +871,7 @@ PHP_HTTP_API void _http_request_info(http_request *request, HashTable *info) HTTP_CURL_INFO(CURLINFO_CONTENT_TYPE); HTTP_CURL_INFO(CURLINFO_HTTPAUTH_AVAIL); HTTP_CURL_INFO(CURLINFO_PROXYAUTH_AVAIL); - /*HTTP_CURL_INFO(OS_ERRNO);*/ + HTTP_CURL_INFO(CURLINFO_OS_ERRNO); HTTP_CURL_INFO(CURLINFO_NUM_CONNECTS); #if LIBCURL_VERSION_NUM >= 0x070e01 HTTP_CURL_INFO_EX(CURLINFO_COOKIELIST, "cookies");