Commit Graph

298 Commits

Author SHA1 Message Date
Felipe Pena
16b293de50 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  - Move checking
2014-05-10 11:55:45 -03:00
Felipe Pena
c575ab0c88 - Move checking 2014-05-10 11:55:42 -03:00
Felipe Pena
8bea8cf9cd Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  - Fixed missing NULL check in SimpleXMLElement::xpath()
2014-05-10 11:53:45 -03:00
Felipe Pena
345f6d90d5 - Fixed missing NULL check in SimpleXMLElement::xpath() 2014-05-10 11:53:40 -03:00
Felipe Pena
2379ec474e Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  - Fixed missing NULL check
2014-05-10 11:39:28 -03:00
Felipe Pena
5bd443a452 - Fixed missing NULL check 2014-05-10 11:39:08 -03:00
Anatol Belski
bbfda90d72 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fixed bug #66084 simplexml_load_string() mangles empty node name
2014-04-05 09:47:14 +02:00
Anatol Belski
a0beddf5e9 Fixed bug #66084 simplexml_load_string() mangles empty node name 2014-04-05 09:46:24 +02:00
Xinchen Hui
47c9027772 Bump year 2014-01-03 11:06:16 +08:00
Xinchen Hui
c0d060f5c0 Bump year 2014-01-03 11:04:26 +08:00
Christopher Jones
39612afc72 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings.

Conflicts:
	ext/dba/libinifile/inifile.c
2013-08-14 20:43:25 -07:00
Christopher Jones
9ad97cd489 Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings. 2013-08-14 20:36:50 -07:00
Nikita Popov
fcc6611de9 Add support for non-scalar Iterator keys in foreach
RFC: https://wiki.php.net/rfc/foreach-non-scalar-keys
2013-03-12 17:27:31 +01:00
Nikita Popov
a59b211b2d Fix get_property_ptr_ptr declaration in simplexml
A new parameter was added to the API and simplexml wasn't adjusted,
thus causing crashes.
2013-03-09 20:15:00 +01: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
Dmitry Stogov
df97c3aa0d Use get_gc instead of hacks of get_properties 2012-12-05 17:58:36 +04:00
Rob Richards
c5a611b257 Merge branch 'PHP-5.3' into PHP-5.4
# By Daniel Veillard
* PHP-5.3:
  Update to work with libxml 2.9.0
2012-08-09 14:24:50 -04:00
Daniel Veillard
c4b26cc1b0 Update to work with libxml 2.9.0 2012-08-09 14:02:33 -04:00
Lonny Kapelushnik
f1ef8b327f Implements feature 55218
Allows you to recursively check namespaces under a child node
instead of from the root of the XML doc
2012-06-21 22:34:46 -04:00
David Soria Parra
c918ca57a7 Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Replace $Revision$ with $Id$ in keyword expansion enable files
  Enable $Id$ expansion for files with the $Revision$ keyword

Conflicts:
	ext/mysqlnd/mysqlnd.h
2012-03-20 17:58:58 +01:00
David Soria Parra
f7b10abae9 Replace $Revision$ with $Id$ in keyword expansion enable files 2012-03-20 17:53:47 +01:00
Felipe Pena
e4ca0ed09f - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
4e19825281 - Year++ 2012-01-01 13:15:04 +00:00
Christian Stocker
e1813b69c5 Merge from Trunk
simplexml->query returns empty array if no nodes were found
and false if libxml thinks the xpath-expression was invalid.
Behaves now the same like DomXPath and fixes Bug #48601
Adjusted a test to reflect that change
2011-09-01 13:42:45 +00:00
Christian Stocker
13fa5542f7 simplexml->query returns empty array if no nodes were found
and false if libxml thinks the xpath-expression was invalid.
Behaves now the same like DomXPath and fixes Bug #48601
Adjusted a test to reflect that change
2011-08-31 11:44:22 +00:00
Felipe Pena
997f323e3a - Added ZEND_MOD_END macro to use in the end of zend_module_dep[] 2011-08-06 14:47:44 +00:00
Felipe Pena
707a8f70b8 - Added ZEND_MOD_END macro to use in the end of zend_module_dep[] 2011-08-06 14:47:44 +00:00
Felipe Pena
23e438594d - Make usage of new PHP_FE_END macro 2011-07-25 11:42:53 +00:00
Felipe Pena
4b30846b50 - Make usage of new PHP_FE_END macro 2011-07-25 11:35:02 +00:00
Ilia Alshanetsky
14ed144318 Fixed test 008 2011-06-07 01:40:54 +00:00
Ilia Alshanetsky
de2291689c Fixed test 008 2011-06-07 01:40:54 +00:00
Felipe Pena
32b5f8a1a3 - Added new parameter parsing option (p - for valid path (string without null byte in the middle))
# The tests will be fixed in the next commits
2011-06-06 21:28:16 +00:00
Andrew Curioso
1e3b32c777 Commiting r311138 into the 5.3 branch - fix to SimpleXML get properties hash 2011-05-18 04:43:21 +00:00
Felipe Pena
f912a2d087 - Fixed bug #53991 (SimpleXMLElement::__construct shows no params via ReflectionMethod) 2011-02-11 21:10:48 +00:00
Felipe Pena
ed2cdf31d3 - Fixed bug #53991 (SimpleXMLElement::__construct shows no params via ReflectionMethod) 2011-02-11 21:10:48 +00:00
Felipe Pena
927bf09c29 - Year++ 2011-01-01 02:19:59 +00:00
Felipe Pena
0203cc3d44 - Year++ 2011-01-01 02:17:06 +00:00
Antony Dovgal
c4a5af24e0 fix segfault when node is NULL 2010-12-27 21:47:52 +00:00
Antony Dovgal
874954ed97 fix segfault when node is NULL 2010-12-27 21:47:52 +00:00
Rob Richards
6fab69a17d typo 2010-12-27 19:00:13 +00:00
Rob Richards
8029a7563c typo 2010-12-27 19:00:13 +00:00
Rob Richards
2479cd6ec9 fix crash with entity declarations 2010-12-27 18:57:49 +00:00
Rob Richards
8bd6c63f66 fix crash with entity declarations 2010-12-27 18:57:49 +00:00
Pierre Joye
d8d014be78 - revert fix for #52655, rev. 302614 2010-08-23 17:01:44 +00:00
Pierre Joye
a6c5363f05 - revert fix for #52655, rev. 302614 2010-08-23 17:01:44 +00:00
Kalle Sommer Nielsen
3947bfeadf Fixed bug #52655 (SimpleXMLIterator supports ArrayAccess without implementing the interface) 2010-08-21 16:22:46 +00:00
Kalle Sommer Nielsen
77755af9b6 Fixed bug #52655 (SimpleXMLIterator supports ArrayAccess without implementing the interface) 2010-08-21 16:22:46 +00:00
Dmitry Stogov
04e72491bb Fixed a possible crash because of recursive GC invocation 2010-05-17 07:50:33 +00:00
Dmitry Stogov
059e2be153 Fixed a possible crash because of recursive GC invocation 2010-05-17 07:50:33 +00:00