]> granicus.if.org Git - apache/commit
projects / apache / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: eb02397) | patch
Merge r1729208, r1735668, r1735931, r1735935, r1735942 from trunk:
authorJim Jagielski <jim@apache.org>
Thu, 12 May 2016 21:29:29 +0000 (21:29 +0000)
committerJim Jagielski <jim@apache.org>
Thu, 12 May 2016 21:29:29 +0000 (21:29 +0000)
commit3e4e402daa6429ee74cfa2d20543d8495b0bfa3b
treee2fabf44b3981d8edd91093b8645d62176a90331tree | snapshot
parenteb02397dfe35aa40dcd2e437d6bf0118f1db68f5commit | diff
Merge r1729208, r1735668, r1735931, r1735935, r1735942 from trunk:

let proxy handler forward ALPN protocol strings for ssl proxy connections

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, 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
CHANGES diff | blob | history
STATUS diff | blob | history
modules/http2/NWGNUmakefile diff | blob | history
modules/http2/config2.m4 diff | blob | history
modules/http2/h2_session.c diff | blob | history
modules/ssl/ssl_engine_io.c diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.