aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2013-09-07 11:03:23 +0200
committerDaniel Stenberg <daniel@haxx.se>2013-09-07 11:28:12 +0200
commit13dbb41c4991bdd87768e0d3b6d3398cb1869676 (patch)
tree06570305ca58f988315066cfef4c2cf78c322e16 /lib
parente5c2354fd537968f034b35532d53b42c6cdf5169 (diff)
http2: first embryo toward Upgrade:
Diffstat (limited to 'lib')
-rw-r--r--lib/http.c10
-rw-r--r--lib/http2.c19
-rw-r--r--lib/http2.h10
3 files changed, 39 insertions, 0 deletions
diff --git a/lib/http.c b/lib/http.c
index c95616bdd..3b18c6311 100644
--- a/lib/http.c
+++ b/lib/http.c
@@ -75,6 +75,7 @@
#include "non-ascii.h"
#include "bundles.h"
#include "pipeline.h"
+#include "http2.h"
#define _MPRINTF_REPLACE /* use our functions only */
#include <curl/mprintf.h>
@@ -2179,6 +2180,15 @@ CURLcode Curl_http(struct connectdata *conn, bool *done)
if(result)
return result;
+ 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
+ over SSL */
+ result = Curl_http2_request(req_buffer, conn);
+ if(result)
+ return result;
+ }
+
#if !defined(CURL_DISABLE_COOKIES)
if(data->cookies || addcookies) {
struct Cookie *co=NULL; /* no cookies from start */
diff --git a/lib/http2.c b/lib/http2.c
index 21be17ba7..1b4300aa9 100644
--- a/lib/http2.c
+++ b/lib/http2.c
@@ -27,7 +27,9 @@
#include <curl/mprintf.h>
#include <nghttp2/nghttp2.h>
+#include "urldata.h"
#include "http2.h"
+#include "http.h"
/*
* Store nghttp2 version info in this buffer, Prefix with a space. Return
@@ -39,4 +41,21 @@ int Curl_http2_ver(char *p, size_t len)
return snprintf(p, len, " nghttp2/%s", h2->version_str);
}
+/*
+ * Append headers to ask for a HTTP1.1 to HTTP2 upgrade.
+ */
+CURLcode Curl_http2_request(Curl_send_buffer *req,
+ struct connectdata *conn)
+{
+ const char *base64="AABBCC"; /* a fake string to start with */
+ CURLcode result =
+ Curl_add_bufferf(req,
+ "Connection: Upgrade, HTTP2-Settings\r\n"
+ "Upgrade: HTTP/2.0\r\n"
+ "HTTP2-Settings: %s\r\n",
+ base64);
+ (void)conn;
+ return result;
+}
+
#endif
diff --git a/lib/http2.h b/lib/http2.h
index 4ad06c26d..09b91d112 100644
--- a/lib/http2.h
+++ b/lib/http2.h
@@ -22,11 +22,21 @@
*
***************************************************************************/
+#include "curl_setup.h"
+
+#ifdef USE_NGHTTP2
+#include "http.h"
/*
* Store nghttp2 version info in this buffer, Prefix with a space. Return
* total length written.
*/
int Curl_http2_ver(char *p, size_t len);
+CURLcode Curl_http2_request(Curl_send_buffer *req,
+ struct connectdata *conn);
+#else /* USE_NGHTTP2 */
+#define Curl_http2_request(x,y) CURLE_OK
+#endif
+
#endif /* HEADER_CURL_HTTP2_H */