summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiuseppe Bilotta <giuseppe.bilotta@gmail.com>2008-09-29 13:07:42 (GMT)
committerShawn O. Pearce <spearce@spearce.org>2008-10-03 00:27:10 (GMT)
commitb65910fec21db070ac40521e4b375fca76d27c90 (patch)
treeaaca32e0bf4db71577f2f7fea0ed4f42a5803ff1
parentb1524ee0f3a34d76639090c988523550026cc98b (diff)
downloadgit-b65910fec21db070ac40521e4b375fca76d27c90.zip
git-b65910fec21db070ac40521e4b375fca76d27c90.tar.gz
git-b65910fec21db070ac40521e4b375fca76d27c90.tar.bz2
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>
-rwxr-xr-xgitweb/gitweb.perl7
1 files changed, 7 insertions, 0 deletions
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 269f112..f1ab572 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";