Commit graph

87 commits

Author SHA1 Message Date
Christoph M. Becker
c37beb7eb5 Merge branch 'PHP-7.3'
* PHP-7.3:
  Fix #71592: External entity processing never fails
2018-10-27 17:31:29 +02:00
Christoph M. Becker
829b0df77b Fix #71592: External entity processing never fails
If the callback set via `xml_set_external_entity_ref_handler()` returns
a falsy value, parsing is supposed to stop and the error number set to
`XML_ERROR_EXTERNAL_ENTITY_HANDLING`.  This is already correctly done
by the libexpat binding, but the libxml2 binding ignores the return
value.  We fix this by calling `xmlStopParser()` which is available as
of libxml 2.1.0[1] (PHP-7.1 requires at least libxml 2.6.11 anyway),
and setting the desired `errNo` ourselves.

[1] <http://xmlsoft.org/news.html>
2018-10-27 17:30:13 +02:00
Nikita Popov
74235ca5f3 Bump minimum libxml version to 2.7.6
Released Oct 2009, part of RHEL 6.
2018-09-23 15:51:09 +02:00
Xinchen Hui
a6519d0514 year++ 2018-01-02 12:57:58 +08:00
Dmitry Stogov
9e709e2fa0 Move constants into read-only data segment 2017-12-14 18:43:44 +03:00
Sammy Kaye Powers
9e29f841ce Update copyright headers to 2017 2017-01-02 09:30:12 -06:00
Joe Watkins
54fbc27270 Merge branch 'master' of git.php.net:/php-src 2016-11-13 05:40:49 +00:00
Joe Watkins
f77be645bc news entry for #1787 2016-11-13 05:37:49 +00:00
Nikita Popov
547ad56b31 Fix build 2016-11-12 22:17:21 +01:00
Edgar R. Sandi
81e9a0d075 fixed bug generated by fixes bug #73135 2016-11-12 17:49:25 +00:00
Edgar R. Sandi
72be8de39f fixed bug generated by fixes bug #73135 2016-11-12 17:43:16 +00:00
Edgar R. Sandi
319822b050 fixes bug #73135 2016-11-12 17:43:16 +00:00
Lior Kaplan
ed35de784f Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Happy new year (Update copyright to 2016)
2016-01-01 19:48:25 +02:00
Lior Kaplan
49493a2dcf Happy new year (Update copyright to 2016) 2016-01-01 19:21:47 +02:00
Anatol Belski
ffabfc703d fix exports 2015-03-23 15:09:06 +01:00
Xinchen Hui
fc33f52d8c bump year 2015-01-15 23:27:30 +08:00
Xinchen Hui
0579e8278d bump year 2015-01-15 23:26:37 +08:00
Stanislav Malyshev
b7a7b1a624 trailing whitespace removal 2015-01-10 15:07:38 -08:00
Johannes Schlüter
d0cb715373 s/PHP 5/PHP 7/ 2014-09-19 18:33:14 +02:00
Nikita Popov
17cb2443a7 Fix ext/xml warnings 2014-09-06 12:26:41 +02:00
Xinchen Hui
c081ce628f Bump year 2014-01-03 11:08:10 +08:00
Christopher Jones
db0166af2f Tabify 2013-08-20 10:46:15 -07:00
Christopher Jones
0ab8475db2 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Eliminate compiler warnings: "warning: pointer targets in initialization differ in signedness"
  Eliminate compiler warnings "warning: pointer targets in initialization differ in signedness"
2013-08-20 10:42:20 -07:00
Christopher Jones
eba85f91d8 Eliminate compiler warnings "warning: pointer targets in initialization differ in signedness" 2013-08-20 10:41:01 -07:00
Veres Lajos
144eab0889 code related typo fixes 2013-08-18 13:46:32 -07:00
Xinchen Hui
a666285bc2 Happy New Year 2013-01-01 16:37:09 +08:00
Xinchen Hui
0a7395e009 Happy New Year 2013-01-01 16:28:54 +08:00
Felipe Pena
8775a37559 - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
4e19825281 - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
0203cc3d44 - Year++ 2011-01-01 02:17:06 +00:00
Sebastian Bergmann
9ba1e81665 sed -i "s#1997-2009#1997-2010#g" **/*.c **/*.h **/*.php 2010-01-03 09:23:27 +00:00
Scott MacVicar
b4fa66e858 Fix build, missing comma 2009-01-12 14:28:05 +00:00
Scott MacVicar
534c200925 The previous error was masked by a missing entry, sync them back up. 2009-01-12 14:26:47 +00:00
Scott MacVicar
b6f32086f9 This entry doesn't exist upstream any more, it also caused all error messages to be one off. 2009-01-12 13:34:33 +00:00
Rob Richards
d14021cb4e MFH: fix bug #45996 (libxml2 2.7 causes breakage with character data in xml_parse()) 2009-01-11 12:01:16 +00:00
Sebastian Bergmann
08659c2dcd MFH: Bump copyright year, 3 of 3. 2008-12-31 11:15:49 +00:00
Rob Richards
ca954ad613 MFH: fix bug #46699: (xml_parse crash when parser is namespace aware)
fix a couple warnings
add test
2008-12-12 04:16:21 +00:00
Sebastian Bergmann
d1dded8751 MFH: Bump copyright year, 2 of 2. 2007-12-31 07:17:19 +00:00
Sebastian Bergmann
4223aa4d5e MFH: Bump year. 2007-01-01 09:36:18 +00:00
foobar
5bd93221a8 bump year and license version 2006-01-01 12:51:34 +00:00
Rob Richards
fc4ebee3e3 MFH: Fixed bug #35447 (xml_parse_into_struct() chokes on the UTF-8 BOM)
add test
2005-12-19 14:17:30 +00:00
Rob Richards
2580744813 MFH: use spprintf where appropriate 2005-10-12 13:58:10 +00:00
Rob Richards
855f7dfd95 MFH: Fixed Bug #27908 (xml default_handlers not being called)
Fix memleak when entitydecls are parsed
remove old ifdefs
2005-10-12 03:21:05 +00:00
foobar
23e671a51e - Bumber up year 2005-08-03 14:08:58 +00:00
Rob Richards
0cbcd08e7c SystemID and publicID params reversed in declaration handlers 2005-07-31 17:14:13 +00:00
foobar
a8b29a2e8f - Made it possible to build ext/xmlrpc with libxml2 2005-03-26 03:13:58 +00:00
Rob Richards
bd5e6e6232 Fixed bug #32001 (xml_parse_into_struct() exceeds maximum execution time) 2005-03-02 18:13:34 +00:00
Joe Orton
4f4cb65300 Declare error_mapping array as static and more const. 2005-02-17 15:05:16 +00:00
Rob Richards
b462fc8bd2 Fixed bug #31139 (XML Parser Functions seem to drop &amp; when parsing) 2004-12-17 12:20:50 +00:00
Rob Richards
a7cd9768d1 internal entities get expanded if no default handler but cdata handler exists 2004-11-21 14:25:15 +00:00