diff options
| author | Stefan Eissing <icing@apache.org> | 2018-07-05 10:21:00 +0000 |
|---|---|---|
| committer | Stefan Eissing <icing@apache.org> | 2018-07-05 10:21:00 +0000 |
| commit | 96b83022b96ee30736a08a10d9cb714fa7848367 (patch) | |
| tree | 5252d488748f1f0f00140e6a09abaa2b74e1e447 /modules/http2/h2_headers.c | |
| parent | 6b28a01eaac59560b517b9a3131cbf3ccc31e206 (diff) | |
| download | httpd-96b83022b96ee30736a08a10d9cb714fa7848367.tar.gz | |
On the trunk:
* silencing gcc uninitialized warning
* refrainning from apr_table_addn() use since pool debug assumptions are in conflict
* adding more assertions
* copy-porting changes to base64 encoding code from mod_md
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1835118 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/http2/h2_headers.c')
| -rw-r--r-- | modules/http2/h2_headers.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/modules/http2/h2_headers.c b/modules/http2/h2_headers.c index f01ab88aab..8b7add6230 100644 --- a/modules/http2/h2_headers.c +++ b/modules/http2/h2_headers.c @@ -116,9 +116,9 @@ h2_headers *h2_headers_create(int status, apr_table_t *headers_in, { h2_headers *headers = apr_pcalloc(pool, sizeof(h2_headers)); headers->status = status; - headers->headers = (headers_in? apr_table_copy(pool, headers_in) + headers->headers = (headers_in? apr_table_clone(pool, headers_in) : apr_table_make(pool, 5)); - headers->notes = (notes? apr_table_copy(pool, notes) + headers->notes = (notes? apr_table_clone(pool, notes) : apr_table_make(pool, 5)); return headers; } @@ -149,8 +149,7 @@ h2_headers *h2_headers_rcreate(request_rec *r, int status, h2_headers *h2_headers_copy(apr_pool_t *pool, h2_headers *h) { - return h2_headers_create(h->status, apr_table_copy(pool, h->headers), - apr_table_copy(pool, h->notes), h->raw_bytes, pool); + return h2_headers_create(h->status, h->headers, h->notes, h->raw_bytes, pool); } h2_headers *h2_headers_die(apr_status_t type, |