]>
granicus.if.org Git - php/log
Nikita Popov [Thu, 5 Sep 2019 16:29:30 +0000 (18:29 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Thu, 5 Sep 2019 14:35:40 +0000 (16:35 +0200)]
Fix pipe detection and stream position handling
There are two related changes here:
1. Also check for S_ISCHR/FILE_TYPE_CHAR when checking for pipes, so
that we detect ttys as well, which are also not seekable.
2. Always set position=-1 (i.e. ftell will return false) when a pipe
is detected. Previously position=0 was sometimes used, depending on
whether we're on Windows/Linux and whether the FD or FILE codepath
was used.
Dmitry Stogov [Thu, 5 Sep 2019 12:35:42 +0000 (15:35 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Revert "Microoptimization (avoid code duplication)"
Dmitry Stogov [Thu, 5 Sep 2019 12:35:19 +0000 (15:35 +0300)]
Revert "Microoptimization (avoid code duplication)"
This reverts commit
25d97f5eeeaf2eca760139f04fe2711e71791d0f .
Dmitry Stogov [Thu, 5 Sep 2019 10:45:25 +0000 (13:45 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Microoptimization (avoid code duplication)
Dmitry Stogov [Thu, 5 Sep 2019 10:44:46 +0000 (13:44 +0300)]
Microoptimization (avoid code duplication)
Dmitry Stogov [Thu, 5 Sep 2019 10:21:47 +0000 (13:21 +0300)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
Load execute_data without global regs
Nikita Popov [Thu, 5 Sep 2019 08:46:50 +0000 (10:46 +0200)]
Load execute_data without global regs
Dmitry Stogov [Thu, 5 Sep 2019 08:43:13 +0000 (11:43 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove HOT attribute from some VM handlers. Comparisons almost always followed by JMPZ/JMPNZ; JMPZNZ is rare used.
Remove --with-zlib-dir option from mysqlnd config
Nikita Popov [Thu, 5 Sep 2019 08:40:45 +0000 (10:40 +0200)]
Merge branch 'PHP-7.4'
Dmitry Stogov [Thu, 5 Sep 2019 08:40:15 +0000 (11:40 +0300)]
Remove HOT attribute from some VM handlers. Comparisons almost always followed by JMPZ/JMPNZ; JMPZNZ is rare used.
Nikita Popov [Thu, 5 Sep 2019 08:39:04 +0000 (10:39 +0200)]
Remove --with-zlib-dir option from mysqlnd config
mysqlnd doesn't actually use this. PDO MySQL uses it, but also
declares it separately.
Nikita Popov [Thu, 5 Sep 2019 08:05:46 +0000 (10:05 +0200)]
Fix deprecated args freeing with JIT
I'm including the logic for this rare case in the helper function
to avoid complicating the main JIT logic.
Nikita Popov [Wed, 4 Sep 2019 13:33:16 +0000 (15:33 +0200)]
Merge branch 'PHP-7.4'
Mark [Tue, 3 Sep 2019 23:10:56 +0000 (01:10 +0200)]
Warnings to Errors: imagesetstyle
Nikita Popov [Wed, 4 Sep 2019 12:43:42 +0000 (14:43 +0200)]
Improve exception handling for abstract/deprecated calls
Reuse existing arg freeing loop instead of duplicating it.
Additionally also handle deprecated in DO_FCALL_BY_NAME.
Mark [Tue, 3 Sep 2019 23:16:09 +0000 (01:16 +0200)]
Warnings to errors in imageaffinematrix*()
Mark [Tue, 3 Sep 2019 23:53:16 +0000 (01:53 +0200)]
Warnings to errors in imagecrop(auto)
Nikita Popov [Wed, 4 Sep 2019 10:46:34 +0000 (12:46 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Wed, 4 Sep 2019 10:34:20 +0000 (12:34 +0200)]
Fix handling of abstract/deprecated exception
The exception mechanism assumes that exceptions from DO_FCALL are
already happening after the function call. This means that we are
currently leaking the passed arguments, and I think we can also
corrupt the VM stack due to incorrect frame linking in some cases
(there are assertion failures if the VM stack page size is reduced).
Instead handle the stack frame freeing manually for this special
case.
Mark [Tue, 3 Sep 2019 23:38:41 +0000 (01:38 +0200)]
Warnings to errors imageconvolution
Mark [Tue, 3 Sep 2019 23:46:41 +0000 (01:46 +0200)]
Warnings become errors for imagepolygon et al
Mark [Tue, 3 Sep 2019 23:49:30 +0000 (01:49 +0200)]
Negative checks for gamma
Mark [Wed, 4 Sep 2019 00:09:41 +0000 (02:09 +0200)]
Warnings for image colour range check now throw exceptions
Mark [Tue, 3 Sep 2019 23:56:40 +0000 (01:56 +0200)]
Warnings to errors for imagecreatefromgd2part
We also delete tests which were duplicates of a completely unrelated
test.
Mark [Tue, 3 Sep 2019 23:42:28 +0000 (01:42 +0200)]
Warnings to Errors imagetruecolortopalette
Mark [Tue, 3 Sep 2019 23:55:31 +0000 (01:55 +0200)]
Warnings to Errors imagecreate(truecolor)
We also add a test helper which we will be using for other GD functions
as well.
Christoph M. Becker [Wed, 4 Sep 2019 09:54:26 +0000 (11:54 +0200)]
Add ext/xmlreader stubs
Christoph M. Becker [Wed, 4 Sep 2019 08:58:37 +0000 (10:58 +0200)]
Add missing zend_parse_paramters_none()
Dmitry Stogov [Wed, 4 Sep 2019 09:16:54 +0000 (12:16 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed bug #78488 (OOB in ZEND_FUNCTION(ffi_trampoline)).
Dmitry Stogov [Wed, 4 Sep 2019 09:13:49 +0000 (12:13 +0300)]
Fixed bug #78488 (OOB in ZEND_FUNCTION(ffi_trampoline)).
Dmitry Stogov [Wed, 4 Sep 2019 09:15:15 +0000 (12:15 +0300)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
Add missing opcache return types for functions in spl
Dmitry Stogov [Wed, 4 Sep 2019 09:14:15 +0000 (12:14 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed bug #78488 (OOB in ZEND_FUNCTION(ffi_trampoline)).
Dmitry Stogov [Wed, 4 Sep 2019 09:13:49 +0000 (12:13 +0300)]
Fixed bug #78488 (OOB in ZEND_FUNCTION(ffi_trampoline)).
Nikita Popov [Wed, 4 Sep 2019 09:12:56 +0000 (11:12 +0200)]
Merge branch 'PHP-7.4'
Tyson Andre [Tue, 3 Sep 2019 02:33:30 +0000 (22:33 -0400)]
Add missing opcache return types for functions in spl
(excluding spl_autoload)
spl_object_id() is of the most interest to me,
since I frequently call it in an application.
This includes false/null types caused by wrong argument types and wrong argument
counts.
I can't rule out iterator_to_array returning null in spl_iterator_apply,
so leave MAY_BE_NULL in.
With review comments by nikic:
Co-Authored-By: Nikita Popov <nikita.ppv@googlemail.com>
Christoph M. Becker [Wed, 4 Sep 2019 07:55:27 +0000 (09:55 +0200)]
Declare nullable arguments in stubs
Christoph M. Becker [Wed, 4 Sep 2019 06:54:07 +0000 (08:54 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Add the last missing SKIPIF
Fabien Villepinte [Tue, 3 Sep 2019 20:54:41 +0000 (22:54 +0200)]
Add the last missing SKIPIF
Christoph M. Becker [Wed, 4 Sep 2019 06:51:24 +0000 (08:51 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Add missing SKIPIF (mbstring)
Fabien Villepinte [Tue, 3 Sep 2019 20:21:01 +0000 (22:21 +0200)]
Add missing SKIPIF (mbstring)
Fabien Villepinte [Tue, 3 Sep 2019 20:15:55 +0000 (22:15 +0200)]
Add missing SKIPIF (xml)
Christoph M. Becker [Wed, 4 Sep 2019 06:43:51 +0000 (08:43 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Add missing SKIPIF (openssl)
Fabien Villepinte [Tue, 3 Sep 2019 20:05:29 +0000 (22:05 +0200)]
Add missing SKIPIF (openssl)
Co-Authored-By: Gabriel Caruso <carusogabriel34@gmail.com>
Christoph M. Becker [Wed, 4 Sep 2019 06:39:34 +0000 (08:39 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Add missing SKIPIF (sqlite)
Fabien Villepinte [Tue, 3 Sep 2019 19:07:12 +0000 (21:07 +0200)]
Add missing SKIPIF (sqlite)
Christoph M. Becker [Wed, 4 Sep 2019 06:36:39 +0000 (08:36 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Add missing SKIPIF
Fabien Villepinte [Tue, 3 Sep 2019 18:57:39 +0000 (20:57 +0200)]
Add missing SKIPIF
Christoph M. Becker [Tue, 3 Sep 2019 20:51:57 +0000 (22:51 +0200)]
Fix default value
Christoph M. Becker [Tue, 3 Sep 2019 12:08:52 +0000 (14:08 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Document opcache.preload_user directive
Christoph M. Becker [Tue, 3 Sep 2019 12:06:56 +0000 (14:06 +0200)]
Document opcache.preload_user directive
Nikita Popov [Tue, 3 Sep 2019 11:59:59 +0000 (13:59 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Tue, 3 Sep 2019 11:14:33 +0000 (13:14 +0200)]
Report false for inherited private methods in method_exists()
These shadow methods only exist as internal implementation markers.
This mirrors the behavior of property_exists().
Christoph M. Becker [Tue, 3 Sep 2019 11:33:52 +0000 (13:33 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #41997: SP call yields additional empty result set
Christoph M. Becker [Tue, 3 Sep 2019 11:32:40 +0000 (13:32 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #41997: SP call yields additional empty result set
Christoph M. Becker [Tue, 3 Sep 2019 11:30:05 +0000 (13:30 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #41997: SP call yields additional empty result set
Christoph M. Becker [Tue, 6 Aug 2019 12:30:41 +0000 (14:30 +0200)]
Fix #41997: SP call yields additional empty result set
When stored procedures are called, the "final result set is a status
result that includes no result set". Calling `::nextRowset()` on the
actual last result set should return FALSE, since there is actually no
further result set to be processed.
Dmitry Stogov [Tue, 3 Sep 2019 11:23:44 +0000 (14:23 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Execute preload script under user defined by opcache.preload_user directive
Dmitry Stogov [Tue, 3 Sep 2019 11:23:13 +0000 (14:23 +0300)]
Execute preload script under user defined by opcache.preload_user directive
Christoph M. Becker [Tue, 3 Sep 2019 11:11:08 +0000 (13:11 +0200)]
Don't explicitly set return value on ZPP failure in ext/xml
Failing ZPP throws as of PHP 8.0.0, so explicitly setting a return
value is useless, and also slightly confusing.
Christoph M. Becker [Tue, 3 Sep 2019 11:04:37 +0000 (13:04 +0200)]
Add ext/xml stubs
Nikita Popov [Tue, 3 Sep 2019 10:28:35 +0000 (12:28 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Tue, 3 Sep 2019 10:01:56 +0000 (12:01 +0200)]
Avoid pointer UB in strip_header
Don't calculate header_start if lc_header_start is NULL, as we're
going to overflow the address space in that case.
Nikita Popov [Tue, 3 Sep 2019 09:05:47 +0000 (11:05 +0200)]
Use unsigned subtraction in php_random_int()
This subtraction may overflow the signed domain, which is UB. Use
an unsigned subtraction instead.
Nikita Popov [Tue, 3 Sep 2019 10:16:04 +0000 (12:16 +0200)]
Don't perform coercions in internal func return type assertion
The returned value must match the specified type exactly, as we
can't perform any coercions in non-debug builds.
Fix incorrect stub for easter_date() that slipped through the
assertion for this reason...
Nikita Popov [Tue, 3 Sep 2019 09:38:02 +0000 (11:38 +0200)]
Fix gen_stubs with out-of-tree build
We need to prefix with $(top_srcdir).
Nikita Popov [Tue, 3 Sep 2019 08:32:47 +0000 (10:32 +0200)]
Support computing func info from ret arg info for internal funcs
Nikita Popov [Tue, 3 Sep 2019 08:31:39 +0000 (10:31 +0200)]
Remove duplicate func info for array_key_first/last
Looks like this was already added in master separately...
Derick Rethans [Tue, 3 Sep 2019 08:11:00 +0000 (09:11 +0100)]
Merge branch 'PHP-7.4' of git://github.com/php/php-src into PHP-7.4
Nikita Popov [Tue, 3 Sep 2019 07:58:29 +0000 (09:58 +0200)]
Merge branch 'PHP-7.4'
Tyson Andre [Tue, 3 Sep 2019 02:14:11 +0000 (22:14 -0400)]
Add missing opcache return info for ext/standard.
array_key_first/last returns null for invalid args,
wrong argument counts, and empty arrays.
random_bytes returns a string or throws.
Nikita Popov [Tue, 3 Sep 2019 07:53:51 +0000 (09:53 +0200)]
Merge branch 'PHP-7.4'
Tyson Andre [Tue, 3 Sep 2019 02:14:11 +0000 (22:14 -0400)]
Add new missing functions from ext/hash
Nikita Popov [Tue, 3 Sep 2019 07:50:23 +0000 (09:50 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Tue, 3 Sep 2019 07:50:08 +0000 (09:50 +0200)]
Add zpp check to spl_classes()
Derick Rethans [Tue, 3 Sep 2019 07:46:16 +0000 (07:46 +0000)]
Update NEWS for 7.4.0RC2
Derick Rethans [Tue, 3 Sep 2019 07:44:58 +0000 (07:44 +0000)]
Update NEWS for PHP 7.4.0RC1
Nikita Popov [Tue, 3 Sep 2019 07:44:09 +0000 (09:44 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Tue, 3 Sep 2019 07:43:22 +0000 (09:43 +0200)]
Clarify failure behavior of spl_iterator_apply()
It only fails if it throws, in which case it is meaningless to
set a return value.
Tyson Andre [Tue, 3 Sep 2019 01:45:57 +0000 (21:45 -0400)]
Fix opcache optimizer info for time_nanosleep (again)
Fixes my earlier PR #4617
If I remember correctly,
The F0 macro is used for return values that are guaranteed to not be
reference counted.
The F1 macro is used for return values that may have up to 1 reference
(i.e. MAY_BE_RC1).
I didn't notice that time_nanosleep needed to be F1 since it could
return an array, and that array is reference counted.
Christoph M. Becker [Tue, 3 Sep 2019 07:28:48 +0000 (09:28 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Add missing argument checks
Christoph M. Becker [Tue, 3 Sep 2019 07:25:21 +0000 (09:25 +0200)]
Add missing argument checks
These functions don't expect any arguments, so we check that none are
given.
Nikita Popov [Tue, 3 Sep 2019 07:25:50 +0000 (09:25 +0200)]
php_stream_from_zval can no longer return false
Nikita Popov [Tue, 3 Sep 2019 07:24:20 +0000 (09:24 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Tue, 3 Sep 2019 07:24:05 +0000 (09:24 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Tue, 3 Sep 2019 07:23:55 +0000 (09:23 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Tyson Andre [Tue, 3 Sep 2019 01:32:24 +0000 (21:32 -0400)]
Fix opcache return type for hash_update_stream
It can return false if the resource type is wrong.
```
php > var_export(hash_update_stream(hash_init('md5'),
imagecreate(1,1)));
Warning: hash_update_stream(): supplied resource is not a valid stream
resource in php shell code on line 1
false
```
The return types were initially added in
c88ffa9a5673cb3141660626ba1921671f0b84d6
Christoph M. Becker [Tue, 3 Sep 2019 07:15:41 +0000 (09:15 +0200)]
Don't explicitly set return value on ZFR failure in ext/xmlwriter
Failing `zend_fetch_resource(2)` throws as of PHP 8.0.0, so explicitly
setting a return value is useless, and also slightly confusing.
Christoph M. Becker [Tue, 3 Sep 2019 07:09:57 +0000 (09:09 +0200)]
Add ext/xmlwriter stubs
Dmitry Stogov [Mon, 2 Sep 2019 18:44:10 +0000 (21:44 +0300)]
Fixed pow() function info
Dmitry Stogov [Mon, 2 Sep 2019 16:03:45 +0000 (19:03 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Update PHP_API_VERSION
Dmitry Stogov [Mon, 2 Sep 2019 16:02:40 +0000 (19:02 +0300)]
Update PHP_API_VERSION
Nikita Popov [Mon, 2 Sep 2019 13:38:17 +0000 (15:38 +0200)]
Make ReflectionType an abstract class
This is never instantiated directly, only child classes are used.
Christoph M. Becker [Mon, 2 Sep 2019 13:22:19 +0000 (15:22 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Update NEWS
Christoph M. Becker [Mon, 2 Sep 2019 13:21:49 +0000 (15:21 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Update NEWS
Christoph M. Becker [Mon, 2 Sep 2019 13:21:20 +0000 (15:21 +0200)]
Update NEWS
Christoph M. Becker [Mon, 2 Sep 2019 13:07:48 +0000 (15:07 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #76577: outdated documentation concerning track_errors
Christoph M. Becker [Mon, 2 Sep 2019 13:06:45 +0000 (15:06 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #76577: outdated documentation concerning track_errors
Christoph M. Becker [Mon, 2 Sep 2019 13:05:57 +0000 (15:05 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #76577: outdated documentation concerning track_errors
Christoph M. Becker [Mon, 2 Sep 2019 13:05:01 +0000 (15:05 +0200)]
Fix #76577: outdated documentation concerning track_errors