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 5EB911111A for ; Wed, 14 May 2014 06:31:31 +0000 (UTC) Received: (qmail 19904 invoked by uid 500); 14 May 2014 06:24:10 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 19836 invoked by uid 500); 14 May 2014 06:24:10 -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 19829 invoked by uid 99); 14 May 2014 06:24:10 -0000 Received: from Unknown (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 May 2014 06:24:10 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 May 2014 06:24:11 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 9EF44238890B; Wed, 14 May 2014 06:23:47 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn propchange: r1593003 - svn:log Date: Wed, 14 May 2014 06:23:47 -0000 To: cvs@httpd.apache.org From: kbrand@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140514062347.9EF44238890B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kbrand Revision: 1593003 Modified property: svn:log Modified: svn:log at Wed May 14 06:23:47 2014 ------------------------------------------------------------------------------ --- svn:log (original) +++ svn:log Wed May 14 06:23:47 2014 @@ -1,4 +1,3 @@ - * mod_ssl: restore argument structure for exec-type SSLPassPhraseDialog - programs, and implement a special merging algorithm for - SSLCertificate[Key]File to emulate the behavior in versions <= 2.4.7 - +restore argument structure for exec-type SSLPassPhraseDialog +programs, and implement a special merging algorithm for +SSLCertificate[Key]File to emulate the behavior in versions <= 2.4.7