You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ic...@apache.org on 2016/10/11 14:31:31 UTC
svn commit: r1764255 - in /httpd/httpd/trunk/modules/http2: NWGNUmod_http2
h2_proxy_session.c h2_proxy_util.c h2_proxy_util.h h2_util.c h2_util.h
Author: icing
Date: Tue Oct 11 14:31:31 2016
New Revision: 1764255
URL: http://svn.apache.org/viewvc?rev=1764255&view=rev
Log:
mod_proxy_http2: resolving last 2 reported dup symbol clashes
Modified:
httpd/httpd/trunk/modules/http2/NWGNUmod_http2
httpd/httpd/trunk/modules/http2/h2_proxy_session.c
httpd/httpd/trunk/modules/http2/h2_proxy_util.c
httpd/httpd/trunk/modules/http2/h2_proxy_util.h
httpd/httpd/trunk/modules/http2/h2_util.c
httpd/httpd/trunk/modules/http2/h2_util.h
Modified: httpd/httpd/trunk/modules/http2/NWGNUmod_http2
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/NWGNUmod_http2?rev=1764255&r1=1764254&r2=1764255&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/NWGNUmod_http2 (original)
+++ httpd/httpd/trunk/modules/http2/NWGNUmod_http2 Tue Oct 11 14:31:31 2016
@@ -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) >> $@
Modified: httpd/httpd/trunk/modules/http2/h2_proxy_session.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_proxy_session.c?rev=1764255&r1=1764254&r2=1764255&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_proxy_session.c (original)
+++ httpd/httpd/trunk/modules/http2/h2_proxy_session.c Tue Oct 11 14:31:31 2016
@@ -637,7 +637,7 @@ static apr_status_t submit_stream(h2_pro
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,
Modified: httpd/httpd/trunk/modules/http2/h2_proxy_util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_proxy_util.c?rev=1764255&r1=1764254&r2=1764255&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_proxy_util.c (original)
+++ httpd/httpd/trunk/modules/http2/h2_proxy_util.c Tue Oct 11 14:31:31 2016
@@ -418,8 +418,8 @@ static int add_table_header(void *ctx, c
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;
Modified: httpd/httpd/trunk/modules/http2/h2_proxy_util.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_proxy_util.h?rev=1764255&r1=1764254&r2=1764255&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_proxy_util.h (original)
+++ httpd/httpd/trunk/modules/http2/h2_proxy_util.h Tue Oct 11 14:31:31 2016
@@ -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
Modified: httpd/httpd/trunk/modules/http2/h2_util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_util.c?rev=1764255&r1=1764254&r2=1764255&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_util.c (original)
+++ httpd/httpd/trunk/modules/http2/h2_util.c Tue Oct 11 14:31:31 2016
@@ -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 *na
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)
Modified: httpd/httpd/trunk/modules/http2/h2_util.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http2/h2_util.h?rev=1764255&r1=1764254&r2=1764255&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http2/h2_util.h (original)
+++ httpd/httpd/trunk/modules/http2/h2_util.h Tue Oct 11 14:31:31 2016
@@ -191,7 +191,6 @@ const char *h2_util_first_token_match(ap
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