From: Justin Erenkrantz Date: Thu, 9 Dec 2004 04:52:33 +0000 (+0000) Subject: Onward ho to 2.1.3... X-Git-Tag: 2.1.3~293 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c365121680a0fe9f5f947d75d785938fbeb0e75c;p=thirdparty%2Fapache%2Fhttpd.git Onward ho to 2.1.3... git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@111353 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/CHANGES b/CHANGES index 22179b31cd6..e9abef2e841 100644 --- a/CHANGES +++ b/CHANGES @@ -1,7 +1,9 @@ -Changes with Apache 2.1.2 +Changes with Apache 2.1.3 [Remove entries to the current 2.0 section below, when backported] +Changes with Apache 2.1.2 + *) mod_proxy: Respect errors reported by pre_connection hooks. [Jeff Trawick] diff --git a/STATUS b/STATUS index 6506d0edbeb..1dfb4502f75 100644 --- a/STATUS +++ b/STATUS @@ -3,7 +3,8 @@ Last modified at [$Date$] Release [NOTE that only Alpha/Beta releases occur in 2.1 development]: - 2.1.2 : in development + 2.1.3 : in development + 2.1.2 : Released on 12/08/2004 as alpha. 2.1.1 : Released on 11/19/2004 as alpha. 2.1.0 : not released. diff --git a/include/ap_release.h b/include/ap_release.h index a4dec921972..90fd7b01fc1 100644 --- a/include/ap_release.h +++ b/include/ap_release.h @@ -38,8 +38,8 @@ #define AP_SERVER_MAJORVERSION_NUMBER 2 #define AP_SERVER_MINORVERSION_NUMBER 1 -#define AP_SERVER_PATCHLEVEL_NUMBER 2 -#define AP_SERVER_DEVBUILD_BOOLEAN 0 +#define AP_SERVER_PATCHLEVEL_NUMBER 3 +#define AP_SERVER_DEVBUILD_BOOLEAN 1 #if AP_SERVER_DEVBUILD_BOOLEAN #define AP_SERVER_ADD_STRING "-dev"