]>
granicus.if.org Git - php/log
Anatol Belski [Sat, 19 Jan 2019 01:39:42 +0000 (02:39 +0100)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Fixed bug #77484 Zend engine crashes when calling realpath in invalid working dir
Anatol Belski [Sat, 19 Jan 2019 01:34:59 +0000 (02:34 +0100)]
Fixed bug #77484 Zend engine crashes when calling realpath in invalid working dir
Nikita Popov [Fri, 18 Jan 2019 14:03:00 +0000 (15:03 +0100)]
Merge branch 'PHP-7.3'
Nikita Popov [Fri, 18 Jan 2019 14:01:51 +0000 (15:01 +0100)]
Add additional no_sanitize_address attributes
To fix bug #77447 in release mode as well.
Nikita Popov [Fri, 18 Jan 2019 11:49:08 +0000 (12:49 +0100)]
Merge branch 'PHP-7.3'
Nikita Popov [Fri, 18 Jan 2019 11:48:52 +0000 (12:48 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
Lauri Kenttä [Wed, 16 Jan 2019 20:08:03 +0000 (22:08 +0200)]
Fix seeking in php://input
Nikita Popov [Fri, 18 Jan 2019 11:06:42 +0000 (12:06 +0100)]
Merge branch 'PHP-7.3'
Nikita Popov [Fri, 18 Jan 2019 11:04:33 +0000 (12:04 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
Pedro Magalhães [Wed, 16 Jan 2019 00:33:03 +0000 (00:33 +0000)]
Fixed bug #76675
Leave a reference to the resource in the php_curl.
Dmitry Stogov [Fri, 18 Jan 2019 09:43:42 +0000 (12:43 +0300)]
Micro-optimization
Dmitry Stogov [Thu, 17 Jan 2019 22:22:14 +0000 (01:22 +0300)]
Optimize zend_handle_fetch_obj_flags()
Dmitry Stogov [Thu, 17 Jan 2019 21:53:48 +0000 (00:53 +0300)]
Improved ZEND_TRY_ASSIGN... API to avoid unnecessary double copying and reduce code bloat.
Jakub Zelenka [Thu, 17 Jan 2019 20:05:09 +0000 (20:05 +0000)]
Merge branch 'PHP-7.3'
Jakub Zelenka [Thu, 17 Jan 2019 20:04:44 +0000 (20:04 +0000)]
List me in the openssl maintainers
I have been basically doing that since 2015 or so
Jakub Zelenka [Thu, 17 Jan 2019 18:38:59 +0000 (18:38 +0000)]
Merge branch 'PHP-7.3'
Jakub Zelenka [Thu, 17 Jan 2019 18:33:53 +0000 (18:33 +0000)]
Fix bug #77430 (php-fpm crashes with Main process exited)
Dmitry Stogov [Thu, 17 Jan 2019 07:53:58 +0000 (10:53 +0300)]
Removed useless Z_REFCOUNTED_P() checks.
Christoph M. Becker [Wed, 16 Jan 2019 19:23:17 +0000 (20:23 +0100)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Fix #73614: gdImageFilledArc() doesn't properly draw pies
Christoph M. Becker [Wed, 16 Jan 2019 19:21:03 +0000 (20:21 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #73614: gdImageFilledArc() doesn't properly draw pies
Christoph M. Becker [Wed, 16 Jan 2019 19:10:04 +0000 (20:10 +0100)]
Fix #73614: gdImageFilledArc() doesn't properly draw pies
The fix for PHP bug 43828[1] changed the algorithm from drawing filled
pies from drawing multiple triangles to drawing a single polygon. Due
to quirks of the filled polygon drawing algorithm, we had to filter out
extraneous vertices. This lead, however, to a bug regarding displaced
starting and ending points near 90° and 270° degrees, which we fix by
reinserting these vertices if they had been removed.
This fix is a port of libgd/libgd@
1406b1a .
[1] <https://bugs.php.net/bug.php?id=43828>
Dmitry Stogov [Wed, 16 Jan 2019 11:26:32 +0000 (14:26 +0300)]
Reduce slow code size
Dmitry Stogov [Wed, 16 Jan 2019 09:49:28 +0000 (12:49 +0300)]
Micro-optimization
Dmitry Stogov [Wed, 16 Jan 2019 08:56:53 +0000 (11:56 +0300)]
Extend zend_get_property_offset() to return property_info for typed properties.
Dmitry Stogov [Wed, 16 Jan 2019 08:55:52 +0000 (11:55 +0300)]
Fixed tests
Dmitry Stogov [Wed, 16 Jan 2019 08:06:19 +0000 (11:06 +0300)]
Fixed and improved incorrect usage of value_type argument.
Dmitry Stogov [Tue, 15 Jan 2019 23:30:15 +0000 (02:30 +0300)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
Fix param list for build without global reg
Dmitry Stogov [Tue, 15 Jan 2019 23:13:43 +0000 (02:13 +0300)]
Separated zend_assign_to_typed_prop()
Anatol Belski [Tue, 15 Jan 2019 21:31:52 +0000 (22:31 +0100)]
Fix param list for build without global reg
Dmitry Stogov [Tue, 15 Jan 2019 21:22:34 +0000 (00:22 +0300)]
Reuse zend_incdec_typed_ref() and separate zend_incdec_typed_prop()
Dmitry Stogov [Tue, 15 Jan 2019 15:49:05 +0000 (18:49 +0300)]
Separated zend_binary_assign_op_typed_ref() and zend_binary_assign_op_typed_prop() helpers
Dmitry Stogov [Tue, 15 Jan 2019 15:03:46 +0000 (18:03 +0300)]
Fixed uninitialized result of PRE_INC/PRE_DEC in case of exception.
Separated increment/decrement of typed reference into helper.
Nikita Popov [Tue, 15 Jan 2019 12:52:32 +0000 (13:52 +0100)]
Add dummy get_gc handler for iterator wrapper
get_gc is assumed to be non-NULL in master, and get_gc can be called
on the iterator wrapper if during generator GC, so we need to define
this handler. For now it's just a dummy, though for full support we'd
have to also add a get_gc iterator handler that is called here.
Nikita Popov [Tue, 15 Jan 2019 09:13:39 +0000 (10:13 +0100)]
Document pkg-config related changes
Creating a separate section in UPGRADING for this, as there are a
lot of these, and there's going to be more of them.
Nikita Popov [Fri, 11 Jan 2019 13:15:18 +0000 (14:15 +0100)]
Migrate ext/gd to pkg-config
* --with-webp-dir becomes --with-webp
* --with-jpeg-dir becomes --with-jpeg
* --with-png-dir is removed. libpng is required.
* --with-zlib-dir is removed. zlib is required.
* --with-xpm-dir becomes --with-xpm.
We also enable --with-webp on Travis.
Nikita Popov [Tue, 15 Jan 2019 08:53:37 +0000 (09:53 +0100)]
Fix handling of UNDEF properties in compound assign
Restore NULLing of UNDEF values in get_property_ptr_ptr for the
BP_VAR_R and BP_VAR_RW cases.
Dmitry Stogov [Tue, 15 Jan 2019 08:14:33 +0000 (11:14 +0300)]
Use fastcall calling convention
Dmitry Stogov [Tue, 15 Jan 2019 07:28:01 +0000 (10:28 +0300)]
Removed missed and unused function declaration
David Carlier [Fri, 5 Oct 2018 14:09:25 +0000 (15:09 +0100)]
Refactor subset of openssl module.
Proposal to abstract a subset of the openssl module,
to be able to use two ways encryption outside of this context.
Dmitry Stogov [Mon, 14 Jan 2019 10:59:58 +0000 (13:59 +0300)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Fixed bug #77308 (Unbuffered queries memory leak)
Dmitry Stogov [Mon, 14 Jan 2019 10:59:30 +0000 (13:59 +0300)]
Fixed bug #77308 (Unbuffered queries memory leak)
Nikita Popov [Mon, 14 Jan 2019 10:50:09 +0000 (11:50 +0100)]
Merge branch 'PHP-7.3'
[ci skip]
Nikita Popov [Mon, 14 Jan 2019 10:49:58 +0000 (11:49 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
[ci skip]
wbob [Sat, 12 Jan 2019 08:49:23 +0000 (09:49 +0100)]
document open_basedir and realpath cache coupling in php.ini
[ci skip]
Nikita Popov [Mon, 14 Jan 2019 10:45:07 +0000 (11:45 +0100)]
Merge branch 'PHP-7.3'
Nikita Popov [Mon, 14 Jan 2019 10:43:02 +0000 (11:43 +0100)]
Fixed bug #77447
By disabling asan for CPU support helpers used in ifunc resolvers.
Dmitry Stogov [Mon, 14 Jan 2019 10:21:03 +0000 (13:21 +0300)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Fixed bug #77263 (Segfault when using 2 RecursiveFilterIterator)
Dmitry Stogov [Mon, 14 Jan 2019 10:18:28 +0000 (13:18 +0300)]
Fixed bug #77263 (Segfault when using 2 RecursiveFilterIterator)
Dmitry Stogov [Mon, 14 Jan 2019 10:15:52 +0000 (13:15 +0300)]
Fixed 32/64-bit mismatch
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'