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
Xinchen Hui
41f6889436
Fixed SimpleXMl build with DOM
2014-05-04 11:46:17 +08:00
Nikita Popov
42d4adabbd
Fix SXE->string cast for __toString in inheriting class
...
This issue was originally hacked around in zend_make_printable_zval.
I've now moved the overridden __toString() handling into the SXE
cast_object handler, so everything invoking that handler
(zend_make_printable_zval, convert_to_string, zval_get_string,
and various other more obscure usages) see the same behavior.
2014-05-03 11:29:08 +02:00
Xinchen Hui
d8651fbe1c
Make they are in the same style of Z_ISREF
2014-05-03 16:08:58 +08:00
Dmitry Stogov
17d027ed47
Split IS_BOOL into IS_FALSE and IS_TRUE
2014-04-30 18:32:42 +04:00
Dmitry Stogov
f9927a6c97
Merge mainstream 'master' branch into refactoring
...
During merge I had to revert:
Nikita's patch for php_splice() (it probably needs to be applyed again)
Bob Weinand's patches related to constant expression handling (we need to review them carefully)
I also reverted all our attempts to support sapi/phpdbg (we didn't test it anyway)
Conflicts:
Zend/zend.h
Zend/zend_API.c
Zend/zend_ast.c
Zend/zend_compile.c
Zend/zend_compile.h
Zend/zend_constants.c
Zend/zend_exceptions.c
Zend/zend_execute.c
Zend/zend_execute.h
Zend/zend_execute_API.c
Zend/zend_hash.c
Zend/zend_highlight.c
Zend/zend_language_parser.y
Zend/zend_language_scanner.c
Zend/zend_language_scanner_defs.h
Zend/zend_variables.c
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
ext/date/php_date.c
ext/dom/documenttype.c
ext/hash/hash.c
ext/iconv/iconv.c
ext/mbstring/tests/zend_multibyte-10.phpt
ext/mbstring/tests/zend_multibyte-11.phpt
ext/mbstring/tests/zend_multibyte-12.phpt
ext/mysql/php_mysql.c
ext/mysqli/mysqli.c
ext/mysqlnd/mysqlnd_reverse_api.c
ext/mysqlnd/php_mysqlnd.c
ext/opcache/ZendAccelerator.c
ext/opcache/zend_accelerator_util_funcs.c
ext/opcache/zend_persist.c
ext/opcache/zend_persist_calc.c
ext/pcre/php_pcre.c
ext/pdo/pdo_dbh.c
ext/pdo/pdo_stmt.c
ext/pdo_pgsql/pgsql_driver.c
ext/pgsql/pgsql.c
ext/reflection/php_reflection.c
ext/session/session.c
ext/spl/spl_array.c
ext/spl/spl_observer.c
ext/standard/array.c
ext/standard/basic_functions.c
ext/standard/html.c
ext/standard/mail.c
ext/standard/php_array.h
ext/standard/proc_open.c
ext/standard/streamsfuncs.c
ext/standard/user_filters.c
ext/standard/var_unserializer.c
ext/standard/var_unserializer.re
main/php_variables.c
sapi/phpdbg/phpdbg.c
sapi/phpdbg/phpdbg_bp.c
sapi/phpdbg/phpdbg_frame.c
sapi/phpdbg/phpdbg_help.c
sapi/phpdbg/phpdbg_list.c
sapi/phpdbg/phpdbg_print.c
sapi/phpdbg/phpdbg_prompt.c
2014-04-26 00:32:51 +04:00
Nikita Popov
59d45e69f4
Fix libxml/sxe/dom node import/export
...
Also fix sxe zts.
2014-04-18 00:15:13 +02:00
Dmitry Stogov
e96073b1e4
Moved zend_literal->cache_slot right into zval.
...
It should be accessed using Z_CACHE_SLOT() macro.
zend_literal structure is removed.
API functions that accepted pointer to zend_literal now accept pointer to zval or cache_slot directly.
Calls of such functiond that now accept cache_slot need to be changed to pass -1 instead of NULL.
2014-04-17 15:40:45 +04:00
Dmitry Stogov
050d7e38ad
Cleanup (1-st round)
2014-04-15 15:40:40 +04:00
Xinchen Hui
8bfc037348
Fixed invaid write/read
2014-04-15 14:38:38 +08:00
Xinchen Hui
541842d87a
Fixed return uninitialized_zval
2014-04-15 11:10:39 +08:00
Xinchen Hui
84ce66f17c
Fixed Typo
2014-04-15 11:09:04 +08:00
Xinchen Hui
a0690ff288
Fixed zend_object_get_t in simpleXML
2014-04-15 11:05:03 +08:00
Xinchen Hui
76825a71a4
Fixed SXE iterator(14 tests fail)
2014-04-15 00:37:48 +08:00
Xinchen Hui
30a974f435
Fixed sxe object clone
2014-04-15 00:10:59 +08:00
Xinchen Hui
1f207e73eb
Fixed double free
2014-04-15 00:06:54 +08:00
Xinchen Hui
a975c7e0fe
Refactor simpleXML (compilable, but incompleted)
2014-04-14 19:27:22 +08: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
c081ce628f
Bump year
2014-01-03 11:08:10 +08: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
