diff options
author | Alessandro Ghedini <alessandro@ghedini.me> | 2017-01-13 22:28:41 +0000 |
---|---|---|
committer | Alessandro Ghedini <alessandro@ghedini.me> | 2017-01-14 12:50:51 +0000 |
commit | 1ad1a0d1861699a95d4edb78571470669cc7b2b5 (patch) | |
tree | ee66704630ced0e3d9c12e1cfa4cb09078738946 /lib | |
parent | e3b911463aacb1ccee41671705c5cdcbd9f82c14 (diff) |
http: print correct HTTP string in verbose output when using HTTP/2
Before:
```
% src/curl https://sigsegv.ninja/ -v --http2
...
> GET / HTTP/1.1
> Host: sigsegv.ninja
> User-Agent: curl/7.52.2-DEV
> Accept: */*
>
...
```
After:
```
% src/curl https://sigsegv.ninja/ -v --http2
...
> GET / HTTP/2
> Host: sigsegv.ninja
> User-Agent: curl/7.52.2-DEV
> Accept: */*
>
```
Diffstat (limited to 'lib')
-rw-r--r-- | lib/http.c | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/lib/http.c b/lib/http.c index dfa26a80e..fdaecafdc 100644 --- a/lib/http.c +++ b/lib/http.c @@ -1509,6 +1509,20 @@ static bool use_http_1_1plus(const struct Curl_easy *data, (data->set.httpversion >= CURL_HTTP_VERSION_1_1)); } +static const char *get_http_string(const struct Curl_easy *data, + const struct connectdata *conn) +{ +#ifdef USE_NGHTTP2 + if(conn->proto.httpc.h2) + return "2"; +#endif + + if(use_http_1_1plus(data, conn)) + return "1.1"; + + return "1.0"; +} + /* check and possibly add an Expect: header */ static CURLcode expect100(struct Curl_easy *data, struct connectdata *conn, @@ -2223,9 +2237,7 @@ CURLcode Curl_http(struct connectdata *conn, bool *done) } } - /* Use 1.1 unless the user specifically asked for 1.0 or the server only - supports 1.0 */ - httpstring= use_http_1_1plus(data, conn)?"1.1":"1.0"; + httpstring = get_http_string(data, conn); /* initialize a dynamic send-buffer */ req_buffer = Curl_add_buffer_init(); |