Commit fd28bda4 authored by Justin Erenkrantz's avatar Justin Erenkrantz
Browse files

Onward ho to 2.1.4.

* CHANGES: Bump.
* include/ap_release.h: Bump.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@154973 13f79535-47bb-0310-9956-ffa450edef68
parent f20541b3
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
Changes with Apache 2.1.3
Changes with Apache 2.1.4
  [Remove entries to the current 2.0 section below, when backported]
Changes with Apache 2.1.3
  *) core_input_filter: Move buckets to a persistent brigade instead of
     creating a new brigade when apr_brigade_split is called. This stops
     a memory leak when proxying a Streaming Media Server. PR 33382.
+2 −2
Original line number Diff line number Diff line
@@ -42,8 +42,8 @@

#define AP_SERVER_MAJORVERSION_NUMBER 2
#define AP_SERVER_MINORVERSION_NUMBER 1
#define AP_SERVER_PATCHLEVEL_NUMBER   3
#define AP_SERVER_DEVBUILD_BOOLEAN    0
#define AP_SERVER_PATCHLEVEL_NUMBER   4
#define AP_SERVER_DEVBUILD_BOOLEAN    1

#if AP_SERVER_DEVBUILD_BOOLEAN
#define AP_SERVER_ADD_STRING          "-dev"