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

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
parent dcbe7d6d

CHANGES

+4 −0
Original line number Diff line number Diff line 
                                                         -*- coding: utf-8 -*-



  *) 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]



  *) mod_http2: disabling PUSH when client sends GOAWAY.

  

  *) mod_rewrite: Don't implicitly URL-escape the original query string

CMakeLists.txt

+2 −0
Original line number Diff line number Diff line
@@ -445,6 +445,7 @@ SET(mod_session_crypto_requires APU_HAVE_CRYPTO) 
SET(mod_session_crypto_extra_libs    mod_session)

SET(mod_session_dbd_extra_libs       mod_session)

SET(mod_socache_dc_requires          AN_UNIMPLEMENTED_SUPPORT_LIBRARY_REQUIREMENT)

SET(mod_ssl_extra_defines            SSL_DECLARE_EXPORT)

SET(mod_ssl_requires                 OPENSSL_FOUND)

IF(OPENSSL_FOUND)

  SET(mod_ssl_extra_includes           ${OPENSSL_INCLUDE_DIR})
@@ -639,6 +640,7 @@ SET(other_installed_h 
  ${CMAKE_CURRENT_SOURCE_DIR}/modules/proxy/mod_proxy.h

  ${CMAKE_CURRENT_SOURCE_DIR}/modules/session/mod_session.h

  ${CMAKE_CURRENT_SOURCE_DIR}/modules/ssl/mod_ssl.h

  ${CMAKE_CURRENT_SOURCE_DIR}/modules/ssl/mod_ssl_openssl.h

)

# When mod_serf is buildable, don't forget to copy modules/proxy/mod_serf.h

Makefile.in

+1 −0
Original line number Diff line number Diff line
@@ -234,6 +234,7 @@ INSTALL_HEADERS = \ 
	$(srcdir)/modules/proxy/mod_proxy.h \

        $(srcdir)/modules/session/mod_session.h \

	$(srcdir)/modules/ssl/mod_ssl.h \

	$(srcdir)/modules/ssl/mod_ssl_openssl.h \

	$(srcdir)/os/$(OS_DIR)/*.h



install-include:

Makefile.win

+1 −0
Original line number Diff line number Diff line
@@ -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

NWGNUmakefile

+1 −0
Original line number Diff line number Diff line
@@ -446,6 +446,7 @@ installdev :: FORCE 
	$(call COPY,$(STDMOD)/proxy/mod_proxy.h,                       $(INSTALLBASE)/include/)

	$(call COPY,$(STDMOD)/session/mod_session.h,                   $(INSTALLBASE)/include/)

	$(call COPY,$(STDMOD)/ssl/mod_ssl.h,                           $(INSTALLBASE)/include/)

	$(call COPY,$(STDMOD)/ssl/mod_ssl_openssl.h,                   $(INSTALLBASE)/include/)

	$(call COPY,$(APR)/*.imp,                                      $(INSTALLBASE)/lib/)

	$(call COPY,$(NWOS)/*.imp,                                     $(INSTALLBASE)/lib/)

	$(call COPY,$(NWOS)/*.xdc,                                     $(INSTALLBASE)/lib/)