Skip to content

Commit

Permalink
Item1766: fixup for debian package using ShorterUrls
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.foswiki.org/trunk@4769 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
  • Loading branch information
SvenDowideit authored and SvenDowideit committed Sep 5, 2009
1 parent 8cecf20 commit 1b5fe1b
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 0 deletions.
1 change: 1 addition & 0 deletions core/tools/pkg/debian/ShorterUrl.conf
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,6 @@
RewriteEngine on
RewriteRule ^$ /cgi-bin/foswiki/view/$1 [PT] [L]
RewriteRule ^([A-Z].*) /cgi-bin/foswiki/view/$1 [PT] [L]
RewriteRule ^(foswiki_redirect_cache.*) /cgi-bin/foswiki/view/$1 [PT] [L]
</Directory>

6 changes: 6 additions & 0 deletions core/tools/pkg/debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
foswiki (1.0.6-3) unstable; urgency=high

* fix bad URL generation when logging on from / and using ShorterUrls

-- Sven Dowideit <SvenDowideit@fosiki.com> Sat, 11 Sep 2009 09:53:40 +0100

foswiki (1.0.6-2) unstable; urgency=high

* fix fresh installation :/
Expand Down
1 change: 1 addition & 0 deletions core/tools/pkg/debian/patches/00list
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@
00_More_Extensions_warning

01_configure_logo.dpatch
Item1766-redirect_cache.dpatch
23 changes: 23 additions & 0 deletions core/tools/pkg/debian/patches/Item1766-redirect_cache.dpatch
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## Item1766-redirect_cache.dpatch by <root@quad.home.org.au>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: fixes root login redirect issues in 1.0.6

@DPATCH@

Index: lib/Foswiki.pm
===================================================================
--- lib/Foswiki.pm (revision 4728)
+++ lib/Foswiki.pm (working copy)
@@ -899,6 +899,9 @@
# Redirecting from a post to a get
my $cache = $this->cacheQuery();
if ($cache) {
+ if ($url eq '/') {
+ $url = $this->getScriptUrl(1, 'view');
+ }
$url .= $cache;
}
}

0 comments on commit 1b5fe1b

Please sign in to comment.