moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00
Code Issues Releases Wiki Activity

http2: s/Curl_http2_request/Curl_http2_request_upgrade

Browse Source 
To better reflect its purpose
This commit is contained in:
Daniel Stenberg 2014-01-30 11:32:04 +01:00
parent 99b4ff8b6f
commit 8e778887b5
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/http.c
View File

@ -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 * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * 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)) { (data->set.httpversion == CURL_HTTP_VERSION_2_0)) {
/* append HTTP2 updrade magic stuff to the HTTP request if it isn't done /* append HTTP2 updrade magic stuff to the HTTP request if it isn't done
over SSL */ over SSL */
result = Curl_http2_request(req_buffer, conn); result = Curl_http2_request_upgrade(req_buffer, conn);
if(result) if(result)
return result; return result;
} }

4
lib/http2.c
View File

@ -288,8 +288,8 @@ static nghttp2_settings_entry settings[] = {
/* /*
* Append headers to ask for a HTTP1.1 to HTTP2 upgrade. * 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) struct connectdata *conn)
{ {
uint8_t binsettings[80]; uint8_t binsettings[80];
CURLcode result; CURLcode result;

10
lib/http2.h
View File

@ -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 * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -32,11 +32,13 @@
*/ */
int Curl_http2_ver(char *p, size_t len); int Curl_http2_ver(char *p, size_t len);
CURLcode Curl_http2_request(Curl_send_buffer *req, CURLcode Curl_http2_init(struct connectdata *conn);
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); void Curl_http2_switched(struct connectdata *conn);
#else /* USE_NGHTTP2 */ #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) #define Curl_http2_switched(x)
#endif #endif