generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

curl: add --http1.1 and --http2.0 options

Browse Source
This commit is contained in:
Daniel Stenberg 2013-09-04 22:28:16 +02:00
parent d707a975f6
commit 2eabb7d590
4 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
RELEASE-NOTES
View File

@ -1,7 +1,7 @@
Curl and libcurl 7.33.0 Curl and libcurl 7.33.0
Public curl releases: 135 Public curl releases: 135
Command line options: 153 Command line options: 155
curl_easy_setopt() options: 201 curl_easy_setopt() options: 201
Public functions in libcurl: 58 Public functions in libcurl: 58
Known libcurl bindings: 42 Known libcurl bindings: 42

10
docs/curl.1
View File

@ -113,8 +113,14 @@ same command line option.)
Make curl display progress as a simple progress bar instead of the standard, Make curl display progress as a simple progress bar instead of the standard,
more informational, meter. more informational, meter.
.IP "-0, --http1.0" .IP "-0, --http1.0"
(HTTP) Forces curl to issue its requests using HTTP 1.0 instead of using its (HTTP) Tells curl to use HTTP version 1.0 instead of using its internally
internally preferred: HTTP 1.1. preferred: HTTP 1.1.
.IP "--http1.1"
(HTTP) Tells curl to use HTTP version 1.1. This is the internal default
version. (Added in 7.33.0)
.IP "--http2.0"
(HTTP) Tells curl to issue its requests using HTTP 2.0. This requires that the
underlying libcurl was built to support it. (Added in 7.33.0)
.IP "-1, --tlsv1" .IP "-1, --tlsv1"
(SSL) (SSL)
Forces curl to use TLS version 1 when negotiating with a remote TLS server. Forces curl to use TLS version 1 when negotiating with a remote TLS server.

22
src/tool_getparam.c
View File

@ -176,7 +176,9 @@ static const struct LongShort aliases[]= {
{"$J", "metalink", FALSE}, {"$J", "metalink", FALSE},
{"$K", "sasl-ir", FALSE}, {"$K", "sasl-ir", FALSE},
{"$L", "test-event", FALSE}, {"$L", "test-event", FALSE},
{"0", "http1.0", FALSE}, {"00", "http1.0", FALSE},
{"01", "http1.1", FALSE},
{"02", "http2.0", FALSE},
{"1", "tlsv1", FALSE}, {"1", "tlsv1", FALSE},
{"2", "sslv2", FALSE}, {"2", "sslv2", FALSE},
{"3", "sslv3", FALSE}, {"3", "sslv3", FALSE},
@ -985,9 +987,21 @@ ParameterError getparameter(char *flag, /* f or -long-flag */
case '~': /* --xattr */ case '~': /* --xattr */
config->xattr = toggle; config->xattr = toggle;
break; break;
case '0': case '0': /* --http* options */
/* HTTP version 1.0 */ switch(subletter) {
config->httpversion = CURL_HTTP_VERSION_1_0; case '0':
/* HTTP version 1.0 */
config->httpversion = CURL_HTTP_VERSION_1_0;
break;
case '1':
/* HTTP version 1.1 */
config->httpversion = CURL_HTTP_VERSION_1_1;
break;
case '2':
/* HTTP version 2.0 */
config->httpversion = CURL_HTTP_VERSION_2_0;
break;
}
break; break;
case '1': case '1':
/* TLS version 1 */ /* TLS version 1 */

2
src/tool_help.c
View File

@ -100,6 +100,8 @@ static const char *const helptext[] = {
" --hostpubmd5 MD5 " " --hostpubmd5 MD5 "
"Hex encoded MD5 string of the host public key. (SSH)", "Hex encoded MD5 string of the host public key. (SSH)",
" -0, --http1.0 Use HTTP 1.0 (H)", " -0, --http1.0 Use HTTP 1.0 (H)",
" --http1.1 Use HTTP 1.1 (H)",
" --http2.0 Use HTTP 2.0 (H)",
" --ignore-content-length Ignore the HTTP Content-Length header", " --ignore-content-length Ignore the HTTP Content-Length header",
" -i, --include Include protocol headers in the output (H/F)", " -i, --include Include protocol headers in the output (H/F)",
" -k, --insecure Allow connections to SSL sites without certs (H)", " -k, --insecure Allow connections to SSL sites without certs (H)",