From: Micah Cowan <micah@cowan.name>
Date: Thu, 27 Nov 2008 05:55:12 +0000 (-0800)
Subject: Automated merge.
X-Git-Tag: v1.13~338^2~2^2
X-Git-Url: http://sjero.net/git/?p=wget;a=commitdiff_plain;h=78a765739543d5ca3bc83ad70f5d391b9d2af4f5

Automated merge.
---

78a765739543d5ca3bc83ad70f5d391b9d2af4f5
diff --cc src/init.c
index 06a4d3c8,991f570f..5ab0862c
--- a/src/init.c
+++ b/src/init.c
@@@ -332,7 -335,13 +335,15 @@@ defaults (void
  
    opt.max_redirect = 20;
  
 +  opt.waitretry = 10;
++
+ #ifdef ENABLE_IRI
+   opt.enable_iri = true;
+ #else
+   opt.enable_iri = false;
+ #endif
+   opt.locale = NULL;
+   opt.encoding_remote = NULL;
  }
  
  /* Return the user's home directory (strdup-ed), or NULL if none is
diff --cc tests/ChangeLog
index c3155848,ffe5fddd..16e7bd3b
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@@ -1,13 -1,11 +1,21 @@@
+ 2008-11-26  Micah Cowan  <micah@cowan.name>  (not copyrightable)
+ 
+ 	* Test-ftp-iri-disabled.px, Test-ftp-iri-fallback.px,
+ 	Test-ftp-iri.px, Test-idn-cmd.px, Test-idn-headers.px,
+ 	Test-idn-meta.px, Test-iri-disabled.px,
+ 	Test-iri-forced-remote.px, Test-iri-list.px, Test-iri.px: More
+ 	module-scope warnings.
+ 
 +2008-11-25  Steven Schubiger  <stsc@members.fsf.org>
 +
 +	* WgetTest.pm.in: Remove the magic interpreter line;
 +	replace -w with lexical warnings.
 +
 +2008-11-13  Steven Schubiger  <stsc@members.fsf.org>
 +
 +	* FTPServer.pm, FTPTest.pm, HTTPServer.pm, HTTPTest.pm,
 +	WgetTest.pm.in: Clean up leftover whitespace.
 +
  2008-11-12  Steven Schubiger  <stsc@members.fsf.org>
  
  	* Test-auth-basic.px, Test-auth-no-challenge.px,