From: Jim Jagielski <jim@apache.org>
Date: Tue, 2 Dec 2014 12:42:12 +0000 (+0000)
Subject: Merge r1638072 from trunk:
X-Git-Tag: 2.4.11~128
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7514623ad9de136afbd3ad50df4a2ca5cb2501f8;p=thirdparty%2Fapache%2Fhttpd.git

Merge r1638072 from trunk:

mod_auth_basic: Fix comment mentioning 403 instead of 401.

Submitted by: jkaluza
Reviewed/backported by: jim


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

diff --git a/STATUS b/STATUS
index d44c5b276c6..0914962a432 100644
--- a/STATUS
+++ b/STATUS
@@ -104,11 +104,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-   * 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, covener, ylavic
-
    * 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
diff --git a/modules/aaa/mod_auth_basic.c b/modules/aaa/mod_auth_basic.c
index ee4f1854077..5ef40f755ef 100644
--- a/modules/aaa/mod_auth_basic.c
+++ b/modules/aaa/mod_auth_basic.c
@@ -428,7 +428,7 @@ static int authenticate_basic_user(request_rec *r)
             break;
         }
 
-        /* If we're returning 403, tell them to try again. */
+        /* If we're returning 401, tell them to try again. */
         if (return_code == HTTP_UNAUTHORIZED) {
             note_basic_auth_failure(r);
         }