randy 96/12/24 10:06:17
Modified: src CHANGES http_request.c Log: Collapse multiple slashes in path URLs to properly apply handlers defined by <Location>. Reviewed by: Rob Hart[h]ill, Randy Terbush Submitted by: Alexei Kosut Revision Changes Path 1.92 +3 -0 apache/src/CHANGES Index: CHANGES =================================================================== RCS file: /export/home/cvs/apache/src/CHANGES,v retrieving revision 1.91 retrieving revision 1.92 diff -C3 -r1.91 -r1.92 *** CHANGES 1996/12/20 16:27:17 1.91 --- CHANGES 1996/12/24 18:06:15 1.92 *************** *** 1,5 **** --- 1,8 ---- Changes with Apache 1.2b3: + *) Collapse multiple slashes in path URLs to properly apply + handlers defined by <Location>. [Alexei Kosut] + *) Define a sane set of DEFAULT_USER and DEFAULT_GROUP values for AIX. *) Improve the accuracy of request duration timings by setting 1.33 +9 -0 apache/src/http_request.c Index: http_request.c =================================================================== RCS file: /export/home/cvs/apache/src/http_request.c,v retrieving revision 1.32 retrieving revision 1.33 diff -C3 -r1.32 -r1.33 *** http_request.c 1996/12/11 05:16:08 1.32 --- http_request.c 1996/12/24 18:06:16 1.33 *************** *** 381,386 **** --- 381,392 ---- int len, num_url = url_array->nelts; char *test_location = pstrdup (r->pool, r->uri); + /* Collapse multiple slashes, if it's a path URL (we don't want to + * do anything to <Location http://...> or such). + */ + if (test_location[0] == '/') + no2slash (test_location); + /* Go through the location entries, and check for matches. */ if (num_url) { *************** *** 439,444 **** --- 445,453 ---- core_dir_config **file = (core_dir_config **)file_array->elts; int len, num_files = file_array->nelts; char *test_file = pstrdup (r->pool, r->filename); + + /* Collapse multiple slashes */ + no2slash (test_file); /* Go through the file entries, and check for matches. */