]> granicus.if.org Git - apache/commit
Merge r1520445, r1672985, r1672989, r1673769 from trunk:
authorJim Jagielski <jim@apache.org>
Sun, 19 Apr 2015 18:00:08 +0000 (18:00 +0000)
committerJim Jagielski <jim@apache.org>
Sun, 19 Apr 2015 18:00:08 +0000 (18:00 +0000)
commitda368a8fe9effef1cdf212b33693a2ea750e94e9
tree20fe2b742a104488e0200048c138015688feb53d
parentf64c307aee8cceb3994b2dc2542be9477fd2e1d6
Merge r1520445, r1672985, r1672989, r1673769 from trunk:

Add a warning if protocol given in SSLProtocol  or SSLProxyProtocol will override other parameters given in the same directive.
This could be a missing + or - prefix.

PR 52820

Tweak log message

Add CHANGES entry before backport proposal

Follow-up to r1520445:

Tweak error message for clarity

Submitted by: jailletc36, trawick
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1674655 13f79535-47bb-0310-9956-ffa450edef68
CHANGES
STATUS
modules/ssl/ssl_engine_config.c