Commit e2f9f04f authored by Eric Covener's avatar Eric Covener
Browse files

bad conflict edit in r1796447 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1796449 13f79535-47bb-0310-9956-ffa450edef68
parent 0bd08881

CHANGES

+0 −4
Original line number Diff line number Diff line
@@ -5,10 +5,6 @@ Changes with Apache 2.4.26 
  *) core: ap_parse_form_data() URL-decoding doesn't work on EBCDIC

     platforms. PR61124. [Hank Ibell <hwibell gmail.com>]



  *) core: Deprecate ap_get_basic_auth_pw() and add 

     ap_get_basic_auth_components(). 

     [Emmanuel Dreyfus <manu netbsd.org>, Jacob Champion, Eric Covener]



  *) Evaluate nested If/ElseIf/Else configuration blocks.

     [Luca Toscano, Jacob Champion]