Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:26297
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Received-SPF: error (pb1.pair.com: domain officinedigitali.it from 194.244.215.2 cause and error)
Message-ID: <454B2D25.1070304@officinedigitali.it>
Date: Fri, 03 Nov 2006 12:51:01 +0100
User-Agent: Mozilla Thunderbird 0.7.3 (X11/20040803)
MIME-Version: 1.0
To:  internals@lists.php.net
Content-Type: multipart/mixed;
 boundary="------------020407000208010802040504"
Subject: [PATCH] don't override error_reporting() in module dom
From: nsabbi@officinedigitali.it (Nico Sabbi)

--------------020407000208010802040504
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit

Hi,
this patch removes the prevaricative code in ext/dom/document.c that 
forcibly
reports errors in xml data overriding the error_reporting value set by 
the user.

If the user intentionally sets $dom->recover to true and disables E_WARNING
he obviously wants php to shut up in all cases, even when the xml fed to 
dom is broken;
php should obediently comply, not take initiatives on its own accord.

Please, consider this patch for inclusion in HEAD.

    Nico

--------------020407000208010802040504
Content-Type: text/x-patch;
 name="dom.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="dom.diff"

--- ext/dom/document.c.orig	2006-01-01 13:50:06.000000000 +0100
+++ ext/dom/document.c	2006-11-03 10:53:18.000000000 +0100
@@ -1512,18 +1512,11 @@
 #endif
 
 	ctxt->recovery = recover;
-	if (recover) {
-		old_error_reporting = EG(error_reporting);
-		EG(error_reporting) = old_error_reporting | E_WARNING;
-	}
 
 	xmlParseDocument(ctxt);
 
 	if (ctxt->wellFormed || recover) {
 		ret = ctxt->myDoc;
-		if (ctxt->recovery) {
-			EG(error_reporting) = old_error_reporting;
-		}
 		/* If loading from memory, set the base reference uri for the document */
 		if (ret->URL == NULL && ctxt->directory != NULL) {
 			ret->URL = xmlStrdup(ctxt->directory);

--------------020407000208010802040504--