Merge of r1764255 from trunk:

mod_proxy_http2: resolving last 2 reported dup symbol clashes

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1764256 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/http2/NWGNUmod_http2 b/modules/http2/NWGNUmod_http2
index 8f67a8dc0b1ab1b3c90410510894b9b2dc877b45..35f772db99c4639c91213786b6402489a5f06e1e 100644 (file)
--- a/modules/http2/NWGNUmod_http2
+++ b/modules/http2/NWGNUmod_http2
@@ -366,7 +366,6 @@ $(OBJDIR)/mod_http2.imp : NWGNUmod_http2
        @echo $(DL) h2_iq_create,$(DL) >> $@
        @echo $(DL) h2_iq_remove,$(DL) >> $@
        @echo $(DL) h2_log2,$(DL) >> $@
-       @echo $(DL) h2_proxy_res_ignore_header,$(DL) >> $@
        @echo $(DL) h2_headers_add_h1,$(DL) >> $@
        @echo $(DL) nghttp2_is_fatal,$(DL) >> $@
        @echo $(DL) nghttp2_option_del,$(DL) >> $@

diff --git a/modules/http2/h2_proxy_session.c b/modules/http2/h2_proxy_session.c
index 77a7b76315053755ebec7c5ccd59ba6b7fa1a16a..343c0ad380122337909145ac25587ae4982026a9 100644 (file)
--- a/modules/http2/h2_proxy_session.c
+++ b/modules/http2/h2_proxy_session.c
@@ -637,7 +637,7 @@ static apr_status_t submit_stream(h2_proxy_session *session, h2_proxy_stream *st
     int rv;
     apr_status_t status;
 
-    hd = h2_util_ngheader_make_req(stream->pool, stream->req);
+    hd = h2_proxy_util_nghd_make_req(stream->pool, stream->req);
     
     status = ap_get_brigade(stream->r->input_filters, stream->input,
                             AP_MODE_READBYTES, APR_NONBLOCK_READ,

diff --git a/modules/http2/h2_proxy_util.c b/modules/http2/h2_proxy_util.c
index 024d36e5c0834948819f8546ef0f3beea838d8b6..c507b8b963d34599e38ba20a9eef02480fd0f203 100644 (file)
--- a/modules/http2/h2_proxy_util.c
+++ b/modules/http2/h2_proxy_util.c
@@ -418,8 +418,8 @@ static int add_table_header(void *ctx, const char *key, const char *value)
     return 1;
 }
 
-h2_proxy_ngheader *h2_util_ngheader_make_req(apr_pool_t *p, 
-                                       const struct h2_proxy_request *req)
+h2_proxy_ngheader *h2_proxy_util_nghd_make_req(apr_pool_t *p, 
+                                               const h2_proxy_request *req)
 {
     
     h2_proxy_ngheader *ngh;

diff --git a/modules/http2/h2_proxy_util.h b/modules/http2/h2_proxy_util.h
index 2e4c94efd0cc7dcc0a654ad3a96648dd64bdf434..06185e4d7de9f1aa97228bd626e3f37a1b626d6a 100644 (file)
--- a/modules/http2/h2_proxy_util.h
+++ b/modules/http2/h2_proxy_util.h
@@ -164,8 +164,8 @@ typedef struct h2_proxy_ngheader {
     nghttp2_nv *nv;
     apr_size_t nvlen;
 } h2_proxy_ngheader;
-h2_proxy_ngheader *h2_util_ngheader_make_req(apr_pool_t *p, 
-                                             const struct h2_proxy_request *req);
+h2_proxy_ngheader *h2_proxy_util_nghd_make_req(apr_pool_t *p, 
+                                               const struct h2_proxy_request *req);
 
 /*******************************************************************************
  * h2_proxy_request helpers

diff --git a/modules/http2/h2_util.c b/modules/http2/h2_util.c
index 0678c4352bd3239f33634356fc01864e4acb87e3..095ba973287dd961638a2a56b2a7007ca9c0b304 100644 (file)
--- a/modules/http2/h2_util.c
+++ b/modules/http2/h2_util.c
@@ -1198,9 +1198,6 @@ static literal IgnoredResponseTrailers[] = {
     H2_DEF_LITERAL("www-authenticate"),
     H2_DEF_LITERAL("proxy-authenticate"),
 };
-static literal IgnoredProxyRespHds[] = {
-    H2_DEF_LITERAL("alt-svc"),
-};
 
 static int ignore_header(const literal *lits, size_t llen,
                          const char *name, size_t nlen)
@@ -1233,12 +1230,6 @@ int h2_res_ignore_trailer(const char *name, size_t len)
     return ignore_header(H2_LIT_ARGS(IgnoredResponseTrailers), name, len);
 }
 
-int h2_proxy_res_ignore_header(const char *name, size_t len)
-{
-    return (h2_req_ignore_header(name, len) 
-            || ignore_header(H2_LIT_ARGS(IgnoredProxyRespHds), name, len));
-}
-
 apr_status_t h2_headers_add_h1(apr_table_t *headers, apr_pool_t *pool, 
                                const char *name, size_t nlen,
                                const char *value, size_t vlen)

diff --git a/modules/http2/h2_util.h b/modules/http2/h2_util.h
index d1abd6cce596840786604900155e19f25873321b..7c9453a6cf3dfff37b756e3e5cd3c7cca79fdc69 100644 (file)
--- a/modules/http2/h2_util.h
+++ b/modules/http2/h2_util.h
@@ -191,7 +191,6 @@ const char *h2_util_first_token_match(apr_pool_t *pool, const char *s,
 int h2_req_ignore_header(const char *name, size_t len);
 int h2_req_ignore_trailer(const char *name, size_t len);
 int h2_res_ignore_trailer(const char *name, size_t len);
-int h2_proxy_res_ignore_header(const char *name, size_t len);
 
 /**
  * Set the push policy for the given request. Takes request headers into