Commit 954d4cc3 authored by Joe Orton's avatar Joe Orton
Browse files

Merge r407265 from trunk: 

* modules/generators/mod_autoindex.c (output_directories): Escape
filename in non-FancyIndexing case.

PR: 38910
Submitted by: Robby Griffin <rmg terc.edu>
Reviewed by: jorton, rpluem, trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@410830 13f79535-47bb-0310-9956-ffa450edef68
parent fe5b8c18

CHANGES

+3 −0
Changes for CHANGES: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line 
                                                        -*- coding: utf-8 -*-

Changes with Apache 2.2.3









  *) mod_autoindex: Fix filename escaping with FancyIndexing disabled.









     PR 38910.  [Robby Griffin <rmg terc.edu>]

















  *) mod_charset_lite: Bypass translation when the source and dest charsets









     are the same. [Jeff Trawick]










































modules/generators/mod_autoindex.c



+2
−1



























Changes for modules/generators/mod_autoindex.c: 2 added lines, 1 removed line.



Original line number
Diff line number
Diff line







@@ -1819,7 +1819,8 @@ static void output_directories(struct ent **ar, int n,







            ap_rputc('\n', r);









        }









        else {









            ap_rvputs(r, "<li><a href=\"", anchor, "\"> ", t2,









            ap_rvputs(r, "<li><a href=\"", anchor, "\"> ",









                      ap_escape_html(scratch, t2),









                      "</a></li>\n", NULL);









        }









    }