]>
granicus.if.org Git - php/log
Nikita Popov [Mon, 14 Jan 2019 09:24:11 +0000 (10:24 +0100)]
Merge branch 'PHP-7.3'
Nikita Popov [Mon, 14 Jan 2019 09:23:44 +0000 (10:23 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Mon, 14 Jan 2019 09:21:41 +0000 (10:21 +0100)]
Fixed bug #77454
Dmitry Stogov [Mon, 14 Jan 2019 08:47:50 +0000 (11:47 +0300)]
Added FFI extension
Nikita Popov [Mon, 14 Jan 2019 08:17:28 +0000 (09:17 +0100)]
Revert removal of private __clone() methods
I thought these were redundant, because we already NULL out the
clone_obj object handler. However, it turns out that reflection is
using private __clone() to determine clonability (isCloneable) for
the case where we only have a class, rather than an object.
As such, removing these methods would be a BC break.
This reverts commit
e7131a4e9fa0acf8fc1e486b49851e71859ef5b8 .
This reverts commit
55bd88ce0d1bf461546d5d0b40920491d566ed48 .
Nikita Popov [Mon, 14 Jan 2019 08:16:07 +0000 (09:16 +0100)]
Change zend_try_array_init_size arg to uint32_t
If this is all the underlying API supports, it doesn't make sense to
accept something larger here...
Kalle Sommer Nielsen [Mon, 14 Jan 2019 07:05:44 +0000 (09:05 +0200)]
Kill this new and insanely annoying warning
Nikita, if this is not the right way to go about it, then please amend it
Anatol Belski [Sat, 12 Jan 2019 21:15:13 +0000 (22:15 +0100)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Update SDK version for AppVeyor
Anatol Belski [Sat, 12 Jan 2019 21:14:35 +0000 (22:14 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Update SDK version for AppVeyor
Anatol Belski [Sat, 12 Jan 2019 21:13:14 +0000 (22:13 +0100)]
Update SDK version for AppVeyor
Nikita Popov [Mon, 7 Jan 2019 11:28:51 +0000 (12:28 +0100)]
Implement typed properties
RFC: https://wiki.php.net/rfc/typed_properties_v2
This is a squash of PR #3734, which is a squash of PR #3313.
Co-authored-by: Bob Weinand <bobwei9@hotmail.com>
Co-authored-by: Joe Watkins <krakjoe@php.net>
Co-authored-by: Dmitry Stogov <dmitry@zend.com>
Eli Schwartz [Wed, 7 Nov 2018 19:24:23 +0000 (14:24 -0500)]
ext/openssl: port to pkg-config macro and consistently require its use
openssl 0.9.8 in July 2005 first added pkg-config support, which is
earlier than the minimum supported version for php. This should
therefore be uiversally supported.
Sammy Kaye Powers [Mon, 19 Nov 2018 23:14:53 +0000 (18:14 -0500)]
Improve openssl_random_pseudo_bytes()
CSPRNG implementations should always fail closed. Now
openssl_random_pseudo_bytes() will fail closed by throwing an
`\Exception` in fail conditions.
RFC: https://wiki.php.net/rfc/improve-openssl-random-pseudo-bytes
Nikita Popov [Fri, 11 Jan 2019 09:55:36 +0000 (10:55 +0100)]
Merge branch 'PHP-7.3'
Nikita Popov [Fri, 11 Jan 2019 09:55:26 +0000 (10:55 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
Ondřej Surý [Mon, 17 Dec 2018 09:56:06 +0000 (09:56 +0000)]
Fix rl_completion_matches detection
Also fix a typo when checking for rl_on_new_line in readline library.
Nikita Popov [Fri, 11 Jan 2019 09:29:45 +0000 (10:29 +0100)]
Merge branch 'PHP-7.3'
Nikita Popov [Fri, 11 Jan 2019 09:25:32 +0000 (10:25 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
Kevin Adler [Thu, 27 Dec 2018 19:54:08 +0000 (13:54 -0600)]
Fix bug #77361 (configure fails on 64-bit AIX when opcache enabled)
In
f9048300123 , support for GNU Hurd was added to the opcache and
the configure check to ensure the opcache knows the flock struct
layout prior to building was changed check for two cases: BSD layout
and Linux layout. All the existing hard-coded cases in
ZendAccelerator.h follow these two cases, except for 64-bit AIX.
This means that even though building on 64-bit AIX would work,
the configure script refuses to continue.
Add a new configure check for the 64-bit AIX case and a new
compiler definition HAVE_FLOCK_AIX64. Now that all the cases are
covered, simplify the ifdef logic around these three HAVE_FLOCK_*
macros:
- The macOS and the various BSD flavors fall under HAVE_FLOCK_BSD
- Linux, HP-UX, GNU Hurd, 32-bit AIX, and SVR4 environments
fall under HAVE_FLOCK_LINUX
- 64-bit AIX falls under HAVE_FLOCK_AIX64
The only difference between the existing HAVE_FLOCK_LINUX and
the hard-coded Linux/HP-UX/Hurd case is that the latter
initialized the 5th member to 0, but since the C standard already
says that un-initialized members will be initialized to 0,
it's effectively the same.
Christoph M. Becker [Thu, 10 Jan 2019 23:21:44 +0000 (00:21 +0100)]
Fix misleading variable type
We port libgd/libgd@
0414bb2da0b27d90b6125bd34a3e2cfb89fd3f42 .
Jakub Zelenka [Thu, 10 Jan 2019 20:17:58 +0000 (20:17 +0000)]
Merge branch 'PHP-7.3'
Jakub Zelenka [Thu, 10 Jan 2019 20:16:06 +0000 (20:16 +0000)]
Merge branch 'PHP-7.2' into PHP-7.3
Alexander Kurilo [Thu, 6 Dec 2018 21:07:18 +0000 (00:07 +0300)]
Fix cleaning up after openssl_pkcs7_verify_basic test
Alexander Kurilo [Sun, 2 Dec 2018 14:08:01 +0000 (17:08 +0300)]
Generate certs for openssl tests on the fly
The idea is to create an easy way to provide a certificate that never
expires. In order to make it cross-platform, PHP is used rather than
openssl CLI app. Using openssl to generate certificates for tests that
test openssl might be not the best idea but pros seem to outweight cons
that this "recursice dependency" adds
Christoph M. Becker [Thu, 10 Jan 2019 17:00:27 +0000 (18:00 +0100)]
Remove unused variables and functions
We remove the unused variables altogether, and port
libgd/libgd@
f50c24e467f1f44f0ede90bc7d2d8eaadbe11094 to silence the
compiler warnings.
Christoph M. Becker [Thu, 10 Jan 2019 15:28:43 +0000 (16:28 +0100)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Fix #73281: imagescale(…, IMG_BILINEAR_FIXED) can cause black border
Christoph M. Becker [Thu, 10 Jan 2019 15:14:56 +0000 (16:14 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #73281: imagescale(…, IMG_BILINEAR_FIXED) can cause black border
Christoph M. Becker [Thu, 10 Jan 2019 15:11:23 +0000 (16:11 +0100)]
Fix #73281: imagescale(…, IMG_BILINEAR_FIXED) can cause black border
We port the upstream fixes for libgd/libgd#329 and libgd/libgd#224.
Nikita Popov [Thu, 10 Jan 2019 14:35:00 +0000 (15:35 +0100)]
Remove unnecessary Z_PARAM_ZVAL_DEREFs
Christoph M. Becker [Thu, 10 Jan 2019 13:25:53 +0000 (14:25 +0100)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Fix #77272: imagescale() may return image resource on failure
Christoph M. Becker [Thu, 10 Jan 2019 13:06:49 +0000 (14:06 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #77272: imagescale() may return image resource on failure
Christoph M. Becker [Thu, 10 Jan 2019 13:03:07 +0000 (14:03 +0100)]
Fix #77272: imagescale() may return image resource on failure
`_gdScaleHoriz()` and `_gdScaleVert()` may fail, but don't signal
failure since they are void functions. We change that according to
upstream libgd.
We also remove the unused `Scale()` function, which doesn't exist in
upstream libgd either, right away.
Nikita Popov [Thu, 10 Jan 2019 11:36:08 +0000 (12:36 +0100)]
Return only debug props in PDORow
Previously this returned properties of a different object, including
INDIRECTs directly, which violates our invariants. Switch this to
only return properties for debugging purposes, without INDIRECTs.
If someone complains we can extend this to other purposes, as needed.
Nikita Popov [Thu, 10 Jan 2019 11:29:14 +0000 (12:29 +0100)]
Use serialize_deny handler in PDORow
Instead of a custom handler denying serialization, use the standard
one.
Nikita Popov [Thu, 10 Jan 2019 11:28:32 +0000 (12:28 +0100)]
Manually initialize PDORow handlers
Makes it easier to see what is specified and what isn't, and allows
grepping...
Nikita Popov [Thu, 10 Jan 2019 09:58:07 +0000 (10:58 +0100)]
Merge branch 'PHP-7.3'
Nikita Popov [Thu, 10 Jan 2019 09:57:13 +0000 (10:57 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Thu, 10 Jan 2019 09:55:19 +0000 (10:55 +0100)]
Fixed bug #77439
Nikita Popov [Thu, 10 Jan 2019 09:27:57 +0000 (10:27 +0100)]
Merge branch 'PHP-7.3'
Nikita Popov [Thu, 10 Jan 2019 09:25:55 +0000 (10:25 +0100)]
Fixed bug #77434
Mark arrays containing partial arrays as partial. This was already
done for the ADD_ARRAY_ELEMENT case, but not for ASSIGN_DIM.
Xinchen Hui [Thu, 10 Jan 2019 06:53:36 +0000 (14:53 +0800)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Incase of invalid read
Xinchen Hui [Thu, 10 Jan 2019 06:50:39 +0000 (14:50 +0800)]
Incase of invalid read
Nikita Popov [Wed, 9 Jan 2019 16:09:48 +0000 (17:09 +0100)]
Require that write_property value is not a reference
We explicitly dereference values before claling write_property,
so no need to do duplicate work.
Anatol Belski [Wed, 9 Jan 2019 15:17:11 +0000 (16:17 +0100)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Revert visibility
Anatol Belski [Wed, 9 Jan 2019 15:16:47 +0000 (16:16 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Revert visibility
Andrey Hristov [Fri, 4 Jan 2019 09:37:54 +0000 (11:37 +0200)]
Revert visibility
(cherry picked from commit
71ffae9605a0b19f4c7a76d317276c934a767a65 )
Christoph M. Becker [Wed, 9 Jan 2019 11:26:38 +0000 (12:26 +0100)]
Update oniguruma.patch wrt. latest security fixes
Christoph M. Becker [Wed, 9 Jan 2019 10:47:39 +0000 (11:47 +0100)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Sync NEWS with 7.3.1
Christoph M. Becker [Wed, 9 Jan 2019 10:46:48 +0000 (11:46 +0100)]
Sync NEWS with 7.3.1
All these bugs are fixed in PHP-7.3.1 already.
jvoisin [Tue, 8 Jan 2019 21:08:40 +0000 (22:08 +0100)]
Fix some sign-related issues in comparisons
Nikita Popov [Wed, 9 Jan 2019 08:51:28 +0000 (09:51 +0100)]
Merge branch 'PHP-7.3'
Lauri Kenttä [Wed, 9 Jan 2019 08:50:26 +0000 (09:50 +0100)]
Fixed bug #77289
Use mysqlnd_restart_psession and mysqlnd_end_psession in PDO MySQL.
This makes sure we free last_message while ZMM is still live.
Nikita Popov [Wed, 9 Jan 2019 08:28:04 +0000 (09:28 +0100)]
Merge branch 'PHP-7.3'
Nikita Popov [Wed, 9 Jan 2019 08:26:49 +0000 (09:26 +0100)]
Make operator swapping depend on IGNORE_OVERLOADING flag
Add MUL back to the list and instead make the entire optimization
depend on IGNORE_OVERLOADING, which is there exactly so we can make
these kinds of assumptions.
Sara Golemon [Tue, 8 Jan 2019 19:20:30 +0000 (14:20 -0500)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Bump for 7.1.27
Sara Golemon [Tue, 8 Jan 2019 19:20:18 +0000 (14:20 -0500)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Bump for 7.1.27
Sara Golemon [Tue, 8 Jan 2019 19:19:37 +0000 (14:19 -0500)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Bump for 7.1.27
Sara Golemon [Tue, 8 Jan 2019 19:17:43 +0000 (14:17 -0500)]
Bump for 7.1.27
Christoph M. Becker [Tue, 8 Jan 2019 16:24:35 +0000 (17:24 +0100)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Sync NEWS with 7.3.1
Christoph M. Becker [Tue, 8 Jan 2019 16:23:30 +0000 (17:23 +0100)]
Sync NEWS with 7.3.1
All these bugs are fixed in PHP-7.3.1 already.
Xinchen Hui [Tue, 8 Jan 2019 11:19:44 +0000 (19:19 +0800)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Fixed bug #77266 (Assertion failed in dce_live_ranges)
Xinchen Hui [Tue, 8 Jan 2019 11:17:46 +0000 (19:17 +0800)]
Fixed bug #77266 (Assertion failed in dce_live_ranges)
Nikita Popov [Tue, 8 Jan 2019 09:21:54 +0000 (10:21 +0100)]
Merge branch 'PHP-7.3'
Nikita Popov [Tue, 8 Jan 2019 09:21:01 +0000 (10:21 +0100)]
Fixed bug #77428
mb_ereg_replace historically has not supported escaping backslashes
with backslashes. Go back to that behavior for BC reasons.
Nikita Popov [Tue, 8 Jan 2019 08:38:11 +0000 (09:38 +0100)]
Merge branch 'PHP-7.3'
Nikita Popov [Tue, 8 Jan 2019 08:38:02 +0000 (09:38 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Tue, 8 Jan 2019 08:36:48 +0000 (09:36 +0100)]
Don't swap operands of ZEND_MUL
If this is used with operator overloading, then the operation does
not necessarily commute (for example, matrix multiplication).
Remi Collet [Tue, 8 Jan 2019 08:34:24 +0000 (09:34 +0100)]
Merge branch 'PHP-7.3'
* PHP-7.3:
cleanup merge
Remi Collet [Tue, 8 Jan 2019 08:34:05 +0000 (09:34 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
cleanup merge
Remi Collet [Tue, 8 Jan 2019 08:33:41 +0000 (09:33 +0100)]
cleanup merge
Nikita Popov [Tue, 8 Jan 2019 08:26:44 +0000 (09:26 +0100)]
Merge branch 'PHP-7.3'
Nikita Popov [Tue, 8 Jan 2019 08:26:31 +0000 (09:26 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
twosee [Tue, 8 Jan 2019 08:24:51 +0000 (09:24 +0100)]
Prefix error_code with underscore in FastZPP implementation
To avoid conflicts with parameter names.
Andrey Hristov [Mon, 7 Jan 2019 18:16:33 +0000 (20:16 +0200)]
Const changes
Andrey Hristov [Mon, 7 Jan 2019 16:45:33 +0000 (18:45 +0200)]
Simplify the command factory
Since more than an year it not possible to create commands in the heap
but they are allocated on the stack and directly run. In this regard, it
doesn't make sense to have all the vararg stuff. Commands made sense
to be created and pushed onto a stack then a general executor will
run thru the stack and execute/handle the commands.
Nikita Popov [Mon, 7 Jan 2019 15:00:01 +0000 (16:00 +0100)]
Remove unnecessary uses of object_and_properties_init
Use object_init_ex instead if the properties are NULL.
Andrey Hristov [Mon, 7 Jan 2019 13:06:57 +0000 (15:06 +0200)]
Mark const what should not be changed
Derick Rethans [Mon, 7 Jan 2019 12:49:01 +0000 (12:49 +0000)]
Merge branch 'PHP-7.3'
Derick Rethans [Mon, 7 Jan 2019 12:48:49 +0000 (12:48 +0000)]
Merge branch 'PHP-7.2' into PHP-7.3
Derick Rethans [Mon, 7 Jan 2019 12:48:42 +0000 (12:48 +0000)]
Update tests due to data changes in tzdata 2018i
Christoph M. Becker [Mon, 7 Jan 2019 12:11:31 +0000 (13:11 +0100)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Fix NEWS
Updated to version 2018.9 (2018i)
Christoph M. Becker [Mon, 7 Jan 2019 12:11:04 +0000 (13:11 +0100)]
Fix NEWS
The fixes for bug #77359 and #77360 have been ported to PHP-7.3.1, and
the release has been postponed by one week.
Derick Rethans [Mon, 7 Jan 2019 11:50:17 +0000 (11:50 +0000)]
Updated to version 2018.9 (2018i)
Derick Rethans [Mon, 7 Jan 2019 11:50:17 +0000 (11:50 +0000)]
Empty merge
Derick Rethans [Mon, 7 Jan 2019 11:50:16 +0000 (11:50 +0000)]
Updated to version 2018.9 (2018i)
Derick Rethans [Mon, 7 Jan 2019 11:50:16 +0000 (11:50 +0000)]
Empty merge
Derick Rethans [Mon, 7 Jan 2019 11:50:14 +0000 (11:50 +0000)]
Updated to version 2018.9 (2018i)
Remi Collet [Mon, 7 Jan 2019 10:12:58 +0000 (11:12 +0100)]
Merge branch 'PHP-7.3'
* PHP-7.3:
[ci skip] fix NEWS
Remi Collet [Mon, 7 Jan 2019 10:12:46 +0000 (11:12 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
[ci skip] fix NEWS
Remi Collet [Mon, 7 Jan 2019 10:12:13 +0000 (11:12 +0100)]
[ci skip] fix NEWS
Remi Collet [Mon, 7 Jan 2019 10:03:14 +0000 (11:03 +0100)]
Merge branch 'PHP-7.3'
* PHP-7.3:
[ci skip] fix NEWS
Remi Collet [Mon, 7 Jan 2019 10:02:58 +0000 (11:02 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
[ci skip] fix NEWS
Remi Collet [Mon, 7 Jan 2019 10:02:40 +0000 (11:02 +0100)]
[ci skip] fix NEWS
Nikita Popov [Mon, 7 Jan 2019 09:05:33 +0000 (10:05 +0100)]
Merge branch 'PHP-7.3'
Nikita Popov [Mon, 7 Jan 2019 08:58:59 +0000 (09:58 +0100)]
Fix one issue reported in bug #77310
SCCP did not handle array ASSIGN_* with a BOT operand correctly.
Stanislav Malyshev [Mon, 7 Jan 2019 09:04:16 +0000 (01:04 -0800)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Still leaking for some reason, XFAIL for now, I'll look into it later.
Stanislav Malyshev [Mon, 7 Jan 2019 09:03:55 +0000 (01:03 -0800)]
Merge branch 'PHP-7.2'
* PHP-7.2:
Still leaking for some reason, XFAIL for now, I'll look into it later.
Stanislav Malyshev [Mon, 7 Jan 2019 09:03:04 +0000 (01:03 -0800)]
Still leaking for some reason, XFAIL for now, I'll look into it later.
Stanislav Malyshev [Mon, 7 Jan 2019 09:03:26 +0000 (01:03 -0800)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Still leaking for some reason, XFAIL for now, I'll look into it later.
Stanislav Malyshev [Mon, 7 Jan 2019 09:03:04 +0000 (01:03 -0800)]
Still leaking for some reason, XFAIL for now, I'll look into it later.