diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2017-03-02 12:36:04 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2017-03-02 12:36:13 +0100 |
| commit | bf8c463f5bcb32b83cd6252d7f8cfb171523f353 (patch) | |
| tree | 95300470eb32ae30ff14edd3c9255a68c7a5ac7b | |
| parent | a7ff583e7edf46ae3bcf350d7c362199e5a62311 (diff) | |
| parent | fab5ce347c57827b86c658afdb33825cf095cb5e (diff) | |
| download | php-git-bf8c463f5bcb32b83cd6252d7f8cfb171523f353.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | ext/dom/document.c | 8 | ||||
| -rw-r--r-- | ext/dom/tests/bug74004.phpt | 14 |
3 files changed, 21 insertions, 5 deletions
@@ -2,7 +2,9 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? 2017, PHP 7.1.4 - +- DOM: + . Fixed bug #74004 (LIBXML_NOWARNING flag ingnored on loadHTML*). + (somedaysummer) 16 Mar 2017, PHP 7.1.3 diff --git a/ext/dom/document.c b/ext/dom/document.c index 18d652064e..cac6830077 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..91a4fbf922 --- /dev/null +++ b/ext/dom/tests/bug74004.phpt @@ -0,0 +1,14 @@ +--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(); +$doc->loadHTML("<tag-throw></tag-throw>",LIBXML_NOERROR); + +?> +===DONE=== +--EXPECT-- +===DONE=== |