From: Graham Leggett <minfrin@apache.org>
Date: Fri, 11 Feb 2011 20:30:04 +0000 (+0000)
Subject: Reinstate comment.
X-Git-Tag: 2.3.11~73
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a35cce99fe83222b7616d846ad22bd659a8db81b;p=apache

Reinstate comment.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1069947 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 5954bf10dc..1b947bf851 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,10 @@ Changes with Apache 2.3.11
   *) mod_cache: Respect s-maxage as described by RFC2616 14.9.3, which must
      take precedence if present. PR 35247. [Graham Leggett]
 
+  *) mod_ssl: Fix a possible startup failure if multiple SSL vhosts
+     are configured with the same ServerName and private key file.
+     [Masahiro Matsuya <mmatsuya redhat.com>, Joe Orton]
+
   *) mod_socache_dc: Make module compile by fixing some typos.
      PR 50735 [Mark Montague <mark catseye.org>]