opt.remote_encoding should not override opt.locale, add a force arguments to set_uri_...

[wget] / src / iri.c

diff --git a/src/iri.c b/src/iri.c
index 783aa331a5acef9ccc951f9883f18f1f8271f3b8..3ee99871273ad76c4d115c015bcb751653e93ec3 100644 (file)
--- a/src/iri.c
+++ b/src/iri.c
@@ -329,10 +329,10 @@ iri_free (struct iri *i)
 }
 
 void
-set_uri_encoding (struct iri *i, char *charset)
+set_uri_encoding (struct iri *i, char *charset, bool force)
 {
-  logprintf (LOG_VERBOSE, "[ uri = `%s'\n", charset);
-  if (opt.encoding_remote)
+  DEBUGP (("[IRI uri = `%s'\n", quote (charset)));
+  if (!force && opt.encoding_remote)
     return;
   if (i->uri_encoding)
     {
@@ -347,7 +347,7 @@ set_uri_encoding (struct iri *i, char *charset)
 void
 set_content_encoding (struct iri *i, char *charset)
 {
-  logprintf (LOG_VERBOSE, "[ content = `%s'\n", charset);
+  DEBUGP (("[IRI content = %s\n", quote (charset)));
   if (opt.encoding_remote)
     return;
   if (i->content_encoding)