Applied in r1734372. -Stefan
> Am 09.03.2016 um 23:44 schrieb NormW <[email protected]>: > > G/M > Thanks Stefan for all the help so far. > A build of httpd-trunk this morning shows the followning tweaks are still > required: > > - The additional exports in the two NWGNU files are for recent changes to > mod_proxy_http2; > - The httpd_module export is already included in mod_http2.imp and neeed not > be in the list also; > - By means unknown the >> - @$(OBJDIR)/mod_http2.imp \ > acquired 4+ trailing spaces after the backslash character and thus Make would > ignore the backslash and spit the dummy on the following line; > - mod_proxy_http2.c still needs the double quotes tweak. > >> Index: modules/http2/NWGNUmod_http2 >> =================================================================== >> --- modules/http2/NWGNUmod_http2 (revision 1734307) >> +++ modules/http2/NWGNUmod_http2 (working copy) >> @@ -260,8 +260,7 @@ >> # Any symbols exported to here >> # >> FILES_nlm_exports = \ >> - http2_module \ >> - @$(OBJDIR)/mod_http2.imp \ >> + @$(OBJDIR)/mod_http2.imp \ >> $(EOLIST) >> >> # >> @@ -370,6 +369,7 @@ >> @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) >> $@ >> @@ -379,6 +379,7 @@ >> @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) >> $@ >> Index: modules/http2/mod_proxy_http2.c >> =================================================================== >> --- modules/http2/mod_proxy_http2.c (revision 1734307) >> +++ modules/http2/mod_proxy_http2.c (working copy) >> @@ -17,7 +17,7 @@ >> >> #include <httpd.h> >> #include <mod_proxy.h> >> -#include <mod_http2.h> >> +#include "mod_http2.h" >> >> >> #include "mod_proxy_http2.h" >> Index: modules/http2/NWGNUproxyht2 >> =================================================================== >> --- modules/http2/NWGNUproxyht2 (revision 1734307) >> +++ modules/http2/NWGNUproxyht2 (working copy) >> @@ -237,6 +237,7 @@ >> ap_proxy_port_of_scheme \ >> ap_proxy_release_connection \ >> ap_proxy_ssl_connection_cleanup \ >> + ap_sock_disable_nagle \ >> proxy_hook_canon_handler \ >> proxy_hook_scheme_handler \ >> proxy_module \ > <trunk_modules_http2_proxy3.diff>
