Stop setting parse options directly

nielsdos · nielsdos · commit fc5a6b2619d3 · 2024-07-05T21:10:28.000+02:00
Setting this directly will be deprecated in libxml2 2.14.
diff --git a/ext/xml/compat.c b/ext/xml/compat.c
@@ -471,9 +471,8 @@ XML_ParserCreate_MM(const XML_Char *encoding, const XML_Memory_Handling_Suite *m
 	}
 
 	php_libxml_sanitize_parse_ctxt_options(parser->parser);
-	xmlCtxtUseOptions(parser->parser, XML_PARSE_OLDSAX);
+	xmlCtxtUseOptions(parser->parser, XML_PARSE_OLDSAX | XML_PARSE_NOENT);
 
-	parser->parser->replaceEntities = 1;
 	parser->parser->wellFormed = 0;
 	if (sep != NULL) {
 		/* Note: sax2 flag will be set due to the magic number in `initialized` in php_xml_compat_handlers */

Original file line number	Diff line number	Diff line change
`@@ -471,9 +471,8 @@ XML_ParserCreate_MM(const XML_Char encoding, const XML_Memory_Handling_Suite m`
`471`	`471`	`}`
`472`	`472`
`473`	`473`	`php_libxml_sanitize_parse_ctxt_options(parser->parser);`
`474`		`- xmlCtxtUseOptions(parser->parser, XML_PARSE_OLDSAX);`
	`474`	`+ xmlCtxtUseOptions(parser->parser, XML_PARSE_OLDSAX \| XML_PARSE_NOENT);`
`475`	`475`
`476`		`- parser->parser->replaceEntities = 1;`
`477`	`476`	`parser->parser->wellFormed = 0;`
`478`	`477`	`if (sep != NULL) {`
`479`	`478`	/* Note: sax2 flag will be set due to the magic number in `initialized` in php_xml_compat_handlers */