Item13883: Merge branch 'Release02x01'

foswiki · May 12, 2017 · 8d7758b · 8d7758b
2 parents 32a766a + f38555d
commit 8d7758b
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 14 deletions.
diff --git a/UnitTestContrib/test/unit/ClientTests.pm b/UnitTestContrib/test/unit/ClientTests.pm
@@ -213,8 +213,10 @@ sub verify_sudo_login {
       $this->{session}
       ->getScriptUrl( 0, $script, $this->{test_web}, $this->{test_topic} );
     $this->assert_matches( qr/^302/, $this->{session}->{response}->status() );
-    $this->assert_matches( qr/^$surly/,
-        $this->{session}->{response}->headers()->{Location} );
+    $this->assert_matches(
+        qr/^$Foswiki::cfg{DefaultUrlHost}$surly/,
+        $this->{session}->{response}->headers()->{Location}
+    );
 
     # Verify that old crypted password works
     $crypted = crypt( $secret, "12" );
@@ -240,8 +242,10 @@ sub verify_sudo_login {
       $this->{session}
       ->getScriptUrl( 0, $script, $this->{test_web}, $this->{test_topic} );
     $this->assert_matches( qr/^302/, $this->{session}->{response}->status() );
-    $this->assert_matches( qr/^$surly/,
-        $this->{session}->{response}->headers()->{Location} );
+    $this->assert_matches(
+        qr/^$Foswiki::cfg{DefaultUrlHost}$surly/,
+        $this->{session}->{response}->headers()->{Location}
+    );
 
     return;
 }

diff --git a/UnitTestContrib/test/unit/RenameTests.pm b/UnitTestContrib/test/unit/RenameTests.pm
@@ -1376,6 +1376,7 @@ THIS
       . $Foswiki::cfg{ScriptSuffix} . '/';
     $ss = $Foswiki::cfg{ScriptUrlPaths}{view} . '/'
       if ( defined $Foswiki::cfg{ScriptUrlPaths}{view} );
+    $ss = $Foswiki::cfg{DefaultUrlHost} . $ss;
     $this->assert_matches( qr([lL]ocation:\s+$ss$this->{test_web}/UpperCase)s,
         $text );
     $this->check( $this->{test_web}, 'UpperCase', $topicObject, <<'THIS', 100 );

diff --git a/core/data/System/ReleaseHistory.txt b/core/data/System/ReleaseHistory.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" date="1493948714" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" date="1494553358" format="1.1" version="1"}%
 %META:TOPICPARENT{name="AdminDocumentationCategory"}%
 History of Foswiki
 %STARTINCLUDE%
@@ -7,7 +7,11 @@ History of Foswiki
 ---+ Appendix A: Foswiki Development Time-line
 
 %TOC%
----++ Foswiki Release 2.1.4-Beta1 - 4 May 2017
+---++ Foswiki Release 2.1.4-RC2 - 13 May 2017
+
+Foswiki 2.1.4-RC2 was built on 13 May 2017. It is a release that contains 24 fixes.
+
+---++ Foswiki Release 2.1.4-RC1 - 4 May 2017
 
 Foswiki 2.1.4-RC1 was built on 04 May 2017. It is a release that contains 21 fixes.
 

diff --git a/core/data/System/ReleaseNotes02x01.txt b/core/data/System/ReleaseNotes02x01.txt
@@ -1,6 +1,6 @@
-%META:TOPICINFO{author="ProjectContributor" date="1493948714" format="1.1"  version="1"}%
+%META:TOPICINFO{author="ProjectContributor" date="1494553358" format="1.1"  version="1"}%
 %META:TOPICPARENT{name="ReleaseHistory"}%
----+!! Foswiki Release 2.1.4-RC1
+---+!! Foswiki Release 2.1.4-RC2
 
 %TWISTY{showlink="Table of Contents..." hidelink="hide TOC"}%
 %TOC%
@@ -55,7 +55,7 @@ Foswiki is released under the GNU General Public License.
    * Foswiki 2.1.1 was built on 30 Apr 2016. It is a release that contains 36 fixes and 21 enhancements.
    * Foswiki 2.1.2 was built on 2 May 2016. It is a release that contains 1 fix.
    * Foswiki 2.1.3 was built on 12 Feb 2017. It is a release that contains 68 fixes and 21 enhancements.
-   * Foswiki 2.1.4-RC1 was built on 04 May 2017. It is a release that contains 21 fixes.
+   * Foswiki 2.1.4-RC2 was built on 13 May 2017. It is a release that contains 24 fixes.
 
 
 ---++ Pre-installed Extensions
@@ -495,10 +495,13 @@ Foswiki thanks the Translators for their efforts.  If you are interesting in hel
 | [[%BUGS%/Item14366][Item14366]] | =use CGI::Carp= in bin scripts BEGIN block cannot be found via LocalLib.cfg override. |
 | [[%BUGS%/Item14368][Item14368]] | Failure to handle edge cases leads to obscure bug in RCS. |
 | [[%BUGS%/Item14369][Item14369]] | Document parameters for USERNAME, WIKINAME and WIKIUSERNAME macros. |
+| [[%BUGS%/Item14370][Item14370]] | Foswiki::Func::removeUserFromGroup docmentation is incorrect. |
 | [[%BUGS%/Item14372][Item14372]] | JQueryPlugin ui-draggable got dropped from  Config.spec. |
 | [[%BUGS%/Item14377][Item14377]] | Error message requires some encoding. |
 | [[%BUGS%/Item14381][Item14381]] | mod_perl unexpectedly decodes the URI, and X-FoswikiURI header should be debug only. |
 | [[%BUGS%/Item14388][Item14388]] | NatEditPlugin does not honor the ScriptSuffix setting, and doesn't accommodate short URLs. |
+| [[%BUGS%/Item14392][Item14392]] | WebPreferences topics contain empty DENY rules that would be honored if ={AccessControlACL}{EnableDeprecatedEmptyDeny}= is enabled. |
+| [[%BUGS%/Item14396][Item14396]] | Don't redirect to relative paths. 302 redirects should be absolute Locations. |
 
 </noautolink>
 

diff --git a/core/data/System/SystemRequirements.txt b/core/data/System/SystemRequirements.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" date="1460213988" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" date="1494299493" format="1.1" version="1"}%
 %META:TOPICPARENT{name="AdminDocumentationCategory"}%
 ---+ System Requirements
 
@@ -129,14 +129,17 @@ Install apache2, rcs, and perl-CPAN
 | JSON | =perl-JSON= | |
 | Locale::Language | =perl-Locale-Codes= |  |
 | Locale::Maketext | =perl-Locale-Maketext= |  |
-| Locale::Maketext::Lexicon | =perl-Locale-Maketext-Lexicon= | Optional, needed for internationalization |
-| Locale::Msgfmt | =perl-Locale-Msgfmt= | Optional, needed for internationalization |
+| Locale::Maketext::Lexicon | =perl-Locale-Maketext-Lexicon= | Optional, needed for internationalization ** |
+| Locale::Msgfmt | =perl-Locale-Msgfmt= | Optional, needed for internationalization ** |
 | LWP | =perl-libwww-perl= | |
-| LWP::Protocol::https | =perl-liblwp-protocol-https= | |
+| LWP::Protocol::https | =perl-LWP-Protocol-https= | |
 | URI | =perl-URI= | |
-| version | =perl-Perl-Version= | Must be version 0.77 or newer, included with perl 5.10.1 and newer. |
+| version | =perl-version= | Must be version 0.77 or newer, included with perl 5.10.1 and newer. |
 
 ---+++++!! To install the above packages on CentOS
+Note, =Locale::Maketext::Lexicon= and =Locale::Msgfmt= are not available on
+Centos. Install using CPAN if Internationalization is required.
+
 First add the appropriate perl module repository, and then install the packages.
 <blockquote>
 =yum install -y epel-release= %BR%

diff --git a/core/lib/Foswiki/Response.pm b/core/lib/Foswiki/Response.pm
@@ -410,6 +410,17 @@ sub redirect {
     ) if DEBUG;
     return if ( $status && $status !~ /^\s*3\d\d.*/ );
 
+# Per https://tools.ietf.org/html/rfc3875#section-6.2.2, if the CGI script returns
+# a local path, it must not provide any other headers, such as cookies. So make sure
+# the location is an absolute location.
+    unless ( $url =~ m{^https?://}i ) {
+        my $base =
+          ( $Foswiki::cfg{ForceDefaultUrlHost} )
+          ? $Foswiki::cfg{DefaultUrlHost}
+          : $Foswiki::Plugins::SESSION->{request}->url( base => 1, full => 1 );
+        $url = $base . $url;
+    }
+
     my @headers = ( -Location => $url );
     push @headers, '-Status' => $status;
     push @headers, '-Cookie' => $cookies if $cookies;