Dmitry Stogov
9ddf3c5780
Merge branch 'refactoring2' of github.com:zend-dev/php into refactoring2
2014-02-18 16:28:26 +04:00
Dmitry Stogov
5de7115679
Use better data structures (incomplete; able to run bench.php)
2014-02-18 16:27:38 +04:00
Xinchen Hui
43b03c74b3
Refacting smart_str
2014-02-18 17:42:46 +08:00
Dmitry Stogov
1c4f3d39a8
Use better data structures (incomplete)
2014-02-18 11:44:58 +04:00
Dmitry Stogov
a0fe8e5a91
Use better data structures (incomplete)
2014-02-18 01:41:23 +04:00
Dmitry Stogov
4d6ff31cb3
emalloced interned strings have to be deallocated before memory manager shutdown
2014-02-17 22:30:35 +04:00
Dmitry Stogov
fc5e9bee29
It should be fixed later in some better way (added ??? marks)
2014-02-17 22:17:16 +04:00
Xinchen Hui
e7d173fc82
Fixed Memory leak
2014-02-17 23:01:25 +08:00
Xinchen Hui
6d77ca06b9
Fixed Segfault
2014-02-17 22:47:52 +08:00
Dmitry Stogov
2b9b9afa7a
Use better data structures (incomplete)
2014-02-17 17:59:18 +04:00
Dmitry Stogov
0e425121b3
Use better data structures (incomplete)
2014-02-17 11:50:32 +04:00
Xinchen Hui
f0168baecf
Use better data structures (incomplete)
2014-02-16 22:15:54 +08:00
Dmitry Stogov
17bf59f895
Use better data structures (incomplete)
2014-02-14 17:48:45 +04:00
Dmitry Stogov
686a078258
Use better data structures (incomplete)
2014-02-14 14:55:48 +04:00
Dmitry Stogov
a52817eb02
Use better data structures (incomplete)
2014-02-14 14:11:52 +04:00
Dmitry Stogov
c56a2344d0
Merge branch 'refactoring2' of github.com:zend-dev/php into refactoring2
2014-02-14 13:40:23 +04:00
Dmitry Stogov
398256e5fe
Use better data structures (incomplete)
2014-02-14 13:40:11 +04:00
Xinchen Hui
068ec75f8b
Use better data structures (incomplete)
2014-02-14 17:05:04 +08:00
Dmitry Stogov
40e053e7f3
Use better data structures (incomplete)
2014-02-13 17:54:23 +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
Dmitry Stogov
be82a07776
Use better data structures (incomplete)
2014-02-12 18:08:11 +04:00
Dmitry Stogov
4e66abad54
Use better data structures (incomplete) - refactored return_value handling
2014-02-12 14:29:51 +04:00
Dmitry Stogov
e2ea9a7319
Use better data structures (incomplete)
2014-02-12 11:42:27 +04:00
Xinchen Hui
0c0efba45f
Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2
2014-02-11 19:33:48 +08:00
Xinchen Hui
3f4c877bf7
Use better data structures (incomplete)
2014-02-11 19:33:18 +08:00
Dmitry Stogov
2161103fc3
Use better data structures (incomplete)
2014-02-10 17:49:21 +04:00
Dmitry Stogov
f4cfaf36e2
Use better data structures (incomplete)
2014-02-10 10:04:30 +04:00
Nikita Popov
89eab884d9
Merge branch 'PHP-5.6'
2014-01-18 14:44:57 +01:00
Nikita Popov
31a2ac470c
Fix argument unpacking across stack pages
...
If multiple unpacks were used (or mixed with normal arguments)
parts of the arguments could land on different stack pages. If
this occurs the arguments will now be copied to a new stack page.
The code used to do this is copied verbatim from the PHP 5.4 branch
and only modified to reduce the amount of inlined code.
2014-01-18 14:41:33 +01:00
Bob Weinand
a86e869ee8
Merge branch 'PHP-5.6'
2014-01-12 02:00:37 +01:00
Bob Weinand
69edad213a
Fixed build (making zend_is_by_ref_func_arg_fetch function static)
2014-01-12 01:59:22 +01:00
Nikita Popov
4facc35413
Merge branch 'PHP-5.6'
2014-01-11 12:54:08 +01:00
Nikita Popov
2c47dfbaeb
Implement argument unpacking
...
RFC: https://wiki.php.net/rfc/argument_unpacking
2014-01-11 12:42:08 +01:00
Nikita Popov
c7bb283338
Minor cleanup in zend_do_pass_param()
2014-01-11 12:40:16 +01:00
Anatol Belski
19aafe43b2
Fixed bug #66009 Failed compilation of PHP extension with C++ std library using VS 2012
...
Visual Studio 2012 includes sanity checks for C++11 features, see
http://msdn.microsoft.com/en-us/library/vstudio/bb531344(v=vs.110).aspx
To fix the 'inline' keyword redefinition for C++ in debug mode, the
new macros ZEND_WIN32_KEEP_INLINE is introduced, ZEND_WIN32_FORCE_INLINE is
automatically appended in release mode.
2014-01-04 01:41:49 +01:00
Anatol Belski
4e7c9ea896
Fixed bug #66009 Failed compilation of PHP extension with C++ std library using VS 2012
...
Visual Studio 2012 includes sanity checks for C++11 features, see
http://msdn.microsoft.com/en-us/library/vstudio/bb531344(v=vs.110).aspx
To fix the 'inline' keyword redefinition for C++ in debug mode, the
new macros ZEND_WIN32_KEEP_INLINE is introduced, ZEND_WIN32_FORCE_INLINE is
automatically appended in release mode.
2014-01-04 01:41:27 +01:00
Nikita Popov
250ee4c17a
Merge branch 'PHP-5.6'
2014-01-04 01:30:44 +01:00
Nikita Popov
72a16851f4
Merge branch 'PHP-5.5' into PHP-5.6
2014-01-04 01:29:15 +01:00
Nikita Popov
d992a972c0
Merge branch 'PHP-5.4' into PHP-5.5
2014-01-04 01:24:54 +01:00
Nikita Popov
7e8e21df0c
Fix bug #66286 : Incorrect object comparison with inheritance
...
std_compare_objects immidiately returned 0 if the property tables
of both objects contain NULL at some index. Thus it would report
objects as equal even though properties following after that
differ.
2014-01-04 01:22:14 +01: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
Xinchen Hui
c0d060f5c0
Bump year
2014-01-03 11:04:26 +08:00
Dmitry Stogov
65fd18fd88
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Improved empty string handling. Now ZE uses an interned string instead of allocation new empty string each time. (Some extensions might need to be fixed using str_efree() instead of efree() to support interned strings).
Conflicts:
NEWS
Zend/zend_extensions.h
Zend/zend_modules.h
2013-12-26 14:51:05 +04:00
Dmitry Stogov
03a37de9b3
Improved empty string handling. Now ZE uses an interned string instead of allocation new empty string each time. (Some extensions might need to be fixed using str_efree() instead of efree() to support interned strings).
2013-12-26 14:47:13 +04:00
Xinchen Hui
d6713f3989
Fixed warning "No new line at end of file"
2013-12-26 17:45:37 +08:00
Dmitry Stogov
ef56cfb991
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fixed ZEND_MM_MEM_TYPE=mmap_zero
2013-12-26 11:53:03 +04:00
Dmitry Stogov
0ff0e82f26
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed ZEND_MM_MEM_TYPE=mmap_zero
Conflicts:
NEWS
2013-12-26 11:52:39 +04:00