From b610c3b0e3571bd93e7a7352204bdf1a01f55d7e Mon Sep 17 00:00:00 2001 From: Stefan Eissing Date: Tue, 11 Oct 2016 14:31:31 +0000 Subject: [PATCH] mod_proxy_http2: resolving last 2 reported dup symbol clashes git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1764255 13f79535-47bb-0310-9956-ffa450edef68 --- modules/http2/NWGNUmod_http2 | 1 - modules/http2/h2_proxy_session.c | 2 +- modules/http2/h2_proxy_util.c | 4 ++-- modules/http2/h2_proxy_util.h | 4 ++-- modules/http2/h2_util.c | 9 --------- modules/http2/h2_util.h | 1 - 6 files changed, 5 insertions(+), 16 deletions(-) diff --git a/modules/http2/NWGNUmod_http2 b/modules/http2/NWGNUmod_http2 index 8f67a8dc0b..35f772db99 100644 --- 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 77a7b76315..343c0ad380 100644 --- 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 024d36e5c0..c507b8b963 100644 --- 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 2e4c94efd0..06185e4d7d 100644 --- 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 3a3900dd09..cf29427567 100644 --- 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 d1abd6cce5..7c9453a6cf 100644 --- 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 -- 2.40.0