Merge branch 'master' into Item14288

foswiki · Feb 28, 2017 · 00344d7 · 00344d7
2 parents 7745f59 + 4aa7228
commit 00344d7
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/UnitTestContrib/test/unit/NetTests.pm b/UnitTestContrib/test/unit/NetTests.pm
@@ -7,8 +7,6 @@ use strict;
 
 use Foswiki::Net;
 
-our $expectedHeader;
-
 sub new {
     my $self = shift()->SUPER::new( "Net", @_ );
     return $self;
@@ -30,7 +28,8 @@ sub test_getExternalResource {
     $this->assert_equals( 200, $response->code() );
 
     # Note: HTTP::Response doesn't clean out \r correctly
-    my $mess = $response->message();
+    my $mess           = $response->message();
+    my $expectedHeader = qr#text/html; charset=(utf-?8|iso-?8859-?1)#;
     $mess =~ s/\r//g;
     $this->assert_str_equals( 'OK', $mess );
     $this->assert_matches( qr/$expectedHeader/is,