You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2014/12/02 13:42:13 UTC
svn commit: r1642850 - in /httpd/httpd/branches/2.4.x: ./ STATUS
modules/aaa/mod_auth_basic.c
Author: jim
Date: Tue Dec 2 12:42:12 2014
New Revision: 1642850
URL: http://svn.apache.org/r1642850
Log:
Merge r1638072 from trunk:
mod_auth_basic: Fix comment mentioning 403 instead of 401.
Submitted by: jkaluza
Reviewed/backported by: jim
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/STATUS
httpd/httpd/branches/2.4.x/modules/aaa/mod_auth_basic.c
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1638072
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1642850&r1=1642849&r2=1642850&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Tue Dec 2 12:42:12 2014
@@ -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
Modified: httpd/httpd/branches/2.4.x/modules/aaa/mod_auth_basic.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/aaa/mod_auth_basic.c?rev=1642850&r1=1642849&r2=1642850&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/aaa/mod_auth_basic.c (original)
+++ httpd/httpd/branches/2.4.x/modules/aaa/mod_auth_basic.c Tue Dec 2 12:42:12 2014
@@ -428,7 +428,7 @@ static int authenticate_basic_user(reque
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);
}