]> granicus.if.org Git - apache/commit
Merge r1587607, r1588868 from trunk:
authorJim Jagielski <jim@apache.org>
Sun, 20 Mar 2016 15:51:49 +0000 (15:51 +0000)
committerJim Jagielski <jim@apache.org>
Sun, 20 Mar 2016 15:51:49 +0000 (15:51 +0000)
commit30deadd1bddbddcd089f0eba7d24df68e797cc07
tree88ef3b87ba8c935e307023d1d0adc9d6aac61b14
parent2c9878e22de17fbea9d206cc7e913d7cd560ea75
Merge r1587607, r1588868 from trunk:

mod_ssl: Add hooks to allow other modules to perform processing at
several stages of initialization and connection handling.  See
mod_ssl_openssl.h.

This is enough to allow implementation of Certificate Transparency
outside of mod_ssl.

Initialize post_handshake_rc for case where a failure has
already occurred (doesn't change execution but avoids warning
with some levels of gcc).

Pointed out by: kbrand

Submitted by: trawick
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1735886 13f79535-47bb-0310-9956-ffa450edef68
12 files changed:
CHANGES
CMakeLists.txt
Makefile.in
Makefile.win
NWGNUmakefile
STATUS
include/ap_mmn.h
modules/ssl/mod_ssl.c
modules/ssl/mod_ssl.dsp
modules/ssl/mod_ssl.h
modules/ssl/ssl_engine_init.c
modules/ssl/ssl_engine_io.c