Commit 678cdccc authored by Stefan Eissing's avatar Stefan Eissing
Browse files

backported mod_http2 1.4.0 from trunk 

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

CHANGES

+4 −0
Original line number Diff line number Diff line
@@ -2,6 +2,10 @@ 


Changes with Apache 2.4.19



  *) mod_http2: give control to async mpm for keepalive timeouts only when

     no streams are open and even if only after 1 sec delay. Under load, event

     mpm discards connections otherwise too quickly. [Stefan Eissing]

  

  *) mod_ssl: Don't lose track of the SSL context if the ssl_run_pre_handshake()

     hook returns an error. [Graham Leggett]

CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -388,7 +388,7 @@ SET(mod_http2_extra_sources 
  modules/http2/h2_mplx.c            modules/http2/h2_push.c

  modules/http2/h2_request.c         modules/http2/h2_response.c

  modules/http2/h2_session.c         modules/http2/h2_stream.c 

  modules/http2/h2_switch.c

  modules/http2/h2_switch.c          modules/http2/h2_ngn_shed.c 

  modules/http2/h2_task.c            modules/http2/h2_task_input.c

  modules/http2/h2_task_output.c     modules/http2/h2_int_queue.c

  modules/http2/h2_util.c            modules/http2/h2_worker.c

modules/http2/NWGNUmakefile

+0 −1
Original line number Diff line number Diff line
@@ -152,7 +152,6 @@ XDCDATA = 
# If there is an NLM target, put it here

#

TARGET_nlm = \

	$(OBJDIR)/mod_http2.nlm \

	$(OBJDIR)/mod_http2.nlm \

	$(EOLIST)

modules/http2/NWGNUmod_http2

+59 −3
Original line number Diff line number Diff line
@@ -198,6 +198,7 @@ FILES_nlm_objs = \ 
	$(OBJDIR)/h2_io.o \

	$(OBJDIR)/h2_io_set.o \

	$(OBJDIR)/h2_mplx.o \

	$(OBJDIR)/h2_ngn_shed.o \

	$(OBJDIR)/h2_push.o \

	$(OBJDIR)/h2_request.o \

	$(OBJDIR)/h2_response.o \
@@ -259,7 +260,7 @@ FILES_nlm_Ximports = \ 
# Any symbols exported to here

#

FILES_nlm_exports = \

	http2_module \

	@$(OBJDIR)/mod_http2.imp \

	$(EOLIST)



#
@@ -273,7 +274,7 @@ FILES_lib_objs := $(sort $(patsubst $(NGH2SRC)/lib/%.c,$(OBJDIR)/%.o,$(wildcard 


libs :: $(OBJDIR) $(NGH2SRC)/lib/config.h $(TARGET_lib)



nlms :: libs $(TARGET_nlm)

nlms :: libs $(OBJDIR)/mod_http2.imp $(TARGET_nlm)



#

# Updated this target to create necessary directories and copy files to the
@@ -289,7 +290,8 @@ clean :: 
#

vpath %.c $(NGH2SRC)/lib



$(NGH2SRC)/lib/config.h : NWGNUmakefile

$(NGH2SRC)/lib/config.h : NWGNUmod_http2

	@-$(RM) $@

	@echo $(DL)GEN  $@$(DL)

	@echo $(DL)/* For NetWare target.$(DL) > $@

	@echo $(DL)** Do not edit - created by Make!$(DL) >> $@
@@ -351,6 +353,60 @@ $(NGH2SRC)/lib/config.h : NWGNUmakefile 
	@echo $(DL)#endif /* NGH2_CONFIG_H */$(DL) >> $@



#

# Exports from mod_http2 for mod_proxy_http2

$(OBJDIR)/mod_http2.imp : NWGNUmod_http2

	@-$(RM) $@

	@echo $(DL)GEN  $@$(DL)

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

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

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

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

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

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

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

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

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

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

	@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_request_create,$(DL) >> $@

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

	@echo $(DL) nghttp2_version$(DL) >> $@



# Include the 'tail' makefile that has targets that depend on variables defined

# in this makefile

#

modules/http2/config2.m4

+5 −1
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ h2_int_queue.lo dnl 
h2_io.lo dnl

h2_io_set.lo dnl

h2_mplx.lo dnl

h2_ngn_shed.lo dnl

h2_push.lo dnl

h2_request.lo dnl

h2_response.lo dnl
@@ -200,8 +201,11 @@ is usually linked shared and requires loading. ], $http2_objs, , most, [ 
])



# Ensure that other modules can pick up mod_http2.h

# icing: hold back for now until it is more stable

#APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current])







dnl #  end of module specific part

APACHE_MODPATH_FINISH