]> granicus.if.org Git - php/log
php
6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Dmitry Stogov [Tue, 12 Feb 2019 07:21:59 +0000 (10:21 +0300)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Avoid dependency on "struct flock" fields order.

6 years agoAvoid dependency on "struct flock" fields order.
Dmitry Stogov [Tue, 12 Feb 2019 07:15:16 +0000 (10:15 +0300)]
Avoid dependency on "struct flock" fields order.

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Anatol Belski [Tue, 12 Feb 2019 06:30:28 +0000 (22:30 -0800)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Replace broken binary SDK version

6 years agoReplace broken binary SDK version
Anatol Belski [Tue, 12 Feb 2019 06:28:34 +0000 (22:28 -0800)]
Replace broken binary SDK version

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Anatol Belski [Tue, 12 Feb 2019 06:13:42 +0000 (22:13 -0800)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Update SDK version for AppVeyor

6 years agoUpdate SDK version for AppVeyor
Anatol Belski [Tue, 12 Feb 2019 06:12:16 +0000 (22:12 -0800)]
Update SDK version for AppVeyor

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Mon, 11 Feb 2019 14:50:33 +0000 (15:50 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3

6 years agoFix bug #51068 (glob:// do not support current path relative)
Ahmed Abdou [Tue, 29 Jan 2019 07:59:45 +0000 (08:59 +0100)]
Fix bug #51068 (glob:// do not support current path relative)

Fix DirectoryIterator glob://* current path relative queries

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Mon, 11 Feb 2019 10:32:42 +0000 (11:32 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3

6 years agoFix #77552: Uninitialized buffer in stat functions
johnstevenson [Fri, 1 Feb 2019 19:45:20 +0000 (19:45 +0000)]
Fix #77552: Uninitialized buffer in stat functions

6 years agoFix tests bareword fallback with error suppression
Guilliam Xavier [Thu, 31 Jan 2019 11:25:51 +0000 (12:25 +0100)]
Fix tests bareword fallback with error suppression

(cherry picked from commit aad39879f2d2e89de105c4f87d334ee129b4321c)
(cherry picked from commit 76f8a908bb18aee92b8f3d523b74b06c9d12cb6b)

6 years agoregenerate with re2c 1.0.3
Xinchen Hui [Mon, 11 Feb 2019 07:42:55 +0000 (15:42 +0800)]
regenerate with re2c 1.0.3

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Xinchen Hui [Mon, 11 Feb 2019 07:28:44 +0000 (15:28 +0800)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fixed bug #77589 (Core dump using parse_ini_string with numeric sections)

Conflicts:
Zend/zend_ini_scanner.c

6 years agoFixed bug #77589 (Core dump using parse_ini_string with numeric sections)
Xinchen Hui [Mon, 11 Feb 2019 07:27:29 +0000 (15:27 +0800)]
Fixed bug #77589 (Core dump using parse_ini_string with numeric sections)

Section name should not be typed(NULL, FALSE, TRUE etc)

6 years agoMerge PDO_OCI PR
Christopher Jones [Mon, 11 Feb 2019 05:38:23 +0000 (16:38 +1100)]
Merge PDO_OCI PR

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Christopher Jones [Mon, 11 Feb 2019 05:36:39 +0000 (16:36 +1100)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  PDO_OCI tracing attribute PR merge
  pdo_oci: Add client identifier and module attrs
  pdo_oci: Register new attr constants and add tests
  pdo_oci: Add PDO_OCI_ATTR_ACTION and CLIENT_INFO

6 years agoPDO_OCI tracing attribute PR merge
Christopher Jones [Mon, 11 Feb 2019 05:19:13 +0000 (16:19 +1100)]
PDO_OCI tracing attribute PR merge

6 years agopdo_oci: Add client identifier and module attrs
Cameron Porter [Fri, 25 Jan 2019 17:44:10 +0000 (11:44 -0600)]
pdo_oci: Add client identifier and module attrs

Add tests for the new attributes, and check the setAttribute return
value.

6 years agopdo_oci: Register new attr constants and add tests
Cameron Porter [Thu, 24 Jan 2019 18:40:26 +0000 (12:40 -0600)]
pdo_oci: Register new attr constants and add tests

6 years agopdo_oci: Add PDO_OCI_ATTR_ACTION and CLIENT_INFO
Cameron Porter [Thu, 24 Jan 2019 02:14:00 +0000 (20:14 -0600)]
pdo_oci: Add PDO_OCI_ATTR_ACTION and CLIENT_INFO

Add the ability to set the action and client info on the database
session for PDO OCI using PDO attributes.

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Fri, 8 Feb 2019 09:09:39 +0000 (10:09 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3

6 years agoFix FTPS passive mode of data channel event poll
YanTao [Fri, 8 Feb 2019 03:41:41 +0000 (11:41 +0800)]
Fix FTPS passive mode of data channel event poll

Bugfix: when using passive mode of FTPS protocol, data channel events
should be polled when creating data connection channel, instead of polling
the event of ftp's self control channel, which may cause ftp transfer
problem while using ftps and passive mode.

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Anatol Belski [Fri, 8 Feb 2019 06:28:45 +0000 (22:28 -0800)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Sync test with changes in libcurl 7.64.0
  Sync test for libcurl 7.64.0

6 years agoSync test with changes in libcurl 7.64.0
Anatol Belski [Fri, 8 Feb 2019 06:22:38 +0000 (22:22 -0800)]
Sync test with changes in libcurl 7.64.0

6 years agoSync test for libcurl 7.64.0
Anatol Belski [Fri, 8 Feb 2019 06:21:59 +0000 (22:21 -0800)]
Sync test for libcurl 7.64.0

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Derick Rethans [Thu, 7 Feb 2019 11:12:42 +0000 (11:12 +0000)]
Merge branch 'PHP-7.2' into PHP-7.3

6 years agoUse pkg-config for ICU, as the old icu-config has been deprecated
Derick Rethans [Wed, 6 Feb 2019 10:39:55 +0000 (10:39 +0000)]
Use pkg-config for ICU, as the old icu-config has been deprecated

6 years agoFix NEWS
Christoph M. Becker [Tue, 5 Feb 2019 22:04:31 +0000 (23:04 +0100)]
Fix NEWS

Bug #77287 is already fixed in PHP 7.3.2.

6 years ago[ci skip] Add missing notes regarding gc_status()
Christoph M. Becker [Sun, 3 Feb 2019 17:28:43 +0000 (18:28 +0100)]
[ci skip] Add missing notes regarding gc_status()

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Joe Watkins [Sun, 3 Feb 2019 07:41:26 +0000 (08:41 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Properly check for array_replace_recursive in sccp.c

6 years agoProperly check for array_replace_recursive in sccp.c
Tyson Andre [Sat, 2 Feb 2019 01:54:21 +0000 (20:54 -0500)]
Properly check for array_replace_recursive in sccp.c

Due to a typo, this code used to check for array_merge_recursive
twice.

6 years agoFixed bug #77329 (Buffer Overflow via overly long Error Messages)
Dmitry Stogov [Fri, 1 Feb 2019 08:11:15 +0000 (11:11 +0300)]
Fixed bug #77329 (Buffer Overflow via overly long Error Messages)

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Joe Watkins [Wed, 30 Jan 2019 17:28:09 +0000 (18:28 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix bug 76596: phpdbg supports display_errors=stderr

6 years agoFix bug 76596: phpdbg supports display_errors=stderr
Kevin Abel [Mon, 9 Jul 2018 02:18:20 +0000 (21:18 -0500)]
Fix bug 76596: phpdbg supports display_errors=stderr

6 years agoFix #77546 iptcembed broken function
Guillaume Degoulet [Wed, 30 Jan 2019 10:38:17 +0000 (11:38 +0100)]
Fix #77546 iptcembed broken function

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Christoph M. Becker [Wed, 30 Jan 2019 00:29:05 +0000 (01:29 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Prepare main branch for PHP 7.2.16

6 years agoPrepare main branch for PHP 7.2.16
Christoph M. Becker [Wed, 30 Jan 2019 00:27:57 +0000 (01:27 +0100)]
Prepare main branch for PHP 7.2.16

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Tue, 29 Jan 2019 08:40:06 +0000 (09:40 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3

6 years agoMake special assert() handling independent of compiler flags
Nikita Popov [Tue, 29 Jan 2019 08:39:12 +0000 (09:39 +0100)]
Make special assert() handling independent of compiler flags

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Mon, 28 Jan 2019 08:22:49 +0000 (09:22 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3

6 years agoFixed bug #77530: PHP crashes when parsing "(2)::class"
ekinhbayar [Mon, 28 Jan 2019 06:46:29 +0000 (09:46 +0300)]
Fixed bug #77530: PHP crashes when parsing "(2)::class"

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Jakub Zelenka [Fri, 25 Jan 2019 14:16:08 +0000 (14:16 +0000)]
Merge branch 'PHP-7.2' into PHP-7.3

6 years agoFix bug #77390 (feof might hang on TLS streams in case of fragmented TLS records)
Jakub Zelenka [Thu, 17 Jan 2019 18:05:13 +0000 (18:05 +0000)]
Fix bug #77390 (feof might hang on TLS streams in case of fragmented TLS records)

Simplified version of the fix from Abyl Valg so credit to him.

6 years agoUpdate and integrate openssl client proxy test
Jakub Zelenka [Wed, 16 Jan 2019 18:14:30 +0000 (18:14 +0000)]
Update and integrate openssl client proxy test

6 years agoAdd a test for fragmented SSL packets
Abyr Valg [Sun, 29 Apr 2018 09:05:59 +0000 (12:05 +0300)]
Add a test for fragmented SSL packets

6 years agoFixed bug #77498
Nikita Popov [Fri, 25 Jan 2019 10:00:35 +0000 (11:00 +0100)]
Fixed bug #77498

I've renamed the function to the same name as the exported symbol
in master.

6 years agoFixed bug #77514
Nikita Popov [Thu, 24 Jan 2019 14:13:49 +0000 (15:13 +0100)]
Fixed bug #77514

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Thu, 24 Jan 2019 12:45:40 +0000 (13:45 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3

6 years agoMerge remote-tracking branch 'php-src/PHP-7.2' into PHP-7.2
Nikita Popov [Thu, 24 Jan 2019 12:45:27 +0000 (13:45 +0100)]
Merge remote-tracking branch 'php-src/PHP-7.2' into PHP-7.2

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Thu, 24 Jan 2019 12:40:36 +0000 (13:40 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3

6 years agoRevert "Prefix error_code with underscore in FastZPP implementation"
Nikita Popov [Thu, 24 Jan 2019 12:36:47 +0000 (13:36 +0100)]
Revert "Prefix error_code with underscore in FastZPP implementation"

This reverts commit 6305119a5193d4318add01190ca4afbb49ded102.

This is a source-compatibility break for extensions that define
custom FastZPP macros, such as ext/uv:

https://github.com/bwoebi/php-uv/blob/a983eb17b69f74a45d785ddc6a7bff3d4531b88c/php_uv.c#L75

I don't think that FastZPP was intended to be used this way, but
let's revert this from release branches to avoid extension breakage.

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Dmitry Stogov [Thu, 24 Jan 2019 10:07:31 +0000 (13:07 +0300)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fixed bug #77494 (Disabling class causes segfault on member access)

6 years agoFixed bug #77494 (Disabling class causes segfault on member access)
Dmitry Stogov [Thu, 24 Jan 2019 10:06:36 +0000 (13:06 +0300)]
Fixed bug #77494 (Disabling class causes segfault on member access)

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Thu, 24 Jan 2019 09:57:45 +0000 (10:57 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3

6 years agoAdd flag to disable jumptable optimization
Nikita Popov [Thu, 24 Jan 2019 09:56:04 +0000 (10:56 +0100)]
Add flag to disable jumptable optimization

This is useful for coverage. While it is currently safe to just
skip over the SWITCH_* opcodes, this may not be true in the future
due to opcache optimizations, so it's safer to disable emission of
SWITCH_* opcodes entirely.

6 years agoPrepare main branch for PHP 7.3.3
Christoph M. Becker [Tue, 22 Jan 2019 13:04:03 +0000 (14:04 +0100)]
Prepare main branch for PHP 7.3.3

6 years agoFixed bug #77287
Nikita Popov [Tue, 22 Jan 2019 11:15:06 +0000 (12:15 +0100)]
Fixed bug #77287

There may be an EXT_NOP opcode before the parameter list, we should
skip over it.

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
George Wang [Sun, 20 Jan 2019 20:11:37 +0000 (15:11 -0500)]
Merge branch 'PHP-7.2' into PHP-7.3

6 years agoCheckin LiteSpeed SAPI 7.2.
George Wang [Sun, 20 Jan 2019 20:10:19 +0000 (15:10 -0500)]
Checkin LiteSpeed SAPI 7.2.

6 years agoUpdate NEWS [ci skip]
Anatol Belski [Sun, 20 Jan 2019 15:00:25 +0000 (16:00 +0100)]
Update NEWS [ci skip]

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Anatol Belski [Sun, 20 Jan 2019 14:59:08 +0000 (15:59 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Update NEWS [ci skip]

6 years agoUpdate NEWS [ci skip]
Anatol Belski [Sun, 20 Jan 2019 14:58:19 +0000 (15:58 +0100)]
Update NEWS [ci skip]

6 years agoSkip test on unsuitable build
Anatol Belski [Sat, 19 Jan 2019 12:53:32 +0000 (13:53 +0100)]
Skip test on unsuitable build

This test reveals a difference between TS and NTS through all the
versions, which is probably too late to fix at this stage of 7.3.
While NTS always relies on the system getcwd(), TS uses a fake CWD
which might get out of sync when the real dir is deleted. Thus,
skip test on unsuitable build. Investigate possibilities to fix this
edge case for later versions.

6 years agoFix failing test
Christoph M. Becker [Sat, 19 Jan 2019 10:13:13 +0000 (11:13 +0100)]
Fix failing test

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Christoph M. Becker [Sat, 19 Jan 2019 09:17:20 +0000 (10:17 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix #77479: imagewbmp() segfaults with very large images

6 years agoFix #77479: imagewbmp() segfaults with very large images
Christoph M. Becker [Sat, 19 Jan 2019 09:03:11 +0000 (10:03 +0100)]
Fix #77479: imagewbmp() segfaults with very large images

We must not proceed working with the Wbmp structure, if it hasn't been
allocated.

6 years agoMake test output more reliable
Anatol Belski [Sat, 19 Jan 2019 02:33:37 +0000 (03:33 +0100)]
Make test output more reliable

6 years agoFixed 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

6 years agoAdd additional no_sanitize_address attributes
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.

6 years agoMerge branch 'PHP-7.2' into 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

6 years agoFix seeking in php://input
Lauri Kenttä [Wed, 16 Jan 2019 20:08:03 +0000 (22:08 +0200)]
Fix seeking in php://input

6 years agoMerge branch 'PHP-7.2' into 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

6 years agoFixed bug #76675
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.

6 years agoList me in the openssl maintainers
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

6 years agoFix bug #77430 (php-fpm crashes with Main process exited)
Jakub Zelenka [Thu, 17 Jan 2019 18:33:53 +0000 (18:33 +0000)]
Fix bug #77430 (php-fpm crashes with Main process exited)

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
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

6 years agoFix #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>

6 years agoFixed 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)

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Mon, 14 Jan 2019 10:49:58 +0000 (11:49 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3

[ci skip]

6 years agodocument open_basedir and realpath cache coupling in php.ini
wbob [Sat, 12 Jan 2019 08:49:23 +0000 (09:49 +0100)]
document open_basedir and realpath cache coupling in php.ini

[ci skip]

6 years agoFixed bug #77447
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.

6 years agoFixed 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)

6 years agoMerge branch 'PHP-7.2' into 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

6 years agoFixed bug #77454
Nikita Popov [Mon, 14 Jan 2019 09:21:41 +0000 (10:21 +0100)]
Fixed bug #77454

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
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

6 years agoUpdate SDK version for AppVeyor
Anatol Belski [Sat, 12 Jan 2019 21:13:14 +0000 (22:13 +0100)]
Update SDK version for AppVeyor

6 years agoMerge branch 'PHP-7.2' into 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

6 years agoFix rl_completion_matches detection
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.

6 years agoMerge branch 'PHP-7.2' into 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

6 years agoFix bug #77361 (configure fails on 64-bit AIX when opcache enabled)
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.

6 years agoMerge branch 'PHP-7.2' into 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

6 years agoFix cleaning up after openssl_pkcs7_verify_basic test
Alexander Kurilo [Thu, 6 Dec 2018 21:07:18 +0000 (00:07 +0300)]
Fix cleaning up after openssl_pkcs7_verify_basic test

6 years agoGenerate certs for openssl tests on the fly
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

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
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

6 years agoFix #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.

6 years agoMerge branch 'PHP-7.2' into PHP-7.3
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

6 years agoFix #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.

6 years agoMerge branch 'PHP-7.2' into 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

6 years agoFixed bug #77439
Nikita Popov [Thu, 10 Jan 2019 09:55:19 +0000 (10:55 +0100)]
Fixed bug #77439

6 years agoFixed bug #77434
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.