c/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2 synced 2025-03-28 21:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

applied second patch from David Madore to be less intrusive when handling

Browse Source 
* xmlsave.c: applied second patch from David Madore to be less intrusive
  when handling scripts and style elements in XHTML1 should fix #316041
* test/xhtml1 result//xhtml1\*: updated the test accordingly
Daniel
This commit is contained in:
Daniel Veillard 2005-09-12 14:03:26 +00:00
parent 1db4a66b9a
commit dbd6105321
9 changed files with 33 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Mon Sep 12 16:02:12 CEST 2005 Daniel Veillard <daniel@veillard.com>
* xmlsave.c: applied second patch from David Madore to be less intrusive
when handling scripts and style elements in XHTML1 should fix #316041
* test/xhtml1 result//xhtml1\*: updated the test accordingly
Mon Sep 12 15:09:09 CEST 2005 Daniel Veillard <daniel@veillard.com>
* libxml.spec.in doc/devhelp/*: finished the integration with

2
result/noent/xhtml1
View File

@ -7,7 +7,7 @@
</head>
<!-- 4.8 -->
<script type="text/javascript"><![CDATA[
... unescaped script content ...
... unescaped script < content ...
]]></script>
<body>
<p>Moved to <a href="http://example.org/">example.org</a>.</p>

2
result/xhtml1
View File

@ -7,7 +7,7 @@
</head>
<!-- 4.8 -->
<script type="text/javascript"><![CDATA[
... unescaped script content ...
... unescaped script < content ...
]]></script>
<body>
<p>Moved to <a href="http://example.org/">example.org</a>.</p>

2
result/xhtml1.rde
View File

@ -19,7 +19,7 @@
1 1 script 0 0
2 3 #text 0 1
... unescaped script content ...
... unescaped script < content ...
1 15 script 0 0
1 14 #text 0 1

2
result/xhtml1.rdr
View File

@ -19,7 +19,7 @@
1 1 script 0 0
2 3 #text 0 1
... unescaped script content ...
... unescaped script < content ...
1 15 script 0 0
1 14 #text 0 1

6
result/xhtml1.sax
View File

@ -22,7 +22,11 @@ SAX.characters(
, 3)
SAX.startElement(script, type='text/javascript')
SAX.characters(
... unescaped script conten, 38)
... unescaped script , 24)
SAX.getEntity(lt)
SAX.characters(<, 1)
SAX.characters( content ...
, 15)
SAX.endElement(script)
SAX.characters(
, 3)

6
result/xhtml1.sax2
View File

@ -22,7 +22,11 @@ SAX.characters(
, 3)
SAX.startElementNs(script, NULL, NULL, 0, 1, 0, type='text...', 15)
SAX.characters(
... unescaped script conten, 38)
... unescaped script , 24)
SAX.getEntity(lt)
SAX.characters(<, 1)
SAX.characters( content ...
, 15)
SAX.endElementNs(script, NULL, NULL)
SAX.characters(
, 3)

2
test/xhtml1
View File

@ -9,7 +9,7 @@
</head>
<!-- 4.8 -->
<script type="text/javascript">
... unescaped script content ...
... unescaped script &lt; content ...
</script>
<body>
<p>Moved to <a href="http://example.org/">example.org</a>.</p>

23
xmlsave.c
View File

@ -1321,25 +1321,26 @@ xhtmlNodeDumpOutput(xmlSaveCtxtPtr ctxt, xmlNodePtr cur) {
xmlNodePtr child = cur->children;
while (child != NULL) {
if ((child->type == XML_TEXT_NODE) ||
(child->type == XML_CDATA_SECTION_NODE)) {
/*
* Apparently CDATA escaping for style just break on IE,
* mozilla and galeon, so ...
*/
if (xmlStrEqual(cur->name, BAD_CAST "style") &&
(xmlStrchr(child->content, '<') == NULL) &&
(xmlStrchr(child->content, '>') == NULL) &&
(xmlStrchr(child->content, '&') == NULL)) {
if (child->type == XML_TEXT_NODE) {
if ((xmlStrchr(child->content, '<') == NULL) &&
(xmlStrchr(child->content, '&') == NULL) &&
(xmlStrstr(child->content, BAD_CAST "]]>") == NULL)) {
/* Nothing to escape, so just output as is... */
/* FIXME: Should we do something about "--" also? */
int level = ctxt->level;
int indent = ctxt->format;
ctxt->level = 0;
ctxt->format = 0;
xhtmlNodeDumpOutput(ctxt, child);
xmlOutputBufferWriteString(buf, (const char *) child->content);
/* (We cannot use xhtmlNodeDumpOutput() here because
* we wish to leave '>' unescaped!) */
ctxt->level = level;
ctxt->format = indent;
} else {
/* We must use a CDATA section. Unfortunately,
* this will break CSS and JavaScript when read by
* a browser in HTML4-compliant mode. :-( */
start = end = child->content;
while (*end != '\0') {
if (*end == ']' &&