From 4df993d89da9b78513a75611421e15e100829695 Mon Sep 17 00:00:00 2001
From: somedaysummer <info@timothytown.com>
Date: Fri, 27 Jan 2017 15:20:07 -0500
Subject: [PATCH] Fixed bug #74004 LIBXML_NOWARNING (etc) ignored by
 DOMDocument::loadHTML

---
 ext/dom/document.c          |  8 ++++----
 ext/dom/tests/bug74004.phpt | 15 +++++++++++++++
 2 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 ext/dom/tests/bug74004.phpt

diff --git a/ext/dom/document.c b/ext/dom/document.c
index cab0aa55ce..a884087f5f 100644
--- a/ext/dom/document.c
+++ b/ext/dom/document.c
@@ -2038,16 +2038,16 @@ static void dom_load_html(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{ */
 		RETURN_FALSE;
 	}
 
-	if (options) {
-		htmlCtxtUseOptions(ctxt, (int)options);
-	}
-
+	
 	ctxt->vctxt.error = php_libxml_ctx_error;
 	ctxt->vctxt.warning = php_libxml_ctx_warning;
 	if (ctxt->sax != NULL) {
 		ctxt->sax->error = php_libxml_ctx_error;
 		ctxt->sax->warning = php_libxml_ctx_warning;
 	}
+	if (options) {
+		htmlCtxtUseOptions(ctxt, (int)options);
+	}
 	htmlParseDocument(ctxt);
 	newdoc = ctxt->myDoc;
 	htmlFreeParserCtxt(ctxt);
diff --git a/ext/dom/tests/bug74004.phpt b/ext/dom/tests/bug74004.phpt
new file mode 100644
index 0000000000..853dfa5b09
--- /dev/null
+++ b/ext/dom/tests/bug74004.phpt
@@ -0,0 +1,15 @@
+--TEST--
+Bug #74004 (DOMDocument->loadHTML and ->loadHTMLFile do not heed LIBXML_NOWARNING and LIBXML_NOERROR options)
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
+--FILE--
+<?php
+
+$doc=new DOMDocument();
+libxml_use_internal_errors(true);
+$doc->loadHTML("<tag-throw-warning></tag-throw-warning>",LIBXML_NOWARNING|LIBXML_NOERROR);
+print count(libxml_get_errors());
+
+?>
+--EXPECT--
+0
-- 
2.40.0