From: Jan Kaluža <jkaluza@apache.org>
Date: Wed, 19 Nov 2014 07:10:09 +0000 (+0000)
Subject: Propose r1638072 and r1638073.
X-Git-Tag: 2.4.11~164
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=77fe997641c9d06595e1234d56cc9e3e61fddbdb;p=thirdparty%2Fapache%2Fhttpd.git

Propose r1638072 and r1638073.


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

diff --git a/STATUS b/STATUS
index 940b9524607..78743bfce5b 100644
--- a/STATUS
+++ b/STATUS
@@ -252,6 +252,17 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: trunk works (modulo CHANGES)
      +1: ylavic, trawick
 
+   * mod_auth_basic: Fix comment mentioning 403 instead of 401. PR 57175.
+     trunk patch: http://svn.apache.org/r1638072
+     2.4.x patch: trunk works
+     +1: jkaluza
+
+   * core: Check for child_num < 0 also in ap_update_child_status
+     and ap_update_child_status_from_conn in scoreboard.c. PR 56767.
+     trunk patch: http://svn.apache.org/r1638073
+     2.4.x patch: trunk works
+     +1: jkaluza
+
 
 OTHER PROPOSALS