]> granicus.if.org Git - php/log
php
6 years agoFixed odd ROPE_ADD instruction placement.
Dmitry Stogov [Mon, 21 Jan 2019 20:34:09 +0000 (23:34 +0300)]
Fixed odd ROPE_ADD instruction placement.

6 years ago[ci skip] List FFI extension
Christoph M. Becker [Mon, 21 Jan 2019 19:23:53 +0000 (20:23 +0100)]
[ci skip] List FFI extension

6 years agoUse ZEND_FUNC_FREE_LOOP_VAR flag to avoid useless iterations.
Dmitry Stogov [Mon, 21 Jan 2019 19:18:07 +0000 (22:18 +0300)]
Use ZEND_FUNC_FREE_LOOP_VAR flag to avoid useless iterations.

6 years ago[ci skip] Add opcache.preload directive
Christoph M. Becker [Mon, 21 Jan 2019 16:55:53 +0000 (17:55 +0100)]
[ci skip] Add opcache.preload directive

6 years agoAvoid double live ranges recalculation.
Dmitry Stogov [Mon, 21 Jan 2019 15:17:10 +0000 (18:17 +0300)]
Avoid double live ranges recalculation.

6 years ago[ci skip] Note preloading and ext/ffi in UPGRADING
Christoph M. Becker [Mon, 21 Jan 2019 14:58:02 +0000 (15:58 +0100)]
[ci skip] Note preloading and ext/ffi in UPGRADING

6 years agoRemove superfluous variable
Christoph M. Becker [Mon, 21 Jan 2019 14:22:48 +0000 (15:22 +0100)]
Remove superfluous variable

This has been missed when libsqlite3 has been unbundled.

6 years agoLive ranges construction optimization
Dmitry Stogov [Mon, 21 Jan 2019 14:25:24 +0000 (17:25 +0300)]
Live ranges construction optimization

6 years agoUse pkg-config to detect and configure for system libgd
Christoph M. Becker [Mon, 21 Jan 2019 13:01:34 +0000 (14:01 +0100)]
Use pkg-config to detect and configure for system libgd

Formerly, a single option `--with-gd` was sufficient to enable the
extension, and to determine whether to use the system or the bundled
libgd depending on whether a directory was passed.  Since pkg-config
determines the path automatically, we now offer `--enable-gd` (whether
the extension should be build) and `--with-external-gd` (whether to use
the system libgd).

6 years agoImplement single-pass live range calculation
Nikita Popov [Thu, 17 Jan 2019 15:07:17 +0000 (16:07 +0100)]
Implement single-pass live range calculation

Instead of interleaving creation of live-ranges with the main
compiler code, compute them in a separate pass over the opcodes
as part of pass_two. Additionally, do not keep live ranges
synchronized during optimization in opcache and instead use the
same mechanism to recompute them after optimization.

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

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 agoMerge branch 'PHP-7.3'
Anatol Belski [Sun, 20 Jan 2019 15:00:46 +0000 (16:00 +0100)]
Merge branch 'PHP-7.3'

* PHP-7.3:
  Update NEWS [ci skip]
  Update NEWS [ci skip]

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 ago[ci skip] Fix typos in UPGRADING
Tyson Andre [Sat, 19 Jan 2019 16:02:37 +0000 (11:02 -0500)]
[ci skip] Fix typos in UPGRADING

6 years agoMerge branch 'PHP-7.3'
Anatol Belski [Sat, 19 Jan 2019 12:56:51 +0000 (13:56 +0100)]
Merge branch 'PHP-7.3'

* PHP-7.3:
  Skip test on unsuitable build

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 agoSync with upstream
Christoph M. Becker [Sat, 19 Jan 2019 09:35:39 +0000 (10:35 +0100)]
Sync with upstream

Even though libgd/libgd#492 is not a relevant bug fix for PHP, since
the binding doesn't use the `gdImage*Ptr()` functions at all, we're
porting the fix to stay in sync here.

6 years agoMerge branch 'PHP-7.3'
Christoph M. Becker [Sat, 19 Jan 2019 10:21:07 +0000 (11:21 +0100)]
Merge branch 'PHP-7.3'

* PHP-7.3:
  Fix failing test

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.3'
Christoph M. Becker [Sat, 19 Jan 2019 09:18:55 +0000 (10:18 +0100)]
Merge branch 'PHP-7.3'

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

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 agoMerge branch 'PHP-7.3'
Anatol Belski [Sat, 19 Jan 2019 02:34:36 +0000 (03:34 +0100)]
Merge branch 'PHP-7.3'

* PHP-7.3:
  Make test output more reliable

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 agoMerge branch 'PHP-7.3'
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

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 agoMerge branch 'PHP-7.3'
Nikita Popov [Fri, 18 Jan 2019 14:03:00 +0000 (15:03 +0100)]
Merge branch 'PHP-7.3'

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.3'
Nikita Popov [Fri, 18 Jan 2019 11:49:08 +0000 (12:49 +0100)]
Merge branch 'PHP-7.3'

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.3'
Nikita Popov [Fri, 18 Jan 2019 11:06:42 +0000 (12:06 +0100)]
Merge branch 'PHP-7.3'

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 agoMicro-optimization
Dmitry Stogov [Fri, 18 Jan 2019 09:43:42 +0000 (12:43 +0300)]
Micro-optimization

6 years agoOptimize zend_handle_fetch_obj_flags()
Dmitry Stogov [Thu, 17 Jan 2019 22:22:14 +0000 (01:22 +0300)]
Optimize zend_handle_fetch_obj_flags()

6 years agoImproved ZEND_TRY_ASSIGN... API to avoid unnecessary double copying and reduce code...
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.

6 years agoMerge branch 'PHP-7.3'
Jakub Zelenka [Thu, 17 Jan 2019 20:05:09 +0000 (20:05 +0000)]
Merge branch 'PHP-7.3'

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 agoMerge branch 'PHP-7.3'
Jakub Zelenka [Thu, 17 Jan 2019 18:38:59 +0000 (18:38 +0000)]
Merge branch 'PHP-7.3'

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 agoRemoved useless Z_REFCOUNTED_P() checks.
Dmitry Stogov [Thu, 17 Jan 2019 07:53:58 +0000 (10:53 +0300)]
Removed useless Z_REFCOUNTED_P() checks.

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

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 agoReduce slow code size
Dmitry Stogov [Wed, 16 Jan 2019 11:26:32 +0000 (14:26 +0300)]
Reduce slow code size

6 years agoMicro-optimization
Dmitry Stogov [Wed, 16 Jan 2019 09:49:28 +0000 (12:49 +0300)]
Micro-optimization

6 years agoExtend zend_get_property_offset() to return property_info for typed properties.
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.

6 years agoFixed tests
Dmitry Stogov [Wed, 16 Jan 2019 08:55:52 +0000 (11:55 +0300)]
Fixed tests

6 years agoFixed and improved incorrect usage of value_type argument.
Dmitry Stogov [Wed, 16 Jan 2019 08:06:19 +0000 (11:06 +0300)]
Fixed and improved incorrect usage of value_type argument.

6 years agoMerge branch 'master' of git.php.net:php-src
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

6 years agoSeparated zend_assign_to_typed_prop()
Dmitry Stogov [Tue, 15 Jan 2019 23:13:43 +0000 (02:13 +0300)]
Separated zend_assign_to_typed_prop()

6 years agoFix param list for build without global reg
Anatol Belski [Tue, 15 Jan 2019 21:31:52 +0000 (22:31 +0100)]
Fix param list for build without global reg

6 years agoReuse zend_incdec_typed_ref() and separate zend_incdec_typed_prop()
Dmitry Stogov [Tue, 15 Jan 2019 21:22:34 +0000 (00:22 +0300)]
Reuse zend_incdec_typed_ref() and separate zend_incdec_typed_prop()

6 years agoSeparated zend_binary_assign_op_typed_ref() and zend_binary_assign_op_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

6 years agoFixed uninitialized result of PRE_INC/PRE_DEC in case of exception.
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.

6 years agoAdd dummy get_gc handler for iterator wrapper
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.

6 years agoDocument pkg-config related changes
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.

6 years agoMigrate ext/gd to pkg-config
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.

6 years agoFix handling of UNDEF properties in compound assign
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.

6 years agoUse fastcall calling convention
Dmitry Stogov [Tue, 15 Jan 2019 08:14:33 +0000 (11:14 +0300)]
Use fastcall calling convention

6 years agoRemoved missed and unused function declaration
Dmitry Stogov [Tue, 15 Jan 2019 07:28:01 +0000 (10:28 +0300)]
Removed missed and unused function declaration

6 years agoRefactor subset of openssl module.
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.

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

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.3'
Nikita Popov [Mon, 14 Jan 2019 10:50:09 +0000 (11:50 +0100)]
Merge branch 'PHP-7.3'

[ci skip]

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 agoMerge branch 'PHP-7.3'
Nikita Popov [Mon, 14 Jan 2019 10:45:07 +0000 (11:45 +0100)]
Merge branch 'PHP-7.3'

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 agoMerge branch 'PHP-7.3'
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)

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 agoFixed 32/64-bit mismatch
Dmitry Stogov [Mon, 14 Jan 2019 10:15:52 +0000 (13:15 +0300)]
Fixed 32/64-bit mismatch

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

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 agoAdded FFI extension
Dmitry Stogov [Mon, 14 Jan 2019 08:47:50 +0000 (11:47 +0300)]
Added FFI extension

6 years agoRevert removal of private __clone() methods
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.

6 years agoChange zend_try_array_init_size arg to uint32_t
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...

6 years agoKill this new and insanely annoying warning
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

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

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 agoImplement typed properties
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>
6 years agoext/openssl: port to pkg-config macro and consistently require its use
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.

6 years agoImprove openssl_random_pseudo_bytes()
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

6 years agoMerge branch 'PHP-7.3'
Nikita Popov [Fri, 11 Jan 2019 09:55:36 +0000 (10:55 +0100)]
Merge branch 'PHP-7.3'

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.3'
Nikita Popov [Fri, 11 Jan 2019 09:29:45 +0000 (10:29 +0100)]
Merge branch 'PHP-7.3'

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 agoFix misleading variable type
Christoph M. Becker [Thu, 10 Jan 2019 23:21:44 +0000 (00:21 +0100)]
Fix misleading variable type

We port libgd/libgd@0414bb2da0b27d90b6125bd34a3e2cfb89fd3f42.

6 years agoMerge branch 'PHP-7.3'
Jakub Zelenka [Thu, 10 Jan 2019 20:17:58 +0000 (20:17 +0000)]
Merge branch 'PHP-7.3'

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