Xinchen Hui
91b2ddc816
Merge branch 'master' into phpng
...
Conflicts:
ext/spl/spl_array.c
ext/spl/spl_directory.c
ext/standard/formatted_print.c
2014-06-01 22:43:06 +08:00
Xinchen Hui
d196ac6a48
Merge branch 'PHP-5.6'
2014-06-01 19:42:53 +08:00
Xinchen Hui
c4e7c7d50e
Merge branch 'PHP-5.5' into PHP-5.6
2014-06-01 19:42:20 +08:00
Xinchen Hui
9bb5867fad
Merge branch 'PHP-5.4' into PHP-5.5
2014-06-01 19:41:35 +08:00
Xinchen Hui
38be99b739
Fixed bug #67359 (Segfault in recursiveDirectoryIterator)
2014-06-01 19:41:01 +08: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
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
78f428d3a8
Fixed memory leaks
2014-04-16 13:59:49 +04:00
Nikita Popov
20f2e5986e
Fix ZTS build
...
This only makes it compile, it doesn't actually work, presumably
because interned strings are assumed in some places.
2014-04-09 23:41:16 +02:00
Dmitry Stogov
2016e72111
Temporary refcounting fix
2014-04-10 01:08:52 +04:00
Etienne Kneuss
6acfaa982b
Merge branch 'PHP-5.6'
2014-04-09 11:52:11 +02:00
Etienne Kneuss
6006a3ed51
Merge branch 'PHP-5.5' into PHP-5.6
2014-04-09 11:36:36 +02:00
Joshua Thijssen
e8d6c6587d
fixed bug66702 : regexiterator's invert flag doesn't work as expected
2014-04-09 11:13:33 +02:00
Dmitry Stogov
7402af380b
Fixed destruction of objects and iterators on unclean request shutdown and GC (few cases are still unfixed).
...
Now we destroy objects it two steps. At first - object properties of all objects and only then the objects their selves.
2014-04-09 01:50:15 +04:00
Dmitry Stogov
76cc99fe60
Refactored ZVAL flags usage to simplify various checks (e.g. Z_REFCOUNTED(), candidate for GC, etc)
2014-04-03 15:26:23 +04:00
Dmitry Stogov
d8099d0468
Changed data layout to allow more efficient operations
2014-04-02 14:34:44 +04:00
Dmitry Stogov
ea85451b65
Refactored data structures to keep zend_object* instead of a whole zval in some places
2014-03-28 02:11:22 +04:00
Dmitry Stogov
f2a598393f
Fixed wrong assignment
2014-03-22 02:40:41 +04:00
Dmitry Stogov
0e91c5a586
Fixed refcounting
2014-03-22 01:13:15 +04:00
Dmitry Stogov
6da4759769
Fixed refcounting
2014-03-22 00:00:20 +04:00
Dmitry Stogov
b7938ab1bd
Refactored GC (incomplete)
2014-03-19 17:00:28 +04:00
Xinchen Hui
639c4da20a
Forgot fix similar issue in spl_recursive_it_get_method
2014-03-16 23:04:07 +08:00
Xinchen Hui
86aa343d3b
Fixed spl_dual_it_get_method
2014-03-16 23:02:14 +08:00
Xinchen Hui
051a3eb45b
Fixed string handling in ext/spl/tests/recursive_tree_iterator_001.phpt
2014-03-16 15:45:45 +08:00
Xinchen Hui
ef1e006bd6
Refactor php_pcre_replace to return zend_string
2014-03-16 08:44:07 +08:00
Xinchen Hui
2a8cef80cf
Fixed typo
2014-03-15 22:23:30 +08:00
Xinchen Hui
a49781f20d
Fixed refcounted
2014-03-15 22:13:55 +08:00
Xinchen Hui
9d4dca0880
Refactor Spl_Directory to fixed bug after default_properties changed
2014-03-15 22:07:40 +08:00
Xinchen Hui
19045f0d27
Fixed refcount asseration
2014-03-15 19:16:07 +08:00
Xinchen Hui
cc79496b97
Refactor Spl_Iterators to fixed default_properties change
2014-03-15 16:33:55 +08:00
Dmitry Stogov
19670c2bbc
Fixied calling object closures from internal functions
2014-03-05 01:54:21 +04:00
Xinchen Hui
990c923ef4
Refactored spl_filesystem_iterator
2014-02-28 19:07:54 +08:00
Xinchen Hui
7dcb14ebcd
We need to stash the object_ptr in fci
2014-02-28 17:12:53 +08:00
Xinchen Hui
1265850fef
Add zend_iterator_dtor
2014-02-28 15:03:43 +08:00
Xinchen Hui
a5ce7d526e
Revert "Move zend_objects_store_put out of zend_object_std_init"
...
This reverts commit 8ced4f0ac9
.
2014-02-28 13:59:07 +08:00
Xinchen Hui
8ced4f0ac9
Move zend_objects_store_put out of zend_object_std_init
2014-02-28 12:59:51 +08:00
Xinchen Hui
0817cee164
Fixed object creating (std_init calls store_put now)
2014-02-27 22:47:30 +08:00
Dmitry Stogov
3696e038e5
Various fixes related to read_property(), read_dimension() and iterators refactoring
2014-02-27 16:07:36 +04:00
Xinchen Hui
382b0dfdb7
Refactoring zend_iterator (incompleted)
2014-02-27 19:19:02 +08:00
Dmitry Stogov
495551aa8c
Fixed iterators API. zend_iterator_init() has to be used in each get_iterator() callback.
2014-02-26 15:01:08 +04:00
Xinchen Hui
43b03c74b3
Refacting smart_str
2014-02-18 17:42:46 +08:00
Dmitry Stogov
6306918ed2
Use better data structures (incomplete)
2014-02-12 23:54:04 +04:00
Dmitry Stogov
7a9348f45d
Reverted zval_clear() and zval_release() back to zval_ptr_dtor()
2014-02-12 22:51:19 +04:00
Xinchen Hui
d3954f16d3
Use better data structures (incomplete) -- stash for today work
2014-02-12 22:15:08 +08:00
Xinchen Hui
3f4c877bf7
Use better data structures (incomplete)
2014-02-11 19:33:18 +08:00
Xinchen Hui
0f53e37494
Merge branch 'PHP-5.6'
2014-01-03 11:09:07 +08: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