Remi Collet
ea466a316f
Fix Request #67453 Allow to unserialize empty data.
...
SplDoublyLinkedList, SplObjectStorage and ArrayObject have empty
constructor (no arg), so it make sense to allow to unserialize empty
data.
This allow the hack (used in various place, including PHPUnit) to
instanciate class without call to constructor to work.
2014-06-17 09:38:54 +02:00
Dmitry Stogov
dd1c68e67f
Merge branch 'master' into phpng
...
* master: (77 commits)
NEWS entry for Fix potential segfault in dns_get_record()
NEWS entry for "Fix potential segfault in dns_get_record()"
NEWS entry for Fix potential segfault in dns_get_record(
Fix potential segfault in dns_get_record()
Revert "Add optional second arg to unserialize()"
5.5.15 now
update NEWS
Fix bug #66127 (Segmentation fault with ArrayObject unset)
5.4.31 next
Add NEWS. This doesn't need UPGRADING (or an RFC), IMO.
Fix broken test.
Add a mime type map generation script and update the header.
Move the mime type map out of php_cli_server.c for easier generation.
Replace the CLI server's linear search for extensions with a hash table.
fix test
Remove unused included file
NEWS
NEWS
NEWS
Fixed Bug #67413 fileinfo: cdf_read_property_info insufficient boundary chec
...
Conflicts:
Zend/zend_closures.c
Zend/zend_execute.c
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
ext/spl/spl_array.c
ext/standard/basic_functions.c
ext/standard/dns.c
ext/standard/var.c
2014-06-12 05:07:33 +04:00
Stanislav Malyshev
2b04d68972
Fix bug #66127 (Segmentation fault with ArrayObject unset)
2014-06-10 23:24:11 -07:00
Stanislav Malyshev
6c81b14b2d
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix bug #66127 (Segmentation fault with ArrayObject unset)
5.4.31 next
2014-06-10 23:21:17 -07:00
Stanislav Malyshev
2ed66ed21c
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug #66127 (Segmentation fault with ArrayObject unset)
5.4.31 next
2014-06-10 23:20:07 -07:00
Stanislav Malyshev
f11bba4929
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #66127 (Segmentation fault with ArrayObject unset)
5.4.31 next
Conflicts:
configure.in
main/php_version.h
2014-06-10 23:19:21 -07:00
Stanislav Malyshev
317bcb96d0
Fix bug #66127 (Segmentation fault with ArrayObject unset)
2014-06-10 23:17:30 -07:00
Dmitry Stogov
c1965f58d4
Use reference counting instead of zval duplication
2014-06-05 16:04:11 +04:00
Dmitry Stogov
3f6f0d5a70
Simplified and optimized ZEND_HANDLE_NUMERIC()
2014-06-03 13:10:42 +04:00
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
Adam Harvey
f4a235c541
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Check for zero-length keys in spl_array_skip_protected and don't skip them.
added CVEs in NEWS
2014-05-29 17:57:54 +00:00
Adam Harvey
b8042acdde
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Check for zero-length keys in spl_array_skip_protected and don't skip them.
added CVEs in NEWS
2014-05-29 17:56:32 +00:00
Adam Harvey
43e3a83d51
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Check for zero-length keys in spl_array_skip_protected and don't skip them.
2014-05-29 17:53:28 +00:00
Adam Harvey
b5d9983ff4
Check for zero-length keys in spl_array_skip_protected and don't skip them.
...
Fixes bug #67360 (Missing element after ArrayObject::getIterator).
2014-05-29 17:49:32 +00:00
Dmitry Stogov
9eb89dddb1
Use optimized zend_array_dup() function. convert zend_hash_num_elements() and zend_hash_next_free_element() into macros.
2014-05-23 20:37:53 +04:00
Xinchen Hui
82a4897446
Use new iterator macros
2014-05-19 10:55:09 +08:00
Dmitry Stogov
b11a30f5ea
Merge branch 'master' into phpng
...
* master:
Support for __debugInfo (Joe Watkins)
Optimize ZEND_POW (Rouven Weßling)
gcov: tentative fix for broken coverage data after fix for opcache coverage slightly hackish, but works. The idea is that we want to give priority to .gcda files in .libs dirs vs the files in the upper level dir
gcov: tentative fix for broken coverage data after fix for opcache coverage slightly hackish, but works. The idea is that we want to give priority to .gcda files in .libs dirs vs the files in the upper level dir
Prevent recursion in ZF2 Parameters class
adding NEWS block for beta4
5.4.30 next
enable email notifications
update NEWS
update NEWS
update NEWS
- Updated to version 2014.3 (2014c)
fix bug #67253 : timelib_meridian_with_check out-of-bounds read
Fix bug #67252 : convert_uudecode out-of-bounds read
Fix bug #67251 - date_parse_from_format out-of-bounds read
Fix bug #67250 (iptcparse out-of-bounds read)
Conflicts:
ext/opcache/zend_persist.c
ext/spl/spl_array.c
2014-05-18 21:17:31 +04:00
Tjerk Meesters
6aac353acc
Merge branch 'PHP-5.6'
...
Conflicts:
ext/spl/spl_array.c
2014-05-18 22:51:36 +08:00
Tjerk Meesters
d4295eb26a
Prevent recursion in ZF2 Parameters class
2014-05-16 16:49:47 +08:00
Dmitry Stogov
7fcd4064c0
Merge branch 'master' into phpng
...
* master: (41 commits)
fix test - output can be chunked
fix test
fix test
Fixed test for commit 997be125eb
Add bug fix to NEWS
Update UPGRADING according to bug fix
fix test
improve CURL tests to allow testing without separate server
improve CURL tests to allow testing without separate server
Fixed bug #67199 mb_regex_encoding mishmash
Fix bug #67248 (imageaffinematrixget missing check of parameters)
Fix bug #67247 spl_fixedarray_resize integer overflow
fix news
add tests stuff to README
Updated NEWS
Fix Linux specific fail in error traces (cherry-picked and fix for bug #67245 ) Linux apparently does not like memcpy in overlapping regions...
- Fixed off-by-one in phar_build (patch by crrodriguez at opensuse dot org)
- Move checking
- Fixed missing NULL check in SimpleXMLElement::xpath()
- Fixed missing NULL check
...
Conflicts:
ext/bz2/bz2.c
ext/gd/gd.c
ext/mbstring/php_mbregex.c
ext/session/tests/031.phpt
ext/simplexml/simplexml.c
ext/spl/spl_fixedarray.c
2014-05-13 15:24:40 +04:00
Nikita Popov
9f9ee0186e
Fix memory error in spl_directory.c
2014-05-12 21:35:39 +02:00
Nikita Popov
8904f72d7c
Fix spl_directory cast_object, reenable error
2014-05-12 20:44:30 +02:00
Stanislav Malyshev
eaa39c9388
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix bug #67248 (imageaffinematrixget missing check of parameters)
Fix bug #67247 spl_fixedarray_resize integer overflow
fix news
add tests stuff to README
Updated NEWS
Fix Linux specific fail in error traces (cherry-picked and fix for bug #67245 ) Linux apparently does not like memcpy in overlapping regions...
2014-05-11 18:57:39 -07:00
Stanislav Malyshev
f2fdeba19d
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix bug #67248 (imageaffinematrixget missing check of parameters)
Fix bug #67247 spl_fixedarray_resize integer overflow
fix news
add tests stuff to README
Updated NEWS
Fix Linux specific fail in error traces (cherry-picked and fix for bug #67245 ) Linux apparently does not like memcpy in overlapping regions...
2014-05-11 18:56:32 -07:00
Stanislav Malyshev
af5cc61cf3
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix bug #67247 spl_fixedarray_resize integer overflow
fix news
2014-05-11 18:16:19 -07:00
Stanislav Malyshev
2b475eebbe
Fix bug #67247 spl_fixedarray_resize integer overflow
2014-05-11 17:54:27 -07: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
5864ce8a44
Fixed compilation warnings
2014-04-22 17:46:34 +04:00
Dmitry Stogov
72c287bd23
Combine HashTable.flags and HashTable.nApplyCount into single 32-bit word
2014-04-21 18:25:34 +04:00
Bob Weinand
c02003e6b8
Merge branch 'PHP-5.5' into PHP-5.6
2014-04-17 17:23:05 +02:00
Bob Weinand
0ec122b804
Merge branch 'PHP-5.4' into PHP-5.5
2014-04-17 17:21:21 +02:00
Levi Morrison
6e1e98d7b8
These links to ~helly don't work anymore.
2014-04-17 17:20:24 +02:00
Levi Morrison
0193895bb4
These links to ~helly don't work anymore.
2014-04-17 08:46:38 -06: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
7537251bd7
Fixed reference counting
2014-04-16 16:28:11 +04:00
Dmitry Stogov
62016f5ab3
Fixed reference counting
2014-04-16 14:15:24 +04:00
Dmitry Stogov
78f428d3a8
Fixed memory leaks
2014-04-16 13:59:49 +04:00
Dmitry Stogov
050d7e38ad
Cleanup (1-st round)
2014-04-15 15:40:40 +04:00
Dmitry Stogov
258a5a39fa
Fixed memory leak
2014-04-15 00:21:41 +04:00
Bob Weinand
12844292b8
Merge branch 'PHP-5.6'
2014-04-14 00:10:25 +02:00
Bob Weinand
a93e734f81
Merge branch 'PHP-5.5' into PHP-5.6
2014-04-14 00:08:36 +02:00
Dmitry Stogov
6bfedfd22e
Fixed unserialize()
2014-04-10 18:08:11 +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
Dmitry Stogov
29f068779f
Fixed ext/spl/tests/iterator_035.phpt
2014-04-09 23:49:58 +04:00
Dmitry Stogov
a938b24607
Fixed resource to integer conversion
2014-04-09 22:31:40 +04:00
Dmitry Stogov
085be9d618
Fixed ArrayObject::sort() family
2014-04-09 14:25:35 +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
6b2ed577fd
Avoid unnecessry reallocations
2014-04-01 22:36:17 +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
887189ca31
Refactored IS_INDIRECT usage for CV and object properties to support HashTable resizing
2014-03-26 18:07:31 +04:00
Tjerk Meesters
4cb19f0a0f
Added TSRMLS_CC to zend_is_true() calls
2014-03-25 19:05:43 +08:00
Tjerk Meesters
6018c47a28
Merge branch 'PHP-5.6'
2014-03-25 18:19:42 +08:00
Tjerk Meesters
5dee3c11fe
Call offsetGet() when called with isset() on ArrayObject derivatives
2014-03-25 18:15:18 +08: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
b78bbe93ca
Fixed segfault (invalid free handling)
2014-03-16 22:05:38 +08:00
Xinchen Hui
5df7fe59f3
Fixed wrong md5 str length
2014-03-16 15:52:50 +08:00
Xinchen Hui
5639a2a8ef
Reflection doesn't return ref anymore
2014-03-16 15:47:08 +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
6dd3d5cb36
Should not release container before dup
2014-03-15 22:43:40 +08:00
Xinchen Hui
d0bbc227aa
IS_UNDEF should never goes to user script land
2014-03-15 22:37:27 +08:00
Xinchen Hui
2a8cef80cf
Fixed typo
2014-03-15 22:23:30 +08:00
Xinchen Hui
b264e96497
Fixed bug codes in SplFileInfo::getExtension
2014-03-15 22:17:55 +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
34dac6ddbc
Fixed several bugs in spl_autoload
2014-03-15 19:34:07 +08:00
Xinchen Hui
19045f0d27
Fixed refcount asseration
2014-03-15 19:16:07 +08:00
Xinchen Hui
8558dc8eaf
Refactor Spl_Heap to fixed bug after default_properties change
2014-03-15 19:14:11 +08:00
Xinchen Hui
cc79496b97
Refactor Spl_Iterators to fixed default_properties change
2014-03-15 16:33:55 +08:00
Xinchen Hui
6c10f7ac36
Refactored Spl_Dllist to fixed zend_object->default_properties change
2014-03-15 14:44:50 +08:00
Xinchen Hui
4d9d08269c
Refactored Spl_Arrary to fixed zend_object->default_properties change
2014-03-15 14:32:32 +08:00
Xinchen Hui
bfe1f224b2
Fixed fixed_array returning initializing
2014-03-15 13:20:23 +08:00
Xinchen Hui
28e0a58018
Fixed fixedarray iterator fetching
2014-03-15 13:18:32 +08:00
Xinchen Hui
b2432872c4
Fixed fixed_array fetching
2014-03-15 13:12:55 +08:00
Xinchen Hui
350260624d
Fixing SplFixedArray (this probably will be revert, just show what the problem is)
2014-03-08 19:03:38 +08:00
Xinchen Hui
1d4cea40e3
Refactor SplObjectStorage make it works
2014-03-08 14:47:55 +08:00
Tjerk Meesters
777831a24b
Merge branch 'PHP-5.6'
2014-03-07 19:24:50 +08:00
Tjerk Meesters
8d3f4b647b
Merge branch 'PHP-5.5' into PHP-5.6
2014-03-07 19:24:02 +08:00
Tjerk Meesters
972935cd95
Fixed null termination
2014-03-07 19:23:46 +08:00
Tjerk Meesters
7137775ec2
Merge branch 'PHP-5.6'
2014-03-07 19:01:53 +08:00
Tjerk Meesters
64906cdc38
Merge branch 'PHP-5.5' into PHP-5.6
2014-03-07 18:57:36 +08:00
datibbaw
3c673fed34
Add fread(length) method
...
Fixed off-by-one write bug
Added test
2014-03-07 18:50:33 +08:00
Dmitry Stogov
19670c2bbc
Fixied calling object closures from internal functions
2014-03-05 01:54:21 +04:00
Xinchen Hui
05e8f28533
This should be a real problem
2014-03-02 14:35:41 +08:00
Xinchen Hui
171fde5491
Fixed SplPriorityQueue's free_obj
2014-03-01 12:44:33 +08:00
Xinchen Hui
7235048ca1
Fixing spl_autoload functional (one test failed due to get_closure)
2014-03-01 00:44:02 +08:00
Xinchen Hui
7208b9660c
Fixed autoload_func_info using zval instead of zval *
2014-02-28 23:05:13 +08:00
Xinchen Hui
237dbd972e
Fixed uninilized intern
2014-02-28 22:55:59 +08:00
Xinchen Hui
4340f1a561
Fixed offset_key
2014-02-28 22:52:18 +08:00
Xinchen Hui
0680cdb4ac
Fixed refcount handling
2014-02-28 22:47:24 +08:00
Xinchen Hui
2a82660923
Temporary fix zcontext
2014-02-28 22:21:51 +08: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
Anatol Belski
bad0b4fc8c
Merge branch 'PHP-5.6'
...
* PHP-5.6:
primitive test fixes
2014-02-28 09:45:02 +01:00
Anatol Belski
1cb4398ac1
primitive test fixes
2014-02-28 09:43:57 +01:00
Xinchen Hui
b353d5abe9
Fixed un-initilized iterator in DirectoyItrator
2014-02-28 16:06:47 +08:00
Xinchen Hui
0def388427
Fixed Z_ADDREF
2014-02-28 15:29:00 +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
cfa93d08f5
Unused element
2014-02-27 22:50:31 +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
Dmitry Stogov
4ba590697e
Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2
2014-02-27 15:40:51 +04:00
Dmitry Stogov
1c3ba95bb5
Refactored read_property() and read_dimension() handlers
2014-02-27 15:40:13 +04:00
Xinchen Hui
382b0dfdb7
Refactoring zend_iterator (incompleted)
2014-02-27 19:19:02 +08:00
Ferenc Kovacs
6dd8a4d4f0
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fix tests broken by 633f898f15
2014-02-27 02:33:20 +01:00
Ferenc Kovacs
42a43d4531
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix tests broken by 633f898f15
2014-02-27 02:32:47 +01:00
Ferenc Kovacs
fd20278fa5
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix tests broken by 633f898f15
2014-02-27 02:32:07 +01:00
Ferenc Kovacs
bd961f3e87
fix tests broken by 633f898f15
2014-02-27 02:31:42 +01: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
Dmitry Stogov
639e4e1afa
Changes zend_is_callable() to use zend_string* instead of char*
2014-02-25 16:03:34 +04:00
Xinchen Hui
595741f6ec
Fixed test fail in ext/standard/tests/serialize/bug64354_1.php
2014-02-25 17:58:01 +08:00
Xinchen Hui
71dac3d54f
Don't add_ref in add_*_str functions
2014-02-25 15:47:24 +08:00
Xinchen Hui
c0aba2c641
Refactor basename using zend_string
2014-02-23 18:08:35 +08:00
Dmitry Stogov
52bd62eca8
Fixed assertions
2014-02-21 20:35:40 +04:00
Xinchen Hui
c1c4d26817
Use better data structures (incomplete)
2014-02-19 17:58:39 +08:00
Xinchen Hui
43b03c74b3
Refacting smart_str
2014-02-18 17:42:46 +08:00
Dmitry Stogov
2b9b9afa7a
Use better data structures (incomplete)
2014-02-17 17:59:18 +04:00
Xinchen Hui
ad1838d248
Use better data structures (incomplete)
2014-02-16 22:27:31 +08:00
Xinchen Hui
f0168baecf
Use better data structures (incomplete)
2014-02-16 22:15:54 +08:00
Xinchen Hui
34aefa5604
Use better data structures (incomplete)
2014-02-15 23:21:09 +08:00
Xinchen Hui
6cb316cf5d
Use better data structures (incomplete)
2014-02-14 23:11:40 +08:00
Xinchen Hui
068ec75f8b
Use better data structures (incomplete)
2014-02-14 17:05:04 +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
Dmitry Stogov
4e66abad54
Use better data structures (incomplete) - refactored return_value handling
2014-02-12 14:29:51 +04:00
Xinchen Hui
3f4c877bf7
Use better data structures (incomplete)
2014-02-11 19:33:18 +08:00
Dmitry Stogov
f4cfaf36e2
Use better data structures (incomplete)
2014-02-10 10:04:30 +04: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
Kalle Sommer Nielsen
d14670ccdb
Eliminate another TSRMLS_FETCH() in i_zend_is_true()
...
# Affected extensions have all been updated, ext/opcache and ext/zip
# both have macros for cross version compatibility
2013-12-18 07:25:05 +01:00
Dmitry Stogov
0f39089384
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fixed tests
2013-12-02 12:05:29 +04:00
Dmitry Stogov
2f5ab04c5f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed tests
2013-12-02 12:04:07 +04:00
Dmitry Stogov
edbefd1d5c
Fixed tests
2013-12-02 11:53:35 +04:00
Ferenc Kovacs
91108818e1
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
ext/spl/tests/SplFileObject_rewind_error001.phpt
2013-11-06 10:46:34 +01:00
ptarjan
9c1e1bbc05
fix many parallel test issues
...
While running these on HHVM I've run into a lot of parallelism issues.
I'm backporting all the fixes I had to do in
https://github.com/facebook/hiphop-php/blob/master/hphp/tools/import_zend_test.py#L650
to php core.
Most of these changes were just filenames that were shared between
tests, but I did more surgery on the fixed ports. I can apreciate port
31337 as much as the next nerd, but random ports are better for tests.
2013-11-06 10:31:47 +01:00
Christopher Jones
c439ac6c35
Cleanup temp test file
2013-11-06 10:31:35 +01:00
Levi Morrison
7f3b5b77cc
Standardized usage of zpp_none and the order of the comparison zpp(...) == FAILURE
2013-10-11 10:32:40 -06:00
Sara Golemon
92fe33c570
Merge branch 'pull-request/473'
2013-09-26 13:24:08 -07:00
Nikita Popov
0d7a638866
Implement variadic function syntax
...
As per RFC: https://wiki.php.net/rfc/variadics
2013-09-26 18:39:17 +02:00
ptarjan
ecbe4af0de
fix many parallel test issues
...
While running these on HHVM I've run into a lot of parallelism issues.
I'm backporting all the fixes I had to do in
https://github.com/facebook/hiphop-php/blob/master/hphp/tools/import_zend_test.py#L650
to php core.
Most of these changes were just filenames that were shared between
tests, but I did more surgery on the fixed ports. I can apreciate port
31337 as much as the next nerd, but random ports are better for tests.
2013-09-26 00:30:23 -07:00
David Soria Parra
dc7015d4e4
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Revert "EmptyIterator now implements Countable; fixes bug 60577"
2013-09-18 15:06:58 +02:00
David Soria Parra
94e4c4df86
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Revert "EmptyIterator now implements Countable; fixes bug 60577"
2013-09-18 15:06:51 +02:00
David Soria Parra
7a24ee13ec
Revert "EmptyIterator now implements Countable; fixes bug 60577"
...
This reverts commit 8a936e8eb9
.
2013-09-18 15:06:36 +02:00
Michael Wallner
6866b45a48
fix test concurrency
2013-09-18 10:52:35 +02:00
David Soria Parra
ca75e6f760
Merge branch 'PHP-5.5'
...
* PHP-5.5:
NEWS for #60577
NEWS for bug #64441
Fix bug #64441 (FILTER_VALIDATE_URL rejects fully qualified domain names)
EmptyIterator now implements Countable; fixes bug 60577
News for bugfix #64157
Bug 64157 Changed error message to make sense
2013-09-16 23:36:48 +02:00
David Soria Parra
3d6ac70e66
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
NEWS for #60577
NEWS for bug #64441
Fix bug #64441 (FILTER_VALIDATE_URL rejects fully qualified domain names)
EmptyIterator now implements Countable; fixes bug 60577
News for bugfix #64157
Bug 64157 Changed error message to make sense
2013-09-16 23:36:37 +02:00
Levi Morrison
8a936e8eb9
EmptyIterator now implements Countable; fixes bug 60577
...
(cherry picked from commit 6398844c86bee08abe4ee3f206ecd86ad0a498f9)
2013-09-16 04:04:53 +02:00
Nikita Popov
5350b9957a
Merge branch 'PHP-5.5'
2013-09-12 23:30:40 +02:00
Levi Morrison
d76959a3b9
Fixed minor bug in test.
2013-09-12 23:29:52 +02:00
Nikita Popov
64ee0cde5d
Merge branch 'PHP-5.5'
2013-09-12 17:49:28 +02:00
Nikita Popov
ad976d8240
Fix bug #64782 : SplFileObject constructor make $context optional
2013-09-12 17:46:14 +02: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
Michael Wallner
14caf174ff
unify stdint type usage
...
if you need C99 stdint types, just include "php_stdint.h"
2013-08-06 22:49:56 +02:00
Stanislav Malyshev
e4f9619fad
fix compiler warning, use longs for hashes
2013-08-04 18:04:45 -07:00
Stanislav Malyshev
c793a65690
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
non living code related typo fixes
Conflicts:
Zend/zend_compile.c
2013-08-04 16:06:24 -07:00
Veres Lajos
8d86597d73
non living code related typo fixes
2013-08-04 16:05:36 -07:00
Rasmus Lerdorf
3d0aca80f2
Merge commit 'e55f08a' into PHP-5.5
...
* commit 'e55f08a':
This test will only work if gc is enabled
2013-08-02 12:01:12 -04:00
Rasmus Lerdorf
e55f08a5ae
This test will only work if gc is enabled
2013-08-02 12:00:48 -04:00
Xinchen Hui
9126909c08
Merge branch 'PHP-5.4' into PHP-5.5
2013-07-25 22:44:19 +08:00
Xinchen Hui
9909c4d4c4
Fixed bug #65328 (Segfault when getting SplStack object Value)
2013-07-25 22:43:41 +08:00
Adam Harvey
f9000fde98
Expand the ZEND_STRL macro to handle platforms where strncmp() is a macro.
...
On most platforms, this works fine, but on Linux armhf, strncmp() is a macro
rather than a real function, ergo the macro expansion of ZEND_STRL doesn't
occur until after the compiler knows it needs three parameters for strncmp()
and we get a compile error.
Fixes the fix for bug #61697 .
2013-07-23 11:15:43 -07:00
Stanislav Malyshev
83ced9124e
Fix bug #61697 - spl_autoload_functions returns lambda functions incorrectly
2013-07-21 22:47:10 -07:00
Joshua Thijssen
5027fa79d7
Added recursivetreeiterator::setPostfix() method
2013-07-21 22:20:58 -07:00
Stanislav Malyshev
68e630b72f
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix invalid variable name at ext/spl/internal/multipleiterator.inc (key() method, too)
fix invalid variable name at ext/spl/internal/multipleiterator.inc
2013-07-15 00:36:35 -07:00
sasezaki
e617679c0b
fix invalid variable name at ext/spl/internal/multipleiterator.inc (key() method, too)
2013-07-15 00:36:29 -07:00
kazusuke sasezaki
76775a3aa7
fix invalid variable name at ext/spl/internal/multipleiterator.inc
2013-07-15 00:36:19 -07:00
Veres Lajos
e9a95d78ef
typo fixes
2013-07-15 00:23:03 -07:00
Veres Lajos
72085b0e5f
typo fixes
2013-07-15 00:18:57 -07:00
Christopher Jones
3478ddc1f0
Cleanup temp test file
2013-07-10 11:17:52 -07:00
Adam Harvey
3becd3879f
Add a __wakeup() method to SplFixedArray, thereby fixing serialising an
...
SplFixedArray object and bug #60560 (SplFixedArray un-/serialize, getSize(),
count() return 0, keys are strings).
2013-06-28 13:50:33 -07:00
Xinchen Hui
c2cfc242c4
Merge branch 'PHP-5.4' into PHP-5.5
2013-06-27 12:38:13 +08:00
Xinchen Hui
fa8611c81e
Fixed bug #65136 (RecursiveDirectoryIterator segfault)
2013-06-27 12:37:57 +08:00
Felipe Pena
f5bf90ef34
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
- Fixed bug #62672 (Error on serialize of ArrayObject) patch by: lior dot k at zend dot com
- BFN
2013-06-25 21:18:34 -03:00
Felipe Pena
04db57066d
- Fixed bug #62672 (Error on serialize of ArrayObject) patch by: lior dot k at zend dot com
2013-06-25 21:18:09 -03:00