diff options
| author | Jim Jagielski <jim@apache.org> | 2016-03-20 15:51:49 +0000 |
|---|---|---|
| committer | Jim Jagielski <jim@apache.org> | 2016-03-20 15:51:49 +0000 |
| commit | 30deadd1bddbddcd089f0eba7d24df68e797cc07 (patch) | |
| tree | 88ef3b87ba8c935e307023d1d0adc9d6aac61b14 /Makefile.win | |
| parent | 2c9878e22de17fbea9d206cc7e913d7cd560ea75 (diff) | |
| download | httpd-30deadd1bddbddcd089f0eba7d24df68e797cc07.tar.gz | |
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
Diffstat (limited to 'Makefile.win')
| -rw-r--r-- | Makefile.win | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile.win b/Makefile.win index 570037fa84..041efa5ba0 100644 --- a/Makefile.win +++ b/Makefile.win @@ -1132,6 +1132,7 @@ BEGIN { modules\mappers\mod_rewrite.h \ modules\proxy\mod_proxy.h \ modules\ssl\mod_ssl.h \ + modules\ssl\mod_ssl_openssl.h \ ) do \ @copy %f "$(INSTDIR)\include" < .y > nul copy srclib\apr\Lib$(SHORT)\apr-1.lib "$(INSTDIR)\lib" <.y |