Skip to content

Correction de l'emplacement du meta avec l'encodage : Dans le head #227

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Correction de l'emplacement du meta avec l'encodage : Dans le head #227

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
fd352fb
Correction de l'emplacement du meta avec l'encodage : Dans le head
emmguyot May 26, 2022
43646ba
Supprime les meta charset en double du fait du forçage par httrack
emmguyot May 26, 2022
2d833f8
Evite d'avoir le tag base vide
emmguyot May 28, 2022
e6a59fc
Correction si meta tag derrière le content type. Issue https://github…
emmguyot Jan 28, 2024
50b525a
Merge branch 'xroche:master' into master
emmguyot Jan 28, 2024
62399ca
Rétablissement commentaire par défaut pour merge request
emmguyot Jan 28, 2024
45ceddb
Merge branch 'xroche:master' into master
emmguyot Dec 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 69 additions & 7 deletions src/htsparse.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,10 @@ int htsparse(htsmoduleStruct * str, htsmoduleStructExtended * stre) {

//
int emited_footer = 0; // emitted footer comment tag(s) count
int emited_footer_todo = 0; // Flag pour mise à jour différée

int skip_until_end_of_tag = 0; // Skip until the > of the end of tag ?

//
int parent_relative = 0; // the parent is the base path (.js, .css..)

Expand Down Expand Up @@ -661,6 +664,7 @@ int htsparse(htsmoduleStruct * str, htsmoduleStructExtended * stre) {
/* Meta ? */
if (check_tag(intag_start, "meta")) {
int pos;
int please_skip_tag = 0;

// <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
if ((pos = rech_tageq_all(html, "http-equiv"))) {
Expand All @@ -669,14 +673,54 @@ int htsparse(htsmoduleStruct * str, htsmoduleStructExtended * stre) {

if (len > 0) {
if (strfield(token, "content-type")) {
intag_ctype = 1;
//NOPE-we do not convert the whole page actually
//intag_start[1] = 'X';
if ((emited_footer > 0) || (emited_footer_todo > 0)) {
// Skip this tag that is redundant
please_skip_tag = 1;
}
else {
intag_ctype = 1;
//NOPE-we do not convert the whole page actually
//intag_start[1] = 'X';
}
} else if (strfield(token, "refresh")) {
intag_ctype = 2;
}
}
}
else if ((pos = rech_tageq_all(html, "charset"))) {
if ((emited_footer > 0) || (emited_footer_todo > 0)) {
// Skip this tag that is redundant
please_skip_tag = 1;
}
}

if (please_skip_tag == 1) {
if (html - r->adr < r->size) {
/* Not on a starting tag yet */
const char *adr_next = html + 1;

while(*adr_next != '<' && (adr_next - r->adr) < r->size) {
adr_next++;
}
/* Jump to near end (index hack) */
if (!adr_next || *adr_next != '<') {
if (html - r->adr < r->size - 4
&& r->size > 4
) {
html = r->adr + r->size - 2;
}
} else {
html = adr_next;
}
}
lastsaved = html;
}
}

if (check_tag(intag_start, "base")) {
// Base tag will be empty so don't write it
html += 5;
lastsaved = html;
}

if (opt->getmode & 1) { // sauver html
Expand All @@ -685,15 +729,19 @@ int htsparse(htsmoduleStruct * str, htsmoduleStructExtended * stre) {
case 0:
// We are looking for the first head so that we can declare the HTTP-headers charset early
// Emit as soon as we see the first <head>, <meta>, or <body> tag.
// FIXME: we currently emit the tag BEFORE the <head> tag, actually, which is not clean
if ((p = strfield(html, "<head>")) != 0
|| ((p = strfield(html, "<head")) != 0 && isspace(html[p]))
|| (p = strfield(html, "<body>")) != 0
if ((p = strfield(html, "<body>")) != 0
|| ((p = strfield(html, "<body")) != 0 && isspace(html[p]))
|| ((p = strfield(html, "<meta")) != 0 && isspace(html[p]))
|| (emited_footer_todo == 2)
) {
emited_footer++;
p = 1; // fake value, but not 0
} else {
if ((p = strfield(html, "<head>")) != 0
|| ((p = strfield(html, "<head")) != 0 && isspace(html[p]))) {
// mémorise qu'à la fermeture du tag, il faudra sortir le code
emited_footer_todo = 1;
}
p = 0;
}
break;
Expand Down Expand Up @@ -765,6 +813,9 @@ int htsparse(htsmoduleStruct * str, htsmoduleStructExtended * stre) {
}
} else if (!incomment) {
intag = 0; //inquote=0;
if (emited_footer_todo) {
emited_footer_todo = 2; // A afficher au prochain
}

// entrée dans du javascript?
// on parse ICI car il se peut qu'on ait eu a parser les src=.. dedans
Expand All @@ -790,6 +841,13 @@ int htsparse(htsmoduleStruct * str, htsmoduleStructExtended * stre) {
}
}
}

if (skip_until_end_of_tag == 1) {
html++;
lastsaved = html;
skip_until_end_of_tag = 0;
}

} else { /* end of comment? */
// vérifier fermeture correcte
if ((*(html - 1) == '-') && (*(html - 2) == '-')) {
Expand Down Expand Up @@ -2536,6 +2594,10 @@ int htsparse(htsmoduleStruct * str, htsmoduleStructExtended * stre) {
// écrire lien
if ((p_type == 2) || (p_type == -2)) { // base href ou codebase, sauter
lastsaved = eadr - 1 + 1; // sauter "
if (check_tag(intag_start, "base")) {
// Skip until the end of the tag
skip_until_end_of_tag = 1;
}
}
/* */
else if (opt->urlmode == 0) { // URL absolue dans tous les cas
Expand Down