From de3bd06b7cef7edf26a75fbecde5ec3c0b255ee6 Mon Sep 17 00:00:00 2001 From: "gavin%gavinsharp.com" Date: Sat, 11 Nov 2006 05:26:26 +0000 Subject: [PATCH] Bug 358570: OpenSearch plugins should default to encoding search queries in UTF-8 (fix garbled text for certain Japanese plugins that omit the InputEncoding element), patch by KUROSAWA, Takeshi(taken) , r=me git-svn-id: svn://10.0.0.236/trunk@215152 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/browser/components/search/nsSearchService.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mozilla/browser/components/search/nsSearchService.js b/mozilla/browser/components/search/nsSearchService.js index f8094df3314..6af92302c00 100755 --- a/mozilla/browser/components/search/nsSearchService.js +++ b/mozilla/browser/components/search/nsSearchService.js @@ -149,6 +149,7 @@ const OS_PARAM_OUTPUT_ENCODING = /\{outputEncoding\??\}/g; // Default values const OS_PARAM_LANGUAGE_DEF = "*"; const OS_PARAM_OUTPUT_ENCODING_DEF = "UTF-8"; +const OS_PARAM_INPUT_ENCODING_DEF = "UTF-8"; // "Unsupported" OpenSearch parameters. For example, we don't support // page-based results, so if the engine requires that we send the "page index" @@ -1512,6 +1513,9 @@ Engine.prototype = { _parseAsOpenSearch: function SRCH_ENG_parseAsOS() { var doc = this._data; + // The OpenSearch spec sets a default value for the input encoding. + this._queryCharset = OS_PARAM_INPUT_ENCODING_DEF; + for (var i = 0; i < doc.childNodes.length; ++i) { var child = doc.childNodes[i]; switch (child.localName) {