From: William A. Rowe Jr Date: Sat, 6 Jan 2007 06:32:08 +0000 (+0000) Subject: Bump after tag X-Git-Tag: 2.2.5~340 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=62101123b67543c7b165687bba33f6bdbac1e87d;p=thirdparty%2Fapache%2Fhttpd.git Bump after tag git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@493426 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/CHANGES b/CHANGES index c063e64abf8..dafc068ccfd 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,8 @@ -*- coding: utf-8 -*- +Changes with Apache 2.2.5 + + + Changes with Apache 2.2.4 *) mod_isapi: Correctly present SERVER_PORT_SECURE. diff --git a/STATUS b/STATUS index ac90bf3a796..ecb1bd064d9 100644 --- a/STATUS +++ b/STATUS @@ -26,6 +26,7 @@ Release history: [NOTE that x.{odd}.z versions are strictly Alpha/Beta releases, while x.{even}.z versions are Stable/GA releases.] + 2.2.5 : In Development 2.2.4 : Tagged on January 5, 2007 2.2.3 : Released on July 28, 2006 as GA. 2.2.2 : Released on May 1, 2006 as GA. diff --git a/include/ap_release.h b/include/ap_release.h index 4b0e73ab57c..b033bed83e2 100644 --- a/include/ap_release.h +++ b/include/ap_release.h @@ -45,8 +45,8 @@ #define AP_SERVER_MAJORVERSION_NUMBER 2 #define AP_SERVER_MINORVERSION_NUMBER 2 -#define AP_SERVER_PATCHLEVEL_NUMBER 4 -#define AP_SERVER_DEVBUILD_BOOLEAN 0 +#define AP_SERVER_PATCHLEVEL_NUMBER 5 +#define AP_SERVER_DEVBUILD_BOOLEAN 1 #if AP_SERVER_DEVBUILD_BOOLEAN #define AP_SERVER_ADD_STRING "-dev"