|
a/src/internfile/myhtmlparse.cpp |
|
b/src/internfile/myhtmlparse.cpp |
|
... |
|
... |
| 389 |
map<string, string>::const_iterator k;
|
389 |
map<string, string>::const_iterator k;
|
| 390 |
if ((k = p.params.find(cstr_charset)) !=
|
390 |
if ((k = p.params.find(cstr_charset)) !=
|
| 391 |
p.params.end()) {
|
391 |
p.params.end()) {
|
| 392 |
charset = k->second;
|
392 |
charset = k->second;
|
| 393 |
if (!samecharset(charset, fromcharset)) {
|
393 |
if (!samecharset(charset, fromcharset)) {
|
| 394 |
LOGDEB1(("Doc specified charset '%s' "
|
394 |
LOGDEB1(("Doc http-equiv charset '%s' "
|
| 395 |
"differs from dir deflt '%s'\n",
|
395 |
"differs from dir deflt '%s'\n",
|
| 396 |
charset.c_str(),
|
396 |
charset.c_str(),
|
| 397 |
fromcharset.c_str()));
|
397 |
fromcharset.c_str()));
|
| 398 |
throw false;
|
398 |
throw false;
|
| 399 |
}
|
399 |
}
|
| 400 |
}
|
400 |
}
|
| 401 |
}
|
401 |
}
|
|
|
402 |
}
|
|
|
403 |
}
|
|
|
404 |
string newcharset;
|
|
|
405 |
if (get_parameter(cstr_charset, newcharset)) {
|
|
|
406 |
// HTML5 added: <meta charset="...">
|
|
|
407 |
lowercase_term(newcharset);
|
|
|
408 |
charset = newcharset;
|
|
|
409 |
if (!samecharset(charset, fromcharset)) {
|
|
|
410 |
LOGDEB1(("Doc html5 charset '%s' "
|
|
|
411 |
"differs from dir deflt '%s'\n",
|
|
|
412 |
charset.c_str(),
|
|
|
413 |
fromcharset.c_str()));
|
|
|
414 |
throw false;
|
| 402 |
}
|
415 |
}
|
| 403 |
}
|
416 |
}
|
| 404 |
break;
|
417 |
break;
|
| 405 |
}
|
418 |
}
|
| 406 |
if (tag == "marquee" || tag == "menu" || tag == "multicol")
|
419 |
if (tag == "marquee" || tag == "menu" || tag == "multicol")
|