Commit 6e07b113 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

And roll onto 2.3.12 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1075924 13f79535-47bb-0310-9956-ffa450edef68
parent 2ec94c7f

CHANGES

+3 −0
Changes for CHANGES: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line 
                                                         -*- coding: utf-8 -*-



Changes with Apache 2.3.12





Changes with Apache 2.3.11



  *) mod_proxy: balancer-manager now uses POST instead of GET.

STATUS

+1 −0
Changes for STATUS: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -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.3.12  : In development.

    2.3.11  : Tagged on March 1, 2011 (beta).

    2.3.10  : Tagged on December 13, 2010. Released Dec 21, 2010.

    2.3.9   : Tagged on November 23, 2010, not released.

docs/manual/style/version.ent

+1 −1
Changes for docs/manual/style/version.ent: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -19,6 +19,6 @@ 


<!ENTITY httpd.major "2">

<!ENTITY httpd.minor "3">

<!ENTITY httpd.patch "11">

<!ENTITY httpd.patch "12">



<!ENTITY httpd.docs "trunk">

include/ap_release.h

+2 −2
Changes for include/ap_release.h: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -45,8 +45,8 @@ 


#define AP_SERVER_MAJORVERSION_NUMBER 2

#define AP_SERVER_MINORVERSION_NUMBER 3

#define AP_SERVER_PATCHLEVEL_NUMBER   11

#define AP_SERVER_DEVBUILD_BOOLEAN    0

#define AP_SERVER_PATCHLEVEL_NUMBER   12

#define AP_SERVER_DEVBUILD_BOOLEAN    1



#if AP_SERVER_DEVBUILD_BOOLEAN

#define AP_SERVER_ADD_STRING          "-dev"