IDN test.

diff --git a/tests/ChangeLog b/tests/ChangeLog
index f2179763b317685493e140bf8b6d4e8a7decf482..7eb375637098ec8ce2ee676c9a8787c76c08f12f 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,15 @@
+2008-08-28  Micah Cowan  <micah@cowan.name>
+
+       * HTTPServer.pm (run): Allow distinguishing between hostnames,
+       when used as a proxy.
+
+       * Test-idn-headers.px: Added.
+
+       * run-px: Added Test-idn-headers.px.
+
+       * Test-proxy-auth-basic.px: Use the full URL, rather than just the
+       path (made necessary by the accompanying change to HTTPServer.pm).
+
 2008-08-14  Xavier Saint <wget@sxav.eu>
        
        * Test-iri-list.px : Fetch files from a remote list.

diff --git a/tests/HTTPServer.pm b/tests/HTTPServer.pm
index b76f0985742af738c1ddb2ed3514aa1a9afd7a3e..01c36957535268e6bc3e693786350f6fc518dd2b 100644 (file)
--- a/tests/HTTPServer.pm
+++ b/tests/HTTPServer.pm
@@ -27,7 +27,8 @@ sub run {
         my $con = $self->accept();
         print STDERR "Accepted a new connection\n" if $log;
         while (my $req = $con->get_request) {
-            my $url_path = $req->url->path;
+            #my $url_path = $req->url->path;
+            my $url_path = $req->url->as_string;
             if ($url_path =~ m{/$}) { # append 'index.html'
                 $url_path .= 'index.html';
             }

diff --git a/tests/Test-idn-headers.px b/tests/Test-idn-headers.px
new file mode 100755 (executable)
index 0000000..3289d5f
--- /dev/null
+++ b/tests/Test-idn-headers.px
@@ -0,0 +1,65 @@
+#!/usr/bin/perl -w
+
+use strict;
+
+use HTTPTest;
+
+# " Kon'nichiwa <dot> Japan
+my $euc_jp_hostname = "\272\243\306\374\244\317.\306\374\313\334";
+my $punycoded_hostname = 'xn--v9ju72g90p.xn--wgv71a';
+
+###############################################################################
+
+my $starter_file = <<EOF;
+<a href="http://$euc_jp_hostname/">The link</a>
+EOF
+
+my $result_file = <<EOF;
+Found me!
+EOF
+
+# code, msg, headers, content
+my %urls = (
+    'http://start-here.com/start.html' => {
+        code => "200",
+        msg => "You want fries with that?",
+        headers => {
+            'Content-Type' => 'text/html; charset=EUC-JP',
+        },
+        content => $starter_file,
+    },
+    "http://$punycoded_hostname/index.html" => {
+        code => "200",
+        msg => "Yes, please",
+        headers => {
+            'Content-Type' => 'text/plain',
+        },
+        content => $result_file,
+    },
+);
+
+my $cmdline = $WgetTest::WGETPATH . " --debug --iri -rH"
+    . " -e http_proxy=localhost:{{port}} http://start-here.com/start.html";
+
+my $expected_error_code = 0;
+
+my %expected_downloaded_files = (
+    'start-here.com/start.html' => {
+        content => $starter_file,
+    },
+    "$punycoded_hostname/index.html" => {
+        content => $result_file,
+    },
+);
+
+###############################################################################
+
+my $the_test = HTTPTest->new (name => "Test-iri-headers",
+                              input => \%urls, 
+                              cmdline => $cmdline, 
+                              errcode => $expected_error_code, 
+                              output => \%expected_downloaded_files);
+exit $the_test->run();
+
+# vim: et ts=4 sw=4
+

diff --git a/tests/Test-proxy-auth-basic.px b/tests/Test-proxy-auth-basic.px
index e440a3927900b9c2c7ca14f17f3fb457548b64ce..e3934d7d357ca4312245b4deb301ba3b946cc379 100755 (executable)
--- a/tests/Test-proxy-auth-basic.px
+++ b/tests/Test-proxy-auth-basic.px
@@ -11,7 +11,7 @@ my $wholefile = "You're all authenticated.\n";
 
 # code, msg, headers, content
 my %urls = (
-    '/needs-auth.txt' => {
+    'http://no.such.domain/needs-auth.txt' => {
         auth_method => 'Basic',
         user => 'fiddle-dee-dee',
         passwd => 'Dodgson',

diff --git a/tests/run-px b/tests/run-px
index c18c8d85ac227de593e20fc03244b4ae09ca4b4f..c2380d5b20ae005afb46d8ee96d3e4aa07dc079b 100755 (executable)
--- a/tests/run-px
+++ b/tests/run-px
@@ -23,6 +23,7 @@ my @tests = (
     'Test-HTTP-Content-Disposition-1.px',
     'Test-HTTP-Content-Disposition-2.px',
     'Test-HTTP-Content-Disposition.px',
+    'Test-idn-headers.px',
     'Test-iri.px',
     'Test-iri-disabled.px',
     'Test-iri-forced-remote.px',