Commit 2f45db4a authored by Jim Jagielski's avatar Jim Jagielski
Browse files

And roll on to 2.3.14 

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1140734 13f79535-47bb-0310-9956-ffa450edef68
parent 0ecb8ebf

CHANGES

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



Changes with Apache 2.3.14





Changes with Apache 2.3.13



  *) ab: Support specifying the local address to use. PR 48930.

STATUS

+1 −0
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.14  : In development.

    2.3.13  : Tagged on June 28, 2011.

    2.3.12  : Tagged on May 11, 2011. Released May 23, 2011.

    2.3.11  : Released as Beta on March 7, 2011.

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 "3">

<!ENTITY httpd.patch "13">

<!ENTITY httpd.patch "14">



<!ENTITY httpd.docs "trunk">

include/ap_release.h

+2 −2
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   13

#define AP_SERVER_DEVBUILD_BOOLEAN    0

#define AP_SERVER_PATCHLEVEL_NUMBER   14

#define AP_SERVER_DEVBUILD_BOOLEAN    1



#if AP_SERVER_DEVBUILD_BOOLEAN

#define AP_SERVER_ADD_STRING          "-dev"