# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: address@hidden
#   q4kjjboywb7bll21
# target_branch: file:///home/roadmr/wget/trunk/
# testament_sha1: 2fd79a983d7c0979befebdfbad35452457e71915
# timestamp: 2011-04-22 20:48:35 -0400
# base_revision_id: address@hidden
# 
# Begin patch
=== modified file 'src/ChangeLog'
--- src/ChangeLog	2011-04-19 12:40:21 +0000
+++ src/ChangeLog	2011-04-23 00:48:22 +0000
@@ -1,3 +1,9 @@
+2011-04-21  Daniel Manrique <address@hidden>
+	* main.c (main): Set exit status when invalid host name given in
+	command line.
+	* html-url.c (get_urls_file): Set exit status when invalid host
+	name given in input file.
+
 2011-04-19  Giuseppe Scrivano  <address@hidden>
 
 	* gnutls.c: Do not include <fcntl.h>.

=== modified file 'src/html-url.c'
--- src/html-url.c	2011-01-01 12:19:37 +0000
+++ src/html-url.c	2011-04-23 00:48:22 +0000
@@ -810,6 +810,7 @@
                      file, url_text, error);
           xfree (url_text);
           xfree (error);
+          inform_exit_status(URLERROR);
           continue;
         }
       xfree (url_text);

=== modified file 'src/main.c'
--- src/main.c	2011-03-21 12:14:20 +0000
+++ src/main.c	2011-04-23 00:48:22 +0000
@@ -1347,6 +1347,7 @@
           char *error = url_error (*t, url_err);
           logprintf (LOG_NOTQUIET, "%s: %s.\n",*t, error);
           xfree (error);
+          inform_exit_status(URLERROR);
         }
       else
         {
@@ -1387,7 +1388,9 @@
   if (opt.input_filename)
     {
       int count;
-      retrieve_from_file (opt.input_filename, opt.force_html, &count);
+      int status;
+      status = retrieve_from_file (opt.input_filename, opt.force_html, &count);
+      inform_exit_status(status);
       if (!count)
         logprintf (LOG_NOTQUIET, _("No URLs found in %s.\n"),
                    opt.input_filename);

=== added file 'tests/Test-invalid-host-as-input-file.px'
--- tests/Test-invalid-host-as-input-file.px	1970-01-01 00:00:00 +0000
+++ tests/Test-invalid-host-as-input-file.px	2011-04-23 00:48:22 +0000
@@ -0,0 +1,24 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+use HTTPTest;
+
+
+###############################################################################
+
+
+my $cmdline = $WgetTest::WGETPATH . " -i http://";
+
+my $expected_error_code = 1;
+
+###############################################################################
+
+my $the_test = HTTPTest->new (name => "Test-invalid-host-as-input-file",
+                              cmdline => $cmdline,
+                              errcode => $expected_error_code);
+exit $the_test->run();
+
+# vim: et ts=4 sw=4
+

=== added file 'tests/Test-invalid-host-command-line.px'
--- tests/Test-invalid-host-command-line.px	1970-01-01 00:00:00 +0000
+++ tests/Test-invalid-host-command-line.px	2011-04-23 00:48:22 +0000
@@ -0,0 +1,24 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+use HTTPTest;
+
+
+###############################################################################
+
+my $cmdline = $WgetTest::WGETPATH . " http://";
+
+my $expected_error_code = 1;
+
+
+###############################################################################
+
+my $the_test = HTTPTest->new (name => "Test-invalid-host-command-line",
+                              cmdline => $cmdline,
+                              errcode => $expected_error_code);
+exit $the_test->run();
+
+# vim: et ts=4 sw=4
+

=== added file 'tests/Test-invalid-host-from-file.px'
--- tests/Test-invalid-host-from-file.px	1970-01-01 00:00:00 +0000
+++ tests/Test-invalid-host-from-file.px	2011-04-23 00:48:22 +0000
@@ -0,0 +1,48 @@
+#!/usr/bin/env perl
+
+use strict;
+use warnings;
+
+use HTTPTest;
+
+
+###############################################################################
+
+my $urls = <<EOF;
+http://
+http://:8080
+EOF
+
+# code, msg, headers, content
+my %urls = (
+    '/urls.txt' => {
+        code => "200",
+        msg => "Ok",
+        headers => {
+            "Content-type" => "text/plain",
+        },
+        content => $urls,
+    },
+);
+
+my $cmdline = $WgetTest::WGETPATH . " -i http://localhost:{{port}}/urls.txt";
+
+my $expected_error_code = 1;
+
+my %expected_downloaded_files = (
+    'urls.txt' => {
+        content => $urls,
+    },
+);
+
+###############################################################################
+
+my $the_test = HTTPTest->new (name => "Test-invalid-host-from-file",
+                              input => \%urls,
+                              cmdline => $cmdline,
+                              errcode => $expected_error_code,
+                              output => \%expected_downloaded_files);
+exit $the_test->run();
+
+# vim: et ts=4 sw=4
+

=== modified file 'tests/run-px'
--- tests/run-px	2010-05-29 21:10:59 +0000
+++ tests/run-px	2011-04-23 00:48:22 +0000
@@ -40,6 +40,9 @@
     'Test-HTTP-Content-Disposition.px',
     'Test-i-ftp.px',
     'Test-i-http.px',
+    'Test-invalid-host-as-input-file.px',
+    'Test-invalid-host-command-line.px',
+    'Test-invalid-host-from-file.px',
     'Test-idn-headers.px',
     'Test-idn-meta.px',
     'Test-idn-cmd.px',

# Begin bundle
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
XBJWiCgOXOwCwaeohqknSVphdyRThQkEFcvdcA==