Commit 9f5ec18d authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files

On to 2.2.31-dev 

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1690342 13f79535-47bb-0310-9956-ffa450edef68
parent e8dbb5d6

CHANGES

+4 −0
Original line number Diff line number Diff line 
                                                         -*- coding: utf-8 -*-

Changes with Apache 2.2.31







Changes with Apache 2.2.30



  *) SECURITY: CVE-2015-3183 (cve.mitre.org)

STATUS

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ Patches considered for backport are noted in their branches' STATUS: 
Release history:

    [NOTE that x.{odd}.z versions are strictly Alpha/Beta releases,

          while x.{even}.z versions are Stable/GA releases.]

    2.2.31  : In maintenance

    2.2.30  : Tagged July 10, 2014

    2.2.29  : Released September 3, 2014

    2.2.28  : Tagged August 22, 2014. Not released.

docs/manual/style/version.ent

+1 −1
Original line number Diff line number Diff line
@@ -19,6 +19,6 @@ 


<!ENTITY httpd.major "2">

<!ENTITY httpd.minor "2">

<!ENTITY httpd.patch "30">

<!ENTITY httpd.patch "31">



<!ENTITY httpd.docs "2.2">

include/ap_release.h

+2 −2
Original line number Diff line number Diff line
@@ -43,8 +43,8 @@ 


#define AP_SERVER_MAJORVERSION_NUMBER 2

#define AP_SERVER_MINORVERSION_NUMBER 2

#define AP_SERVER_PATCHLEVEL_NUMBER   30

#define AP_SERVER_DEVBUILD_BOOLEAN    0

#define AP_SERVER_PATCHLEVEL_NUMBER   31

#define AP_SERVER_DEVBUILD_BOOLEAN    1



/* Synchronize the above with docs/manual/style/version.ent */