From: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Date: Mon, 29 Sep 2008 13:07:42 +0000 (+0200)
Subject: gitweb: remove PATH_INFO from $my_url and $my_uri
X-Git-Tag: v1.6.0.3~46
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b65910fec21db070ac40521e4b375fca76d27c90;p=git.git

gitweb: remove PATH_INFO from $my_url and $my_uri

This patch fixes PATH_INFO handling by removing the relevant part from
$my_url and $my_uri, thus making it unnecessary to specify them by hand
in the gitweb configuration.

Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Acked-by: Jakub Narebski <jnareb@gmail.com>
Acked-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---

diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 269f1125d..f1ab5725c 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -27,6 +27,13 @@ our $version = "++GIT_VERSION++";
 our $my_url = $cgi->url();
 our $my_uri = $cgi->url(-absolute => 1);
 
+# if we're called with PATH_INFO, we have to strip that
+# from the URL to find our real URL
+if (my $path_info = $ENV{"PATH_INFO"}) {
+	$my_url =~ s,\Q$path_info\E$,,;
+	$my_uri =~ s,\Q$path_info\E$,,;
+}
+
 # core git executable to use
 # this can just be "git" if your webserver has a sensible PATH
 our $GIT = "++GIT_BINDIR++/git";