X-Git-Url: https://git.ladys.computer/Gitweb/blobdiff_plain/ff1f840d039d8a7bf6c6e82c167723ddbbe694b7296c52fbaf4a365e87e98b21..6a34c39eebcfdbe39de7eb1333109b4ce36f73705a9f5b84adcb0e92181f5284:/gitweb.perl?ds=sidebyside

diff --git a/gitweb.perl b/gitweb.perl
index 78e04e4..5fe7fdc 100755
--- a/gitweb.perl
+++ b/gitweb.perl
@@ -54,6 +54,11 @@ sub evaluate_uri {
 	# to build the base URL ourselves:
 	our $path_info = decode_utf8($ENV{"PATH_INFO"});
 	if ($path_info) {
+		# $path_info has already been URL-decoded by the web server, but
+		# $my_url and $my_uri have not. URL-decode them so we can properly
+		# strip $path_info.
+		$my_url = unescape($my_url);
+		$my_uri = unescape($my_uri);
 		if ($my_url =~ s,\Q$path_info\E$,, &&
 		    $my_uri =~ s,\Q$path_info\E$,, &&
 		    defined $ENV{'SCRIPT_NAME'}) {