Commit 740ebcd8 authored by Dan Fandrich's avatar Dan Fandrich
Browse files

https: Fix build when http2 is disabled

parent c06e76f6

lib/http.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

lib/http2.h

+5 −5
Original line number Diff line number Diff line
@@ -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 */