mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Fixes bug 80020 "Accept-Language and Accept-Charset format error" 

patch=havill@redhat.com, r=bbaetz, sr=darin, a=asa
This commit is contained in:
darin%netscape.com 2001-06-12 22:17:31 +00:00
Родитель 7fcde8cbe5
Коммит e51b95f598
1 изменённых файлов: 7 добавлений и 7 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

14
netwerk/protocol/http/src/nsHttpHandler.cpp
Просмотреть файл

@ -1209,10 +1209,10 @@ nsHttpHandler::CreateServicesFromCategory(const char *category)
* 1.0 amongst the number of languages present.
*
* Ex: passing: "en, ja"
* returns: "en, ja; q=0.500"
* returns: "en, ja;q=0.50"
*
* passing: "en, ja, fr_CA"
* returns: "en, ja; q=0.667, fr_CA; q=0.333"
* returns: "en, ja;q=0.66, fr_CA;q=0.33"
*/
static nsresult
PrepareAcceptLanguages(const char *i_AcceptLanguages, nsACString &o_AcceptLanguages)
@ -1257,7 +1257,7 @@ PrepareAcceptLanguages(const char *i_AcceptLanguages, nsACString &o_AcceptLangua
if (*token != '\0') {
comma = n++ != 0 ? ", " : ""; // delimiter if not first item
if (q < 0.9995)
wrote = PR_snprintf(p2, available, "%s%s; q=%1.3f", comma, token, q);
wrote = PR_snprintf(p2, available, "%s%s;q=0.%02u", comma, token, (unsigned) (q * 100.0));
else
wrote = PR_snprintf(p2, available, "%s%s", comma, token);
q -= dec;
@ -1293,7 +1293,7 @@ nsHttpHandler::SetAcceptLanguages(const char *aAcceptLanguages)
* comma delimited and with q values set for each charset in decending order.
*
* Ex: passing: "euc-jp"
* returns: "euc-jp, utf-8; q=0.667, *; q=0.667"
* returns: "euc-jp, utf-8;q=0.667, *;q=0.667"
*
* passing: "UTF-8"
* returns: "UTF-8, *"
@ -1354,7 +1354,7 @@ PrepareAcceptCharsets(const char *i_AcceptCharset, nsACString &o_AcceptCharset)
if (*token != '\0') {
comma = n++ != 0 ? ", " : ""; // delimiter if not first item
if (q < 0.9995)
wrote = PR_snprintf(p2, available, "%s%s; q=%1.3f", comma, token, q);
wrote = PR_snprintf(p2, available, "%s%s;q=0.%02u", comma, token, (unsigned) (q * 100.0));
else
wrote = PR_snprintf(p2, available, "%s%s", comma, token);
q -= dec;
@ -1366,7 +1366,7 @@ PrepareAcceptCharsets(const char *i_AcceptCharset, nsACString &o_AcceptCharset)
if (add_utf) {
comma = n++ != 0 ? ", " : ""; // delimiter if not first item
if (q < 0.9995)
wrote = PR_snprintf(p2, available, "%sutf-8; q=%1.3f", comma, q);
wrote = PR_snprintf(p2, available, "%sutf-8;q=0.%02u", comma, (unsigned) (q * 100.0));
else
wrote = PR_snprintf(p2, available, "%sutf-8", comma);
q -= dec;
@ -1383,7 +1383,7 @@ PrepareAcceptCharsets(const char *i_AcceptCharset, nsACString &o_AcceptCharset)
q += dec;
if (q < 0.9995) {
wrote = PR_snprintf(p2, available, "%s*; q=%1.3f", comma, q);
wrote = PR_snprintf(p2, available, "%s*;q=0.%02u", comma, (unsigned) (q * 100.0));
}
else
wrote = PR_snprintf(p2, available, "%s*", comma);