]>
granicus.if.org Git - php/log
Dmitry Stogov [Thu, 16 Apr 2015 09:32:56 +0000 (12:32 +0300)]
Changed zend_smart_str allocation granularity to do the better job together with Zend MM and avoid useless calls to erealloc().
Dmitry Stogov [Thu, 16 Apr 2015 09:16:03 +0000 (12:16 +0300)]
Mark call frames to closures with ZEND_CALL_CLOSURE flag to avoid expensive check at zend_leave_helper()
Xinchen Hui [Thu, 16 Apr 2015 03:58:50 +0000 (11:58 +0800)]
Remove duplicated assignment
Nikita Popov [Wed, 15 Apr 2015 20:37:51 +0000 (22:37 +0200)]
Add list of reserved classes to UPGRADING
Nikita Popov [Wed, 15 Apr 2015 20:32:19 +0000 (22:32 +0200)]
Add test for recursive __debugInfo()
This also got fixed by switching to object apply count.
Bob Weinand [Wed, 15 Apr 2015 20:17:12 +0000 (22:17 +0200)]
Remove some redundant exception checking/continuing VM instructions
Nikita Popov [Wed, 15 Apr 2015 19:40:41 +0000 (21:40 +0200)]
Add GC support to SPL heap and PQ
ctor/dtor are now no longer called for insert/delete_top operations,
only for cloning and freeing of the object. Otherwise elements will
have a minimum rc of 2 and GC won't be able to free them.
Nikita Popov [Wed, 15 Apr 2015 19:07:34 +0000 (21:07 +0200)]
Use object apply count in var_dump / print_r
Instead of using the array apply count on the debug_info array, use
the object apply count for recursion detection when dumping. This
handles recursion in a more generic way and does not require each
debug_info handler to deal with this.
This allows returning a temporary debug_info array, instead of
having to store it in the object (thus delaying destruction of the
values).
Switch SPL debug_info handlers to use a temporary array.
Bob Weinand [Wed, 15 Apr 2015 19:56:11 +0000 (21:56 +0200)]
Fix bug #69458
Bob Weinand [Wed, 15 Apr 2015 19:41:29 +0000 (21:41 +0200)]
Fix object leak for yield from (added proper refcounting)
Bob Weinand [Tue, 14 Apr 2015 17:53:16 +0000 (19:53 +0200)]
Forgot to transform some errors to engine exceptions
Nikita Popov [Wed, 15 Apr 2015 18:43:41 +0000 (20:43 +0200)]
Return null on zpp failure in Array::exchangeArray()
Method was still returning a value despite zpp failing previously...
Nikita Popov [Wed, 15 Apr 2015 18:26:23 +0000 (20:26 +0200)]
Remove unnecessary retval members in SPL
This is what the rv params are for. Avoid holding onto values
longer than necessary.
Ferenc Kovacs [Wed, 15 Apr 2015 18:04:47 +0000 (20:04 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
this was reverted
Ferenc Kovacs [Wed, 15 Apr 2015 18:04:03 +0000 (20:04 +0200)]
this was reverted
Nikita Popov [Wed, 15 Apr 2015 18:01:16 +0000 (20:01 +0200)]
Fix leak in RecursiveRegexIterator::getChildren()
Ferenc Kovacs [Wed, 15 Apr 2015 18:01:13 +0000 (20:01 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
66550 will be part of 5.6.8
66550 will be part of 5.5.24
Dmitry Stogov [Wed, 15 Apr 2015 17:55:38 +0000 (20:55 +0300)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
Fix leaks in recursive iterator construction
Ferenc Kovacs [Wed, 15 Apr 2015 17:54:30 +0000 (19:54 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
66550 will be part of 5.5.24
Ferenc Kovacs [Wed, 15 Apr 2015 17:54:25 +0000 (19:54 +0200)]
66550 will be part of 5.6.8
Ferenc Kovacs [Wed, 15 Apr 2015 17:53:38 +0000 (19:53 +0200)]
66550 will be part of 5.5.24
Dmitry Stogov [Wed, 15 Apr 2015 17:53:27 +0000 (20:53 +0300)]
eliminate unnecessary EX(opline) <-> opline reloading
Nikita Popov [Wed, 15 Apr 2015 17:49:50 +0000 (19:49 +0200)]
Fix leaks in recursive iterator construction
Ferenc Kovacs [Wed, 15 Apr 2015 16:53:39 +0000 (18:53 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
reorder entries, Core is always the first block
Ferenc Kovacs [Wed, 15 Apr 2015 16:53:22 +0000 (18:53 +0200)]
reorder entries, Core is always the first block
Ferenc Kovacs [Wed, 15 Apr 2015 16:39:30 +0000 (18:39 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
add missing NEWS entry
add missing space to the NEWS entries to align properly
Ferenc Kovacs [Wed, 15 Apr 2015 16:39:16 +0000 (18:39 +0200)]
add missing NEWS entry
Ferenc Kovacs [Wed, 15 Apr 2015 16:38:48 +0000 (18:38 +0200)]
add missing space to the NEWS entries to align properly
Ferenc Kovacs [Wed, 15 Apr 2015 16:37:20 +0000 (18:37 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
add missing space to the NEWS entries to align properly
Ferenc Kovacs [Wed, 15 Apr 2015 16:36:52 +0000 (18:36 +0200)]
add missing space to the NEWS entries to align properly
Anatol Belski [Wed, 15 Apr 2015 14:11:35 +0000 (16:11 +0200)]
fix possible int overflow
Anatol Belski [Wed, 15 Apr 2015 14:06:46 +0000 (16:06 +0200)]
fix datatype mismatches
Anatol Belski [Wed, 15 Apr 2015 14:02:15 +0000 (16:02 +0200)]
optimize structs
Anatol Belski [Wed, 15 Apr 2015 11:44:12 +0000 (13:44 +0200)]
fix data type and 64-bit compat
Remi Collet [Wed, 15 Apr 2015 15:38:01 +0000 (17:38 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
bump zip release to match pecl version
Remi Collet [Wed, 15 Apr 2015 15:37:12 +0000 (17:37 +0200)]
bump zip release to match pecl version
Dmitry Stogov [Wed, 15 Apr 2015 14:02:21 +0000 (17:02 +0300)]
Optimization of stack-frame construction
Julien Pauli [Wed, 15 Apr 2015 12:41:41 +0000 (14:41 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Updated NEWS
Julien Pauli [Wed, 15 Apr 2015 12:40:33 +0000 (14:40 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Updated NEWS
Julien Pauli [Wed, 15 Apr 2015 12:40:00 +0000 (14:40 +0200)]
Updated NEWS
Dmitry Stogov [Wed, 15 Apr 2015 11:20:59 +0000 (14:20 +0300)]
Make valgrind happy
Dmitry Stogov [Wed, 15 Apr 2015 10:34:23 +0000 (13:34 +0300)]
Avoid double refcounting
Anatol Belski [Wed, 15 Apr 2015 09:10:29 +0000 (11:10 +0200)]
Merge branch 'PHP-5.6'
* PHP-5.6:
fix dir separator in test
Anatol Belski [Wed, 15 Apr 2015 09:09:54 +0000 (11:09 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix dir separator in test
Anatol Belski [Wed, 15 Apr 2015 09:07:13 +0000 (11:07 +0200)]
fix dir separator in test
Xinchen Hui [Wed, 15 Apr 2015 02:44:51 +0000 (10:44 +0800)]
Merge branch 'PHP-5.6'
Conflicts:
Zend/zend_exceptions.c
Xinchen Hui [Wed, 15 Apr 2015 02:39:17 +0000 (10:39 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6
Xinchen Hui [Wed, 15 Apr 2015 02:38:55 +0000 (10:38 +0800)]
Fixed res leak
Xinchen Hui [Wed, 15 Apr 2015 02:37:35 +0000 (10:37 +0800)]
Fixed warnings
Nikita Popov [Tue, 14 Apr 2015 20:15:38 +0000 (22:15 +0200)]
Fix leak when calling ->get() on tmp property
Nikita Popov [Tue, 14 Apr 2015 19:43:43 +0000 (21:43 +0200)]
Fix leak in timezone_open when instantiation fails
Nikita Popov [Tue, 14 Apr 2015 19:36:17 +0000 (21:36 +0200)]
Regenerate tokenizer data
Nikita Popov [Tue, 14 Apr 2015 19:35:38 +0000 (21:35 +0200)]
Drop ??? for AST_ZNODE in ast pretty printer
Stanislav Malyshev [Tue, 14 Apr 2015 18:13:17 +0000 (11:13 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed recently introduced memory leak
Fix Bug #69402: Reading empty SSL stream hangs until timeout
Stanislav Malyshev [Tue, 14 Apr 2015 18:12:58 +0000 (11:12 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed recently introduced memory leak
Fix Bug #69402: Reading empty SSL stream hangs until timeout
Stanislav Malyshev [Tue, 14 Apr 2015 18:12:48 +0000 (11:12 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed recently introduced memory leak
Dmitry Stogov [Tue, 14 Apr 2015 12:47:26 +0000 (15:47 +0300)]
Fixed recently introduced memory leak
Nikita Popov [Tue, 14 Apr 2015 17:15:40 +0000 (19:15 +0200)]
Add "yield from" support to ast pretty printer
Dmitry Stogov [Tue, 14 Apr 2015 16:54:30 +0000 (19:54 +0300)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
Add NEWS/UPGRADING and some implementation notes
Dmitry Stogov [Tue, 14 Apr 2015 16:53:56 +0000 (19:53 +0300)]
Fixed bug #69446 (GC leak relating to removal of nested data after dtors run)
Bob Weinand [Tue, 14 Apr 2015 16:35:47 +0000 (18:35 +0200)]
Add NEWS/UPGRADING and some implementation notes
Bob Weinand [Tue, 14 Apr 2015 16:02:18 +0000 (18:02 +0200)]
Merge branch 'master' of https://github.com/php/php-src
Bob Weinand [Tue, 14 Apr 2015 15:58:58 +0000 (17:58 +0200)]
Merge branch 'coroutineDelegation' of https://github.com/bwoebi/php-src
Levi Morrison [Tue, 14 Apr 2015 15:45:41 +0000 (09:45 -0600)]
Fix bug #69448
ReflectionClass::newInstanceWithoutConstructor should not call
object_init_ex when the class is internal and final. This is because
the class dtor may rely on the ctor being called and in some cases
this will cause a segfault.
Daniel Lowrey [Tue, 14 Apr 2015 15:42:01 +0000 (09:42 -0600)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Update NEWS
Daniel Lowrey [Tue, 14 Apr 2015 15:37:17 +0000 (09:37 -0600)]
Update NEWS
Daniel Lowrey [Tue, 14 Apr 2015 15:27:37 +0000 (09:27 -0600)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fix Bug #69402: Reading empty SSL stream hangs until timeout
Conflicts:
ext/openssl/xp_ssl.c
Daniel Lowrey [Tue, 14 Apr 2015 15:12:28 +0000 (09:12 -0600)]
Fix Bug #69402: Reading empty SSL stream hangs until timeout
Daniel Lowrey [Tue, 14 Apr 2015 15:12:28 +0000 (09:12 -0600)]
Fix Bug #69402: Reading empty SSL stream hangs until timeout
Nikita Popov [Tue, 14 Apr 2015 14:38:09 +0000 (16:38 +0200)]
Merge branch 'PHP-5.6'
Conflicts:
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
Nikita Popov [Tue, 14 Apr 2015 14:36:09 +0000 (16:36 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
Nikita Popov [Tue, 14 Apr 2015 14:35:23 +0000 (16:35 +0200)]
Fixed bug #69419
Dmitry Stogov [Tue, 14 Apr 2015 14:18:55 +0000 (17:18 +0300)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Bug #63336 is not a bug
fix test
Conflicts:
Zend/tests/bug63336.phpt
Dmitry Stogov [Tue, 14 Apr 2015 14:16:57 +0000 (17:16 +0300)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Bug #63336 is not a bug
Dmitry Stogov [Tue, 14 Apr 2015 14:15:50 +0000 (17:15 +0300)]
Bug #63336 is not a bug
Dmitry Stogov [Tue, 14 Apr 2015 13:42:35 +0000 (16:42 +0300)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
fix test
Dmitry Stogov [Tue, 14 Apr 2015 13:42:02 +0000 (16:42 +0300)]
Fixed use after free
Anatol Belski [Tue, 14 Apr 2015 13:20:44 +0000 (15:20 +0200)]
fix test
Anatol Belski [Tue, 14 Apr 2015 13:21:47 +0000 (15:21 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix test
Anatol Belski [Tue, 14 Apr 2015 13:20:44 +0000 (15:20 +0200)]
fix test
Dmitry Stogov [Tue, 14 Apr 2015 12:49:44 +0000 (15:49 +0300)]
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixed recently introduced memory leak
Dmitry Stogov [Tue, 14 Apr 2015 12:48:20 +0000 (15:48 +0300)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed recently introduced memory leak
Dmitry Stogov [Tue, 14 Apr 2015 12:47:26 +0000 (15:47 +0300)]
Fixed recently introduced memory leak
Dmitry Stogov [Tue, 14 Apr 2015 12:35:33 +0000 (15:35 +0300)]
Partial revert of
1a7798c786466977ef8d2bc95b40a435c47c845a that introduced wrong memory access
Xinchen Hui [Tue, 14 Apr 2015 11:50:03 +0000 (19:50 +0800)]
Merge branch 'master' of https://git.php.net/repository/php-src
Xinchen Hui [Tue, 14 Apr 2015 11:49:00 +0000 (19:49 +0800)]
Fixed test in PHP7
Dmitry Stogov [Tue, 14 Apr 2015 11:46:26 +0000 (14:46 +0300)]
Fixed recently introduced memory leak
Xinchen Hui [Tue, 14 Apr 2015 11:33:46 +0000 (19:33 +0800)]
Merge branch 'PHP-5.6'
Conflicts:
Zend/zend_exceptions.c
Xinchen Hui [Tue, 14 Apr 2015 11:32:28 +0000 (19:32 +0800)]
Merge branch 'PHP-5.5' into PHP-5.6
Xinchen Hui [Tue, 14 Apr 2015 11:32:01 +0000 (19:32 +0800)]
codes standard
Dmitry Stogov [Tue, 14 Apr 2015 10:45:05 +0000 (13:45 +0300)]
Fixed memory leak in ext/standard/tests/array/compact_variation1.phpt
Dmitry Stogov [Tue, 14 Apr 2015 10:09:31 +0000 (13:09 +0300)]
Use Z_TYPE_INFO_P() instead Z_TYPE_P() when we check for few scalar types. This allow C compiler to generate the better code.
Derick Rethans [Tue, 14 Apr 2015 09:51:15 +0000 (10:51 +0100)]
- Updated to version 2015.3 (2015c)
Derick Rethans [Tue, 14 Apr 2015 09:51:15 +0000 (10:51 +0100)]
Empty merge
Derick Rethans [Tue, 14 Apr 2015 09:51:12 +0000 (10:51 +0100)]
- Updated to version 2015.3 (2015c)
Derick Rethans [Tue, 14 Apr 2015 09:51:11 +0000 (10:51 +0100)]
Empty merge
Derick Rethans [Tue, 14 Apr 2015 09:51:10 +0000 (10:51 +0100)]
- Updated to version 2015.3 (2015c)
Stanislav Malyshev [Tue, 14 Apr 2015 08:30:59 +0000 (01:30 -0700)]
Merge remote-tracking branch 'origin/master'
* origin/master:
What should we version the bundled opcache?
Stanislav Malyshev [Tue, 14 Apr 2015 08:20:31 +0000 (01:20 -0700)]
Merge branch 'PHP-5.6'
* PHP-5.6: (27 commits)
fix non-standard C
update NEWS
5.4.41 next
fix CVE num
update NEWS
Fix bug #69441 (Buffer Overflow when parsing tar/zip/phar in phar_set_inode)
fix test
fix type in fix for #69085
fix memory leak & add test
Fix tests
fix CVE num
Fix bug #69337 (php_stream_url_wrap_http_ex() type-confusion vulnerability)
Fix test
Additional fix for bug #69324
More fixes for bug #69152
Fixed bug #69353 (Missing null byte checks for paths in various PHP extensions)
Fixed bug #69324 (Buffer Over-read in unserialize when parsing Phar)
Fixed bug #69316 (Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEADER)
Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4)
Fix bug #68819 (Fileinfo on specific file causes spurious OOM and/or segfault)
...
Conflicts:
Zend/zend_exceptions.c
ext/curl/interface.c
ext/dom/document.c
ext/fileinfo/libmagic/softmagic.c
ext/gd/gd.c
ext/hash/hash.c
ext/pgsql/pgsql.c
ext/phar/phar.c
ext/phar/phar_internal.h
ext/standard/http_fopen_wrapper.c
ext/standard/link.c
ext/standard/streamsfuncs.c
ext/xmlwriter/php_xmlwriter.c
ext/zlib/zlib.c
Xinchen Hui [Tue, 14 Apr 2015 08:20:01 +0000 (16:20 +0800)]
What should we version the bundled opcache?