diff options
| author | Dan Fandrich <dan@coneharvesters.com> | 2014-06-15 12:24:47 +0200 |
|---|---|---|
| committer | Dan Fandrich <dan@coneharvesters.com> | 2014-06-15 12:24:47 +0200 |
| commit | 740ebcd86ee06085dfb8a39c2792f87e641255f6 (patch) | |
| tree | 17f4cbb6a5d0a92e62c985f60d6ebda6837c5a59 | |
| parent | c06e76f6fe0da2c9d06f15b6a57af78155c43149 (diff) | |
| download | curl-740ebcd86ee06085dfb8a39c2792f87e641255f6.tar.gz | |
https: Fix build when http2 is disabled
| -rw-r--r-- | lib/http.c | 2 | ||||
| -rw-r--r-- | lib/http2.h | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/http.c b/lib/http.c index 3cf7346d8..78791ee1a 100644 --- a/lib/http.c +++ b/lib/http.c @@ -2285,7 +2285,7 @@ CURLcode Curl_http(struct connectdata *conn, bool *done) if(!(conn->handler->flags&PROTOPT_SSL) && (data->set.httpversion == CURL_HTTP_VERSION_2_0)) { - /* append HTTP2 updrade magic stuff to the HTTP request if it isn't done + /* append HTTP2 upgrade magic stuff to the HTTP request if it isn't done over SSL */ result = Curl_http2_request_upgrade(req_buffer, conn); if(result) diff --git a/lib/http2.h b/lib/http2.h index 30a8b591b..5c0ce8e80 100644 --- a/lib/http2.h +++ b/lib/http2.h @@ -39,11 +39,11 @@ CURLcode Curl_http2_request_upgrade(Curl_send_buffer *req, CURLcode Curl_http2_setup(struct connectdata *conn); int Curl_http2_switched(struct connectdata *conn); #else /* USE_NGHTTP2 */ -#define Curl_http2_init(x) -#define Curl_http2_send_request(x) -#define Curl_http2_request_upgrade(x,y) CURLE_OK -#define Curl_http2_switched(x) -#define Curl_http2_setup(x) Curl_nop_stmt +#define Curl_http2_init(x) CURLE_UNSUPPORTED_PROTOCOL +#define Curl_http2_send_request(x) CURLE_UNSUPPORTED_PROTOCOL +#define Curl_http2_request_upgrade(x,y) CURLE_UNSUPPORTED_PROTOCOL +#define Curl_http2_setup(x) CURLE_UNSUPPORTED_PROTOCOL +#define Curl_http2_switched(x) (-1) #endif #endif /* HEADER_CURL_HTTP2_H */ |