Commit 8e778887 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

http2: s/Curl_http2_request/Curl_http2_request_upgrade 

To better reflect its purpose
parent 99b4ff8b

lib/http.c

+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms
@@ -2176,7 +2176,7 @@ CURLcode Curl_http(struct connectdata *conn, bool *done) 
     (data->set.httpversion == CURL_HTTP_VERSION_2_0)) {

    /* append HTTP2 updrade magic stuff to the HTTP request if it isn't done

       over SSL */

    result = Curl_http2_request(req_buffer, conn);

    result = Curl_http2_request_upgrade(req_buffer, conn);

    if(result)

      return result;

  }

lib/http2.c

+2 −2
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ static nghttp2_settings_entry settings[] = { 
/*

 * Append headers to ask for a HTTP1.1 to HTTP2 upgrade.

 */

CURLcode Curl_http2_request(Curl_send_buffer *req,

CURLcode Curl_http2_request_upgrade(Curl_send_buffer *req,

                                    struct connectdata *conn)

{

  uint8_t binsettings[80];

lib/http2.h

+6 −4
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms
@@ -32,11 +32,13 @@ 
 */

int Curl_http2_ver(char *p, size_t len);



CURLcode Curl_http2_request(Curl_send_buffer *req,

CURLcode Curl_http2_init(struct connectdata *conn);

CURLcode Curl_http2_send_request(struct connectdata *conn);

CURLcode Curl_http2_request_upgrade(Curl_send_buffer *req,

                                    struct connectdata *conn);

void Curl_http2_switched(struct connectdata *conn);

#else /* USE_NGHTTP2 */

#define Curl_http2_request(x,y) CURLE_OK

#define Curl_http2_request_upgrade(x,y) CURLE_OK

#define Curl_http2_switched(x)

#endif