]> git.ipfire.org Git - thirdparty/apache/httpd.git/commit
projects / thirdparty / apache / httpd.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 431064f) | patch
Merge r1653997 from trunk.
authorYann Ylavic <ylavic@apache.org>
Thu, 21 May 2015 16:11:41 +0000 (16:11 +0000)
committerYann Ylavic <ylavic@apache.org>
Thu, 21 May 2015 16:11:41 +0000 (16:11 +0000)
commite129c9c396fc53184f56ba7498b8dbaaeb5c48bb
treeba585d9dc2cdc905d1b06069450d461584e20002tree
parent431064fac3c282ee8dc67abf14e0f8ab32071f14commit | diff
Merge r1653997 from trunk.

r1653997 | ylavic | 2015-01-22 19:37:06 +0100 (Thu, 22 Jan 2015) | 7 lines

mod_ssl: Fix merge problem with SSLProtocol that made SSLProtocol ALL ignored
in virtualhost context (new version of r1653906 reverted by r1653993).

Submitted By: Michael Kaufmann <apache-bugzilla michael-kaufmann.ch>
Committed/modified By: ylavic

Reviewed by: ylavic, wrowe, rjung
Backported by: ylavic

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1680917 13f79535-47bb-0310-9956-ffa450edef68
CHANGES diff | blob | blame | history
STATUS diff | blob | blame | history
modules/ssl/ssl_engine_config.c diff | blob | blame | history
modules/ssl/ssl_private.h diff | blob | blame | history
Mirror of https://github.com/apache/httpd.git