Commit a0d14dc6 authored by Paul Querna's avatar Paul Querna
Browse files

Onward to 2.1.6-dev! 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@191100 13f79535-47bb-0310-9956-ffa450edef68
parent 3f35e3ac

CHANGES

+3 −2
Changes for CHANGES: 3 added lines, 2 removed lines.
Original line number Diff line number Diff line 
Changes with Apache 2.1.5









Changes with Apache 2.1.6









  [Remove entries to the current 2.0 section below, when backported]

















Changes with Apache 2.1.5

















  *) SECURITY: 









     core: If a request contains both Transfer-Encoding and a Content-Length,









     remove the Content-Length, stopping some HTTP Request smuggling attacks.


































STATUS



+2
−1



























Changes for STATUS: 2 added lines, 1 removed line.



Original line number
Diff line number
Diff line







@@ -7,7 +7,8 @@ http://svn.apache.org/repos/asf/httpd/httpd/trunk/STATUS







Release history:









    [NOTE that only Alpha/Beta releases occur in 2.1 development]



















    2.1.5   : in development









    2.1.6   : in development









    2.1.5   : Tagged on 6/17/2005. 









    2.1.4   : not released.









    2.1.3   : Released on  2/22/2005 as alpha.









    2.1.2   : Released on 12/08/2004 as alpha.


































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







@@ -42,8 +42,8 @@

















#define AP_SERVER_MAJORVERSION_NUMBER 2









#define AP_SERVER_MINORVERSION_NUMBER 1









#define AP_SERVER_PATCHLEVEL_NUMBER   5









#define AP_SERVER_DEVBUILD_BOOLEAN    0









#define AP_SERVER_PATCHLEVEL_NUMBER   6









#define AP_SERVER_DEVBUILD_BOOLEAN    1



















#if AP_SERVER_DEVBUILD_BOOLEAN









#define AP_SERVER_ADD_STRING          "-dev"