Commit b3a19169 authored by Stefan Eissing's avatar Stefan Eissing
Browse files

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
parent d0f103a0

modules/http2/NWGNUmod_http2

+0 −1
Original line number Diff line number Diff line
@@ -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) >> $@

modules/http2/h2_proxy_session.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

modules/http2/h2_proxy_util.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

modules/http2/h2_proxy_util.h

+2 −2
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ 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, 

h2_proxy_ngheader *h2_proxy_util_nghd_make_req(apr_pool_t *p, 

                                               const struct h2_proxy_request *req);



/*******************************************************************************

modules/http2/h2_util.c

+0 −9
Original line number Diff line number Diff line
@@ -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)