]>
granicus.if.org Git - php/log
Nikita Popov [Mon, 9 Sep 2019 15:19:12 +0000 (17:19 +0200)]
Merge branch 'PHP-7.4'
Tyson Andre [Mon, 9 Sep 2019 12:30:18 +0000 (08:30 -0400)]
Add opcache return type for random_int()
random_int() will throw for incorrect argument counts, types (e.g. float
that can't cast to int), or having min > max.
See ext/standard/random.c
Nikita Popov [Mon, 9 Sep 2019 15:15:41 +0000 (17:15 +0200)]
Merge branch 'PHP-7.4'
Tyson Andre [Sun, 8 Sep 2019 19:14:02 +0000 (15:14 -0400)]
Fix opcache zend_func_info for microtime/gettimeofday
microtime() doesn't return an array,
and gettimeofday() doesn't return a string.
See _php_gettimeofday in microtime.c (mode is non-zero for gettimeofday)
Nikita Popov [Mon, 9 Sep 2019 15:11:22 +0000 (17:11 +0200)]
Clarify that our usage of gettimeofday() is infallible
And that false can't be returned for this reason.
Christoph M. Becker [Mon, 9 Sep 2019 13:44:56 +0000 (15:44 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix version
Christoph M. Becker [Mon, 9 Sep 2019 13:44:36 +0000 (15:44 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix version
Christoph M. Becker [Thu, 5 Sep 2019 17:33:17 +0000 (19:33 +0200)]
Fix version
7.3.10 is next, not 7.3.11.
Christoph M. Becker [Mon, 9 Sep 2019 13:33:36 +0000 (15:33 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #78510: Partially uninitialized buffer returned by sodium_crypto_generichash_init()
Christoph M. Becker [Mon, 9 Sep 2019 13:32:44 +0000 (15:32 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #78510: Partially uninitialized buffer returned by sodium_crypto_generichash_init()
Christoph M. Becker [Mon, 9 Sep 2019 13:30:57 +0000 (15:30 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #78510: Partially uninitialized buffer returned by sodium_crypto_generichash_init()
Christoph M. Becker [Mon, 9 Sep 2019 13:30:28 +0000 (15:30 +0200)]
Fix #78510: Partially uninitialized buffer returned by sodium_crypto_generichash_init()
Backport jedisct1/libsodium.php@
28d13bf437cb969a0583031fc7ac54c5a8dc8116 .
Nikita Popov [Mon, 9 Sep 2019 12:24:39 +0000 (14:24 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 9 Sep 2019 12:24:26 +0000 (14:24 +0200)]
Fix typo
Remi Collet [Mon, 9 Sep 2019 12:22:24 +0000 (14:22 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
zip edxtension is now 1.15.5
fix type consistency after
8f897f1040f00210f4a5cdd82a88a1fe3e558955
Remi Collet [Mon, 9 Sep 2019 12:22:12 +0000 (14:22 +0200)]
zip edxtension is now 1.15.5
Remi Collet [Mon, 9 Sep 2019 12:20:57 +0000 (14:20 +0200)]
Nikita Popov [Mon, 9 Sep 2019 09:37:36 +0000 (11:37 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 9 Sep 2019 09:36:50 +0000 (11:36 +0200)]
Fixed bug #78514
The property class may have already been translated as part of
some other class. Only translate if xlat returns non-null.
Nikita Popov [Mon, 9 Sep 2019 08:50:30 +0000 (10:50 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 9 Sep 2019 08:50:10 +0000 (10:50 +0200)]
Fix PDO pgsql memory leak with scrollable cursors
Nikita Popov [Mon, 9 Sep 2019 08:11:54 +0000 (10:11 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 9 Sep 2019 08:10:41 +0000 (10:10 +0200)]
Fix double free of DSN credentials
Peter Kokot [Sun, 8 Sep 2019 19:50:06 +0000 (21:50 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Update NEWS
Fix #78349: Bundled pcre2 library missing LICENCE file
Peter Kokot [Sun, 8 Sep 2019 19:49:42 +0000 (21:49 +0200)]
Update NEWS
Peter Kokot [Sun, 8 Sep 2019 19:46:48 +0000 (21:46 +0200)]
Fix #78349: Bundled pcre2 library missing LICENCE file
Most bundled libraries in PHP code already include license information
in the dedicated README.REDIST.BINS file. Instead of complicating
documentation files more this patch only updates the PCRE license info
in the readme file.
蝦米 [Sun, 8 Sep 2019 10:51:20 +0000 (18:51 +0800)]
fix missing close bracket
[ci skip][skip ci]
Nikita Popov [Sat, 7 Sep 2019 20:48:12 +0000 (22:48 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Sat, 7 Sep 2019 20:47:07 +0000 (22:47 +0200)]
Fix reporting of redirect test failures in junit
These were being reported under the wrong name ... which means that
they don't show up as failures on azure :(
Dmitry Stogov [Sat, 7 Sep 2019 08:59:26 +0000 (11:59 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Link executable files using non PIC object files. This reduces PIC overhead and improves performance.
Dmitry Stogov [Tue, 3 Sep 2019 20:42:22 +0000 (23:42 +0300)]
Link executable files using non PIC object files. This reduces PIC overhead and improves performance.
Nikita Popov [Thu, 5 Sep 2019 08:27:19 +0000 (10:27 +0200)]
Detect calls to abstract methods in get_method() already
Instead of checking for this during DO_FCALL, already detect this
case during get_method()/get_static_method(), similar to visibility
checks.
This causes a minor difference in behavior, in that arguments will
no longer be evaluated. I think this is correct though (and consistent
with visibility errors).
Nikita Popov [Fri, 6 Sep 2019 13:00:17 +0000 (15:00 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Fri, 6 Sep 2019 12:59:41 +0000 (14:59 +0200)]
Remove defines for specific oraldap versions
These are not used for anything.
Nikita Popov [Fri, 6 Sep 2019 12:57:26 +0000 (14:57 +0200)]
Remove support for umich_ldap
Doesn't seem to exist anymore, and their website now redirects to
openldap.
Nikita Popov [Fri, 6 Sep 2019 12:48:31 +0000 (14:48 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Fri, 30 Aug 2019 08:21:07 +0000 (10:21 +0200)]
Remove nsldap support
The newest version we're checking (libssldap50) seems to be about
15 years out of date. We could add support for libssldap60 (also
unmainted, but more recent), but given how nobody has expressed any
interest in this, I'm going ahead and dropping this code.
Nikita Popov [Fri, 6 Sep 2019 12:36:50 +0000 (14:36 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Thu, 29 Aug 2019 15:43:48 +0000 (17:43 +0200)]
Fix detection of gmp on clang
Split the default and custom path case. If the default is used,
assume that the library must be on the default include and lib path.
Only check that the version is appropriate.
Something similar is needed for ldap, but the checking code is much
more complex there, so I'm only adding a workaround for now.
Nikita Popov [Mon, 2 Sep 2019 08:13:54 +0000 (10:13 +0200)]
Enable display_startup_errors by default
Nikita Popov [Fri, 6 Sep 2019 09:33:36 +0000 (11:33 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Fri, 6 Sep 2019 09:30:01 +0000 (11:30 +0200)]
Fixed bug #78502
We need to make sure that the function is fully compiled before we
calculate the stack size. There already was a check for directly
recursive calls, but the same issue exists with indirectly recursive
calls.
I'm using DONE_PASS_TWO as the indication that the function is
fully compiled.
Dmitry Stogov [Fri, 6 Sep 2019 08:45:43 +0000 (11:45 +0300)]
Merge branch 'non_pic'
* non_pic:
Link executable files using non PIC object files. This reduces PIC overhead and improves performance.
Christoph M. Becker [Thu, 5 Sep 2019 17:37:43 +0000 (19:37 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix version
Christoph M. Becker [Thu, 5 Sep 2019 17:35:12 +0000 (19:35 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix version
Christoph M. Becker [Thu, 5 Sep 2019 17:33:17 +0000 (19:33 +0200)]
Fix version
7.3.10 is next, not 7.3.11.
Stanislav Malyshev [Thu, 5 Sep 2019 16:56:20 +0000 (09:56 -0700)]
Merge branch 'PHP-7.4'
* PHP-7.4:
fix version
Stanislav Malyshev [Thu, 5 Sep 2019 16:55:54 +0000 (09:55 -0700)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
fix version
Stanislav Malyshev [Thu, 5 Sep 2019 16:54:43 +0000 (09:54 -0700)]
fix version
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
Dmitry Stogov [Tue, 3 Sep 2019 20:42:22 +0000 (23:42 +0300)]
Link executable files using non PIC object files. This reduces PIC overhead and improves performance.
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