Commit 52e6d3fe authored by Stefan Eissing's avatar Stefan Eissing
Browse files

Merge of r1747550 from trunk: 

mod_proxy_http2 no longer shares objects with mod_http2
h2_casecmpstr eliminated, uses backported ap_cstr_casecmp*



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

CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -436,7 +436,7 @@ SET(mod_proxy_http2_extra_defines ssize_t=long) 
SET(mod_proxy_http2_extra_includes         ${NGHTTP2_INCLUDE_DIR})

SET(mod_proxy_http2_extra_libs             ${NGHTTP2_LIBRARIES} mod_proxy)

SET(mod_proxy_http2_extra_sources

  modules/http2/h2_proxy_session.c   modules/http2/h2_util.c

  modules/http2/h2_proxy_session.c   modules/http2/h2_proxy_util.c

)

SET(mod_ratelimit_extra_defines      AP_RL_DECLARE_EXPORT)

SET(mod_sed_extra_sources

modules/http2/NWGNUmod_http2

+0 −1
Original line number Diff line number Diff line
@@ -355,7 +355,6 @@ $(OBJDIR)/mod_http2.imp : NWGNUmod_http2 
	@echo $(DL)GEN  $@$(DL)

	@echo $(DL) (HTTP2)$(DL) > $@

	@echo $(DL) http2_module,$(DL) >> $@

	@echo $(DL) h2_casecmpstrn,$(DL) >> $@

	@echo $(DL) h2_ihash_add,$(DL) >> $@

	@echo $(DL) h2_ihash_clear,$(DL) >> $@

	@echo $(DL) h2_ihash_count,$(DL) >> $@

modules/http2/config2.m4

+1 −1
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ dnl # list of module object files 
proxy_http2_objs="dnl

mod_proxy_http2.lo dnl

h2_proxy_session.lo dnl

h2_util.lo dnl

h2_proxy_util.lo dnl

"



dnl # hook module into the Autoconf mechanism (--enable-proxy_http2)

modules/http2/h2_mplx.h

+0 −1
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ struct apr_thread_cond_t; 
struct h2_bucket_beam;

struct h2_config;

struct h2_ihash_t;

struct h2_ilist_t;

struct h2_response;

struct h2_task;

struct h2_stream;

modules/http2/h2_proxy_session.c

+2 −2
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 


#include "mod_http2.h"

#include "h2.h"

#include "h2_util.h"

#include "h2_proxy_util.h"

#include "h2_proxy_session.h"



APLOG_USE_MODULE(proxy_http2);
@@ -211,7 +211,7 @@ static void process_proxy_header(request_rec *r, const char *n, const char *v) 
    int i;

    

    for (i = 0; transform_hdrs[i].name; ++i) {

        if (!h2_casecmpstr(transform_hdrs[i].name, n)) {

        if (!ap_cstr_casecmp(transform_hdrs[i].name, n)) {

            dconf = ap_get_module_config(r->per_dir_config, &proxy_module);

            apr_table_add(r->headers_out, n,

                          (*transform_hdrs[i].func)(r, dconf, v));