Please review this patch.
Tim
>From b30500f0f499b8459c20dfc859ff7ac2180b6b34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20R=C3=BChsen?= <[email protected]>
Date: Sun, 20 Dec 2015 21:32:06 +0100
Subject: [PATCH] Fix Test-iri-forced-remote
* tests/Test-iri-forced-remote.px: Fix encodings
---
src/url.c | 4 ++--
tests/Test-iri-forced-remote.px | 10 ++++------
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/url.c b/src/url.c
index ca7fe29..3e07079 100644
--- a/src/url.c
+++ b/src/url.c
@@ -1537,9 +1537,9 @@ append_uri_pathel (const char *b, const char *e, bool escaped,
}
static char *
-convert_fname (const char *fname)
+convert_fname (char *fname)
{
- char *converted_fname = (char *)fname;
+ char *converted_fname = fname;
#if HAVE_ICONV
const char *from_encoding = opt.encoding_remote;
const char *to_encoding = opt.locale;
diff --git a/tests/Test-iri-forced-remote.px b/tests/Test-iri-forced-remote.px
index 5dee3bb..7908de8 100755
--- a/tests/Test-iri-forced-remote.px
+++ b/tests/Test-iri-forced-remote.px
@@ -27,8 +27,6 @@ my $eacute_l1 = "\xE9";
my $eacute_u8 = "\xC3\xA9";
my $eurosign_l15 = "\xA4";
my $eurosign_u8 = "\xE2\x82\xAC";
-my $currency_l1 = "\xA4";
-my $currency_u8 = "\xC2\xA4";
my $pageindex = <<EOF;
<html>
@@ -120,8 +118,8 @@ my %urls = (
code => "200",
msg => "Ok",
headers => {
- # wrong charset here, overridden by --remote-encoding=iso-8859-1
- "Content-type" => "text/html; charset=UTF-8",
+ # wrong charset specified by meta tag in $pagefrancais, overridden by HTTP Content-Type
+ "Content-type" => "text/html; charset=iso-8859-1",
},
content => $pagefrancais,
},
@@ -151,7 +149,7 @@ my %urls = (
},
);
-my $cmdline = $WgetTest::WGETPATH . " --iri -e robots=on --trust-server-names --remote-encoding=iso-8859-1 -nH -r http://localhost:{{port}}/";;
+my $cmdline = $WgetTest::WGETPATH . " --iri -e robots=on --trust-server-names --local-encoding=utf-8 -nH -r http://localhost:{{port}}/";;
my $expected_error_code = 0;
@@ -168,7 +166,7 @@ my %expected_downloaded_files = (
"p2_${eacute_u8}${eacute_u8}n.html" => {
content => $pageeen,
},
- "p3_${currency_u8}${currency_u8}${currency_u8}.html" => {
+ "p3_${eurosign_u8}${eurosign_u8}${eurosign_u8}.html" => {
content => $pageeuro,
},
);
--
2.6.4
