Return-Path: X-Original-To: apmail-httpd-cvs-archive@www.apache.org Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 35523175B9 for ; Sun, 12 Apr 2015 06:57:08 +0000 (UTC) Received: (qmail 65736 invoked by uid 500); 12 Apr 2015 06:57:08 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 65670 invoked by uid 500); 12 Apr 2015 06:57:08 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 65661 invoked by uid 99); 12 Apr 2015 06:57:08 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 12 Apr 2015 06:57:08 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id E59D4AC00B7 for ; Sun, 12 Apr 2015 06:57:07 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1672985 - /httpd/httpd/trunk/modules/ssl/ssl_engine_config.c Date: Sun, 12 Apr 2015 06:57:07 -0000 To: cvs@httpd.apache.org From: jailletc36@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150412065707.E59D4AC00B7@hades.apache.org> Author: jailletc36 Date: Sun Apr 12 06:57:07 2015 New Revision: 1672985 URL: http://svn.apache.org/r1672985 Log: Tweak log message Modified: httpd/httpd/trunk/modules/ssl/ssl_engine_config.c 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=1672985&r1=1672984&r2=1672985&view=diff ============================================================================== --- httpd/httpd/trunk/modules/ssl/ssl_engine_config.c (original) +++ httpd/httpd/trunk/modules/ssl/ssl_engine_config.c Sun Apr 12 06:57:07 2015 @@ -1339,8 +1339,7 @@ static const char *ssl_cmd_protocol_pars else { return apr_pstrcat(parms->temp_pool, parms->cmd->name, - ": Illegal protocol '", - w, "'", NULL); + ": Illegal protocol '", w, "'", NULL); } if (action == '-') { @@ -1350,12 +1349,11 @@ static const char *ssl_cmd_protocol_pars *options |= thisopt; } else { - if (*options != SSL_PROTOCOL_NONE) - { + 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. " + "%s: Protocol '%s' overrides already set parameter(s). " "Check if a prefix is not missing.", - w, parms->cmd->name); + parms->cmd->name, w); } *options = thisopt; }