summaryrefslogtreecommitdiffstats
path: root/CHANGES
diff options
context:
space:
mode:
authorEric Covener <covener@apache.org>2010-06-02 23:17:19 +0200
committerEric Covener <covener@apache.org>2010-06-02 23:17:19 +0200
commita1372b09cc91055164ced5f0dbb3a5a6eea2b017 (patch)
tree36e918e32222d881b0ef6147fd1610d8ca6b5803 /CHANGES
parentanother blocker for beta (diff)
downloadapache2-a1372b09cc91055164ced5f0dbb3a5a6eea2b017.tar.xz
apache2-a1372b09cc91055164ced5f0dbb3a5a6eea2b017.zip
2.3.6 is under development, not 2.3.7. banner mistakenly added in r909323
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@950761 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
-rw-r--r--CHANGES4
1 files changed, 1 insertions, 3 deletions
diff --git a/CHANGES b/CHANGES
index 05fc9577b4..b7a4f71c6e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,6 @@
-*- coding: utf-8 -*-
-Changes with Apache 2.3.7
+Changes with Apache 2.3.6
*) SECURITY: CVE-2009-3555 (cve.mitre.org)
mod_ssl: Comprehensive fix of the TLS renegotiation prefix injection
@@ -167,8 +167,6 @@ Changes with Apache 2.3.7
*) apxs: Fix -A and -a options to ignore whitespace in httpd.conf
[Philip M. Gollucci]
-Changes with Apache 2.3.6
-
*) worker: Don't report server has reached MaxClients until it has.
Add message when server gets within MinSpareThreads of MaxClients.
PR 46996. [Dan Poirier]