diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2014-08-07 23:09:25 +0900 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2014-08-07 16:54:17 +0200 |
| commit | 7ceada43affff8b971fa6be0acdd08eefb8ba991 (patch) | |
| tree | ce2969338c03035aa4e82a602110c6a8a73d4c86 /lib/http2.c | |
| parent | 26393a97b28a1c5785d482dd9383f800755ad533 (diff) | |
HTTP/2: Move :authority before non-pseudo header fields
Diffstat (limited to 'lib/http2.c')
| -rw-r--r-- | lib/http2.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/lib/http2.c b/lib/http2.c index fa2fb50bf..aa3b5f1db 100644 --- a/lib/http2.c +++ b/lib/http2.c @@ -761,6 +761,10 @@ static ssize_t http2_recv(struct connectdata *conn, int sockindex, return -1; } +/* Index where :authority header field will appear in request header + field list. */ +#define AUTHORITY_DST_IDX 3 + /* return number of received (decrypted) bytes */ static ssize_t http2_send(struct connectdata *conn, int sockindex, const void *mem, size_t len, CURLcode *err) @@ -775,6 +779,7 @@ static ssize_t http2_send(struct connectdata *conn, int sockindex, nghttp2_nv *nva; size_t nheader; size_t i; + size_t authority_idx; char *hdbuf = (char*)mem; char *end; nghttp2_data_provider data_prd; @@ -845,10 +850,13 @@ static ssize_t http2_send(struct connectdata *conn, int sockindex, hdbuf = strchr(hdbuf, 0x0a); ++hdbuf; + authority_idx = 0; + for(i = 3; i < nheader; ++i) { end = strchr(hdbuf, ':'); assert(end); if(end - hdbuf == 4 && Curl_raw_nequal("host", hdbuf, 4)) { + authority_idx = i; nva[i].name = (unsigned char *)":authority"; nva[i].namelen = (uint16_t)strlen((char *)nva[i].name); } @@ -879,6 +887,15 @@ static ssize_t http2_send(struct connectdata *conn, int sockindex, } } + /* :authority must come before non-pseudo header fields */ + if(authority_idx != 0 && authority_idx != AUTHORITY_DST_IDX) { + nghttp2_nv authority = nva[authority_idx]; + for(i = authority_idx; i > AUTHORITY_DST_IDX; --i) { + nva[i] = nva[i - 1]; + } + nva[i] = authority; + } + switch(conn->data->set.httpreq) { case HTTPREQ_POST: case HTTPREQ_POST_FORM: |