From: William A. Rowe Jr Date: Thu, 14 Oct 2010 16:32:55 +0000 (+0000) Subject: Prepare for tag X-Git-Tag: 2.0.64~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd796b742d207ea44edcbecf5ca06f290e9b36c5;p=thirdparty%2Fapache%2Fhttpd.git Prepare for tag git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@1022601 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/CHANGES b/CHANGES index 273c317dd75..ee24f5786f4 100644 --- a/CHANGES +++ b/CHANGES @@ -34,7 +34,8 @@ Changes with Apache 2.0.64 is any buffered data readable. Any configuration which requires renegotiation for per-directory/location access control is still vulnerable, unless using openssl 0.9.8l or later. - [Joe Orton, Ruediger Pluem, Hartmut Keil , Rainer Jung] + [Joe Orton, Ruediger Pluem, Hartmut Keil , + Rainer Jung] *) SECURITY: CVE-2010-0434 (cve.mitre.org) Ensure each subrequest has a shallow copy of headers_in so that the diff --git a/STATUS b/STATUS index d68de700e1e..eeb8004523f 100644 --- a/STATUS +++ b/STATUS @@ -23,7 +23,8 @@ Consult the trunk/ for all new development and documentation efforts: Release history: - 2.0.64 : T&R scheduled by wrowe Oct 7 for anticipated 10/11 announce. + 2.0.65 : In maintainance + 2.0.64 : Tagged October 14, 2010. 2.0.63 : Released January 19, 2008. 2.0.62 : Tagged January 4, 2008. Not released. 2.0.61 : Released September 7, 2007. diff --git a/include/ap_release.h b/include/ap_release.h index 681788b6234..9fee3f4fa4c 100644 --- a/include/ap_release.h +++ b/include/ap_release.h @@ -40,7 +40,7 @@ #define AP_SERVER_MAJORVERSION_NUMBER 2 #define AP_SERVER_MINORVERSION_NUMBER 0 #define AP_SERVER_PATCHLEVEL_NUMBER 64 -#define AP_SERVER_ADD_STRING "-dev" +#define AP_SERVER_ADD_STRING "" /* keep old macros as well */ #define AP_SERVER_MAJORVERSION APR_STRINGIFY(AP_SERVER_MAJORVERSION_NUMBER)