Adding r1899905 for the ap_escape_quotes backport.

[skip ci]

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

diff --git a/STATUS b/STATUS
index c7576aec68dda7c24e0b679dd8734455644f0a70..9c6e416be952aad480e54556d97fa127865abbd0 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -181,9 +181,10 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   *) core: make ap_escape_quotes() work correctly on strings
      with more than MAX_INT/2 characters, counting quotes double.
      trunk patch: https://svn.apache.org/r1899609
-     2.4.x patch: svn merge -c 1899609 ^/httpd/httpd/trunk .
+     2.4.x patch: svn merge -c 1899609,1899905 ^/httpd/httpd/trunk .
      +1: icing
      ylavic: I think "extra" should be an apr_size_t.
+     icing: added r1899905 with the proposed changes and assertions.
 
   *) mod_heartmonitor: Set the documented default value
      "10" for HeartbeatMaxServers instead of "0". With "0"