ben 96/10/19 07:44:40
Modified: src http_request.c Log: Process <Location> after <Files>. Reviewed by: Alexei Kosut, Roy Fielding, Jim Jagielski Revision Changes Path 1.21 +7 -7 apache/src/http_request.c Index: http_request.c =================================================================== RCS file: /export/home/cvs/apache/src/http_request.c,v retrieving revision 1.20 retrieving revision 1.21 diff -C3 -r1.20 -r1.21 *** http_request.c 1996/10/19 14:20:20 1.20 --- http_request.c 1996/10/19 14:44:39 1.21 *************** *** 50,56 **** * */ ! /* $Id: http_request.c,v 1.20 1996/10/19 14:20:20 ben Exp $ */ /* * http_request.c: functions to get and process requests --- 50,56 ---- * */ ! /* $Id: http_request.c,v 1.21 1996/10/19 14:44:39 ben Exp $ */ /* * http_request.c: functions to get and process requests *************** *** 602,609 **** */ if ((res = directory_walk (rnew)) - || (res = location_walk (rnew)) || (res = file_walk (rnew)) || (!some_auth_required (rnew) ? 0 : ((res = check_user_id (rnew)) || (res = check_auth (rnew)))) || (res = check_access (rnew)) --- 602,609 ---- */ if ((res = directory_walk (rnew)) || (res = file_walk (rnew)) + || (res = location_walk (rnew)) || (!some_auth_required (rnew) ? 0 : ((res = check_user_id (rnew)) || (res = check_auth (rnew)))) || (res = check_access (rnew)) *************** *** 826,840 **** return; } - if ((access_status = location_walk (r))) { - die (access_status, r); - return; - } - if ((access_status = file_walk (r))) { die (access_status, r); return; } if ((access_status = check_access (r)) != 0) { decl_die (access_status, "check access", r); --- 826,840 ---- return; } if ((access_status = file_walk (r))) { die (access_status, r); return; } + + if ((access_status = location_walk (r))) { + die (access_status, r); + return; + } if ((access_status = check_access (r)) != 0) { decl_die (access_status, "check access", r);