Commit a0b2eb80 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Merge r1729208, r1735668, r1735668, r1735931, r1735935, r1735942 from trunk: 

let proxy handler forward ALPN protocol strings for ssl proxy connections

Remove leftover comment

Remove leftover comment

APLOGNO update for mod_proxy_http2

fix APLOGNO at wrong place, me stupid

h2_proxy_session: fill in missing APLOGNO()s.
Submitted by: icing, jailletc36, jailletc36, icing, icing, ylavic
Reviewed/backported by: jim


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

CHANGES

+5 −0
Original line number Diff line number Diff line
@@ -95,6 +95,11 @@ Changes with Apache 2.4.19 
  *) mod_authz_host: Add a new "forward-dns" authorization type, not relying on

     reverse DNS lookups.  [Fabien]



  *) mod_proxy_http2: new experimental http2 proxy module for h2: and h2c: proxy

     urls. Uses backend connections for concurrent requests if frontend 

     connection is http2 as well.

     [Stefan Eissing]

  

  *) mod_ssl: Add hooks to allow other modules to perform processing at

     several stages of initialization and connection handling.  See

     mod_ssl_openssl.h.  [Jeff Trawick]

STATUS

+0 −10
Original line number Diff line number Diff line
@@ -114,16 +114,6 @@ RELEASE SHOWSTOPPERS: 
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:

  [ start all new proposals below, under PATCHES PROPOSED. ]



  *) mod_proxy_http2: add http2 proxy support in new, experimental module. 

     Includes backport of r1729208 to set ALPN protocols for ssl backend

     connections. 

     Trunk version of patch: <various>

     Backport version for 2.4.x of patch: https://www.eissing.org/proxy_http2_2.4v4.patch

     +1: icing, ylavic, jim

     updated patch after review by cjaillet, merged 1735668,1735748 from trunk

     updated patch with APLOGNOs by merging 1735931,1735935 from trunk

     updated patch with APLOGNOs by merging 1735942 from trunk





PATCHES PROPOSED TO BACKPORT FROM TRUNK:

  [ New proposals should be added at the end of the list ]

modules/http2/NWGNUmakefile

+1 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ XDCDATA = 
#

TARGET_nlm = \

	$(OBJDIR)/mod_http2.nlm \

	$(OBJDIR)/mod_http2.nlm \

	$(OBJDIR)/proxyht2.nlm \

	$(EOLIST)



#

modules/http2/config2.m4

+25 −0
Original line number Diff line number Diff line
@@ -197,6 +197,31 @@ is usually linked shared and requires loading. ], $http2_objs, , most, [ 






dnl #  list of module object files

proxy_http2_objs="dnl

mod_proxy_http2.lo dnl

h2_int_queue.lo dnl

h2_proxy_session.lo dnl

h2_request.lo dnl

h2_util.lo dnl

"



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

APACHE_MODULE(proxy_http2, [HTTP/2 proxy module. This module requires a libnghttp2 installation. 

See --with-nghttp2 on how to manage non-standard locations. Also requires --enable-proxy.], $proxy_http2_objs, , no, [

    APACHE_CHECK_NGHTTP2

    if test "$ac_cv_nghttp2" = "yes" ; then

        if test "x$enable_http2" = "xshared"; then

           # The only symbol which needs to be exported is the module

           # structure, so ask libtool to hide everything else:

           APR_ADDTO(MOD_PROXY_HTTP2_LDADD, [-export-symbols-regex proxy_http2_module])

        fi

    else

        enable_proxy_http2=no

    fi

], proxy)





dnl #  end of module specific part

APACHE_MODPATH_FINISH

modules/http2/h2_session.c

+0 −1
Original line number Diff line number Diff line
@@ -1925,7 +1925,6 @@ static void h2_session_ev_data_read(h2_session *session, int arg, const char *ms 
        case H2_SESSION_ST_WAIT:

            transit(session, "data read", H2_SESSION_ST_BUSY);

            break;

            /* fall through */

        default:

            /* nop */

            break;