aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2014-01-30 11:32:04 +0100
committerDaniel Stenberg <daniel@haxx.se>2014-01-30 11:33:37 +0100
commit8e778887b54c059dc32e297caac7e49dfe2801cc (patch)
tree477aeb46be132ae3b5d5a5b5510061b4ae1a7a3c
parent99b4ff8b6f6681ef1f5c2a0ccab49b95aa15b75c (diff)
http2: s/Curl_http2_request/Curl_http2_request_upgrade
To better reflect its purpose
-rw-r--r--lib/http.c4
-rw-r--r--lib/http2.c4
-rw-r--r--lib/http2.h10
3 files changed, 10 insertions, 8 deletions
diff --git a/lib/http.c b/lib/http.c
index 8df0105a1..fe602b9de 100644
--- a/lib/http.c
+++ b/lib/http.c
@@ -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;
}
diff --git a/lib/http2.c b/lib/http2.c
index c3ed3c6cd..8cb49b77e 100644
--- a/lib/http2.c
+++ b/lib/http2.c
@@ -288,8 +288,8 @@ static nghttp2_settings_entry settings[] = {
/*
* Append headers to ask for a HTTP1.1 to HTTP2 upgrade.
*/
-CURLcode Curl_http2_request(Curl_send_buffer *req,
- struct connectdata *conn)
+CURLcode Curl_http2_request_upgrade(Curl_send_buffer *req,
+ struct connectdata *conn)
{
uint8_t binsettings[80];
CURLcode result;
diff --git a/lib/http2.h b/lib/http2.h
index ffe16820e..596771acd 100644
--- a/lib/http2.h
+++ b/lib/http2.h
@@ -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,
- struct connectdata *conn);
+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