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
a094f6d255
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
updated NEWS
Fixed bug #66084 simplexml_load_string() mangles empty node name
2014-04-05 09:48:54 +02: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
Dmitry Stogov
f4cfaf36e2
Use better data structures (incomplete)
2014-02-10 10:04:30 +04: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
3c166c4758
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Reduce (some) compile noise of 'unused variable' and 'may be used uninitialized' warnings.
Conflicts:
ext/gmp/gmp.c
2013-08-14 20:47:00 -07: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
Christopher Jones
4c3c9d1fe5
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Fix long-standing visual pain point: the misalignment of './configure help' text. Whitespace changes and a couple of grammar fixes.
2013-08-06 11:09:12 -07:00
Christopher Jones
c6d977dd39
Fix long-standing visual pain point: the misalignment of './configure help' text.
...
Whitespace changes and a couple of grammar fixes.
2013-08-06 11:06:09 -07:00
Anatol Belski
5e1ac558c3
make simplexml headers available to the outta world
2013-07-29 22:18:55 +02: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
Xinchen Hui
e081c55fb5
Merge branch 'PHP-5.3' into PHP-5.4
2012-10-10 10:31:31 +08:00
Xinchen Hui
610c7fbe7b
Remove executable permission on phpt
2012-10-10 10:27:49 +08:00
Xinchen Hui
e4a8fa6a15
Merge branch 'PHP-5.3' into PHP-5.4
2012-10-09 13:29:51 +08:00
Xinchen Hui
6284ef112e
Fixed bug #63236 (Executable permission on various source files)
2012-10-09 13:28:31 +08: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
Stanislav Malyshev
a213c10ef2
Merge branch 'pull-request/112' into PHP-5.4
...
* pull-request/112:
Added in NEWS and UPGRADING for feature 55218
Adding in test for feature 55218
Implements feature 55218
2012-07-07 12:51:26 -07:00
Marc Easen
896ac689c9
Fixed the common misspelling of the word occurred (occured -> occurred)
2012-06-30 16:54:03 -07:00
Lonny Kapelushnik
2178b1d02d
Adding in test for feature 55218
2012-06-21 23:21:17 -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
Pierre Joye
1a166b2100
- add skipif for dom
2011-09-07 08:12:08 +00:00
Pierre Joye
8dc7e3d8c6
- add skipif for dom
2011-09-07 08:12:08 +00:00
Pierre Joye
9d33b167af
- add skipif
2011-09-06 07:09:56 +00:00
Pierre Joye
6402150c91
- add skipif
2011-09-06 07:09:56 +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