]> git.ipfire.org Git - thirdparty/apache/httpd.git/commit
Fix merge problem with SSLProtocol that made SSLProtocol ALL ignored
authorEric Covener <covener@apache.org>
Thu, 22 Jan 2015 15:19:39 +0000 (15:19 +0000)
committerEric Covener <covener@apache.org>
Thu, 22 Jan 2015 15:19:39 +0000 (15:19 +0000)
commitd49e2f14f6d8eda2d6b5fc80c889e2912abb23a2
treedae00a43ac9fe20927eca8af5dfb12c4f73d50a8
parentd9f7ff0138c3c4b6165251005d43e81d64929fbb
Fix merge problem with SSLProtocol that made SSLProtocol ALL ignored
in virtualhost context.

Submitted By: Michael Kaufmann <apache-bugzilla michael-kaufmann.ch>
Commited By: covener

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1653906 13f79535-47bb-0310-9956-ffa450edef68
CHANGES
modules/ssl/ssl_engine_config.c
modules/ssl/ssl_engine_init.c
modules/ssl/ssl_private.h