You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ja...@apache.org on 2013/09/06 00:31:00 UTC
svn commit: r1520445 - in /httpd/httpd/trunk:
docs/log-message-tags/next-number modules/ssl/ssl_engine_config.c
Author: jailletc36
Date: Thu Sep 5 22:30:59 2013
New Revision: 1520445
URL: http://svn.apache.org/r1520445
Log:
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
Modified:
httpd/httpd/trunk/docs/log-message-tags/next-number
httpd/httpd/trunk/modules/ssl/ssl_engine_config.c
Modified: httpd/httpd/trunk/docs/log-message-tags/next-number
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/log-message-tags/next-number?rev=1520445&r1=1520444&r2=1520445&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/log-message-tags/next-number (original)
+++ httpd/httpd/trunk/docs/log-message-tags/next-number Thu Sep 5 22:30:59 2013
@@ -1 +1 @@
-2532
+2533
Modified: httpd/httpd/trunk/modules/ssl/ssl_engine_config.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_engine_config.c?rev=1520445&r1=1520444&r2=1520445&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_engine_config.c (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_engine_config.c Thu Sep 5 22:30:59 2013
@@ -1352,6 +1352,13 @@ static const char *ssl_cmd_protocol_pars
*options |= thisopt;
}
else {
+ if (*options != SSL_PROTOCOL_NONE)
+ {
+ ap_log_error(APLOG_MARK, APLOG_WARNING, 0, parms->server, APLOGNO(02532)
+ "Protocol '%s' of directive '%s' overrides already set parameters. "
+ "Check if a prefix is not missing.",
+ w, parms->cmd->name);
+ }
*options = thisopt;
}
}