]>
granicus.if.org Git - php/log
Nikita Popov [Wed, 12 Jun 2019 11:50:48 +0000 (13:50 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Wed, 12 Jun 2019 11:49:57 +0000 (13:49 +0200)]
Fix ifdef position
Hopefully fixes the release build...
Nikita Popov [Wed, 12 Jun 2019 11:25:19 +0000 (13:25 +0200)]
Use memset instead of brace initialization
Apparently {{0}} is not enough ... let's not rely on structure
layout specifics here.
Derick Rethans [Wed, 12 Jun 2019 11:42:06 +0000 (12:42 +0100)]
Merge branch 'PHP-7.4'
Derick Rethans [Wed, 12 Jun 2019 11:12:55 +0000 (11:12 +0000)]
Update NEWS for 7.4.0alpha2
Derick Rethans [Wed, 12 Jun 2019 11:11:36 +0000 (11:11 +0000)]
Update CREDITS for PHP 7.4.0alpha1
Derick Rethans [Wed, 12 Jun 2019 11:11:36 +0000 (11:11 +0000)]
Update NEWS for PHP 7.4.0alpha1
Nikita Popov [Wed, 12 Jun 2019 11:18:04 +0000 (13:18 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Wed, 12 Jun 2019 11:16:29 +0000 (13:16 +0200)]
Remove always true condition
Nikita Popov [Wed, 12 Jun 2019 11:14:08 +0000 (13:14 +0200)]
Mark some operand fetching funs as ATTRIBUTE_UNUSED
Whether these are used depends on VM specialization.
Nikita Popov [Wed, 12 Jun 2019 11:08:15 +0000 (13:08 +0200)]
Fix unused variables in fpm_env.c
Nikita Popov [Wed, 12 Jun 2019 11:06:48 +0000 (13:06 +0200)]
Try to control ZEND_MM_ALIGNED_SIZE type
Nikita Popov [Wed, 12 Jun 2019 11:02:56 +0000 (13:02 +0200)]
Fix unused value warnings in snprintf.c
Nikita Popov [Wed, 12 Jun 2019 10:54:11 +0000 (12:54 +0200)]
Remove MYSQLND_LLU_SPEC/MYSQLND_LL_SPEC
No longer used, replaced by PRIu64/PRIi64.
Nikita Popov [Wed, 12 Jun 2019 10:42:53 +0000 (12:42 +0200)]
Fix mysqlnd printf modifiers
By moving the the standard macros...
Nikita Popov [Wed, 12 Jun 2019 10:39:16 +0000 (12:39 +0200)]
Enable -Werror on m32 build
This one is clean now.
Nikita Popov [Wed, 12 Jun 2019 10:28:51 +0000 (12:28 +0200)]
Fix warnings in mysqlnd_alloc.c
And also separate the PHP_DEBUG codepaths more, to avoids having an
ifdef every other line...
Nikita Popov [Wed, 12 Jun 2019 10:05:29 +0000 (12:05 +0200)]
Fix incorrect enum value uses in xmlrpc
Nikita Popov [Wed, 12 Jun 2019 10:04:10 +0000 (12:04 +0200)]
Remove unused php_mbX_int_to_char() functions
Nikita Popov [Wed, 12 Jun 2019 10:02:40 +0000 (12:02 +0200)]
Fix incorrect printf modifiers
Nikita Popov [Wed, 12 Jun 2019 10:01:05 +0000 (12:01 +0200)]
Guard functions by SO_PASSCRED
Christoph M. Becker [Wed, 12 Jun 2019 10:47:06 +0000 (12:47 +0200)]
Fix nullbyte tests
As of PHP 8.0.0, failing ZPP throws instead of issuing warnings, to
which we have to cater to.
Christoph M. Becker [Wed, 12 Jun 2019 10:06:24 +0000 (12:06 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Simplify GD null byte injection tests
Christoph M. Becker [Tue, 7 May 2019 15:37:35 +0000 (17:37 +0200)]
Simplify GD null byte injection tests
These tests actually check that no file with a name containing a NUL is
created by the GD image output functions. This is superfluous, since
it is sufficient to check that the function failed, and that an
appropriate warning has been raised.
We also add missing nullbyte injection tests.
Nikita Popov [Wed, 12 Jun 2019 09:54:21 +0000 (11:54 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Wed, 12 Jun 2019 09:53:14 +0000 (11:53 +0200)]
Preserve CFLAGS/LDFLAGS for curl ssl check
We need to add the curl-specific flags, but we also need to preserve
the general flags, to keep around important stuff like -m32.
Nikita Popov [Wed, 12 Jun 2019 09:51:33 +0000 (11:51 +0200)]
Suppress int to char conversion warnings
Nikita Popov [Wed, 12 Jun 2019 09:48:18 +0000 (11:48 +0200)]
Use labs() on long integer
Nikita Popov [Wed, 12 Jun 2019 09:28:07 +0000 (11:28 +0200)]
Don't use sqlite3_aggregate_count()
This function has been deprecated, with the recommendation that
the count should be explicitly tracked in the aggregate context,
if it is needed.
Nikita Popov [Wed, 12 Jun 2019 08:54:21 +0000 (10:54 +0200)]
Fix type mismatch in two get_col callbacks
Nikita Popov [Wed, 12 Jun 2019 08:50:58 +0000 (10:50 +0200)]
Fix -Wmissing-braces warnings
Unfortunate that = {} is a GNU extension.
Derick Rethans [Wed, 12 Jun 2019 07:58:19 +0000 (08:58 +0100)]
Merge branch 'PHP-7.4'
Derick Rethans [Wed, 12 Jun 2019 07:58:11 +0000 (08:58 +0100)]
Update credits pre-release
Joe Watkins [Wed, 12 Jun 2019 07:48:09 +0000 (09:48 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
fix flaky zip tests, order is OS dependent
Joe Watkins [Wed, 12 Jun 2019 07:47:47 +0000 (09:47 +0200)]
fix flaky zip tests, order is OS dependent
Remi Collet [Wed, 12 Jun 2019 07:39:24 +0000 (09:39 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
add comment about pg_config/pkgconfig
Remi Collet [Wed, 12 Jun 2019 07:39:11 +0000 (09:39 +0200)]
add comment about pg_config/pkgconfig
Nikita Popov [Wed, 12 Jun 2019 07:29:06 +0000 (09:29 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Wed, 12 Jun 2019 07:28:25 +0000 (09:28 +0200)]
Revert option rename
Let's keep this at --with-password-argon2 to avoid churn, I don't
think we have a strong motivation to rename this one.
Nikita Popov [Tue, 11 Jun 2019 15:19:43 +0000 (17:19 +0200)]
Use %define api.pure instead of %pure-parser
%pure-parser is deprecated. In our case there is no difference between
true & full, as we don't use locations.
Joe Watkins [Wed, 12 Jun 2019 06:48:18 +0000 (08:48 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
fix flaky sockets test - form of response is OS dependent
Joe Watkins [Wed, 12 Jun 2019 06:47:35 +0000 (08:47 +0200)]
fix flaky sockets test - form of response is OS dependent
Joe Watkins [Wed, 12 Jun 2019 06:33:19 +0000 (08:33 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
fix flaky test on OSX
Joe Watkins [Wed, 12 Jun 2019 06:33:07 +0000 (08:33 +0200)]
fix flaky test on OSX
Joe Watkins [Wed, 12 Jun 2019 06:01:03 +0000 (08:01 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Revert "ext/pgsql: Use PKG_CHECK_MODULES to detect the pq library"
Joe Watkins [Wed, 12 Jun 2019 06:00:55 +0000 (08:00 +0200)]
Revert "ext/pgsql: Use PKG_CHECK_MODULES to detect the pq library"
This reverts commit
1e265174ed8b361c2d8b9c050f9e3b1f7034acc9 .
Joe Watkins [Wed, 12 Jun 2019 05:55:21 +0000 (07:55 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
fix flaky gd tests
Joe Watkins [Wed, 12 Jun 2019 05:52:28 +0000 (07:52 +0200)]
fix flaky gd tests
Joe Watkins [Wed, 12 Jun 2019 04:59:10 +0000 (06:59 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
disable phpdbg on macosx, it's not well tested there and is skewing results [ci skip]
Joe Watkins [Wed, 12 Jun 2019 04:58:19 +0000 (06:58 +0200)]
disable phpdbg on macosx, it's not well tested there and is skewing results [ci skip]
Joe Watkins [Wed, 12 Jun 2019 04:55:14 +0000 (06:55 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
ext/standard: Use PKG_CHECK_MODULES to detect the Argon2 library
Hugh McMaster [Fri, 7 Jun 2019 09:44:22 +0000 (19:44 +1000)]
ext/standard: Use PKG_CHECK_MODULES to detect the Argon2 library
Nikita Popov [Tue, 11 Jun 2019 15:12:33 +0000 (17:12 +0200)]
Merge branch 'PHP-7.4'
Hugh McMaster [Wed, 5 Jun 2019 12:57:09 +0000 (22:57 +1000)]
ext/ldap: Use PKG_CHECK_MODULES to detect the libsasl2 library
Nikita Popov [Tue, 11 Jun 2019 15:01:29 +0000 (17:01 +0200)]
Remove unused gmp_unary_ui_op() function
Nikita Popov [Tue, 11 Jun 2019 14:59:12 +0000 (16:59 +0200)]
Remove unused _setEdgePixel() and getPixelOverflowColorTC() functions
Nikita Popov [Tue, 11 Jun 2019 14:57:24 +0000 (16:57 +0200)]
Fix fabs warning in gd_interpolation.c
Matches upstream code.
Nikita Popov [Tue, 11 Jun 2019 14:54:45 +0000 (16:54 +0200)]
Remove safeboolean use in gd_jpeg.c
This is a backport of
https://github.com/libgd/libgd/blob/
e5502c7a3f1fe60536ec060f0211d97066c006ea /src/gd_jpeg.c.
Nikita Popov [Tue, 11 Jun 2019 14:50:25 +0000 (16:50 +0200)]
Fix abs(long) warnings in gd.c
I'm fixing this using (int) casts instead of labs() because this is
what upstream GD does.
Nikita Popov [Tue, 11 Jun 2019 14:21:57 +0000 (16:21 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Tue, 11 Jun 2019 14:12:06 +0000 (16:12 +0200)]
Fix 32-bit warnings in timelib
This has already been fixed upstream in
https://github.com/derickr/timelib/commit/
4df262e7585b2ad2c6b01a23190974f9aea298ed
so I'm backporting this change.
George Peter Banyard [Tue, 11 Jun 2019 13:41:45 +0000 (15:41 +0200)]
Remove unnecessary short_open_tag INI directive in tests
Closes GH-4249.
Nikita Popov [Tue, 11 Jun 2019 13:49:36 +0000 (15:49 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Tue, 11 Jun 2019 08:13:09 +0000 (10:13 +0200)]
Build with ldap and ldap sasl on azure
We don't set up an ldap server, so this is mainly about testing
that the build works.
Nikita Popov [Tue, 11 Jun 2019 13:47:01 +0000 (15:47 +0200)]
Remove ext/ldap/tests/bug76248.phpt
I wasn't able to make this test work reliably in CI, and the thing
it's testing does not seem worth spending more time on it.
Nikita Popov [Tue, 11 Jun 2019 13:41:13 +0000 (15:41 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Tue, 11 Jun 2019 13:41:05 +0000 (15:41 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Tyson Andre [Sun, 9 Jun 2019 21:37:38 +0000 (17:37 -0400)]
Be more precise about possible types for mysqli methods
mysqli has an uncommon approach to 64-bit compatibility:
it will convert numbers that can't be represented on 32-bit
platforms to a string.
This is documented at
https://www.php.net/manual/en/mysqli-stmt.affected-rows.php#refsect1-mysqli-stmt.affected-rows-returnvalues
So if there's a query to a remote mysqli server that affects
more than 2.2 billion rows, then the opcache inference might be
incorrect.
(It's possible to add a MAY_BE_STRING_ON_32_BIT_PLATFORM bitflag macro to
account for this, but I don't think there's a need or want to?)
Patches
3162285b86871fb22a85a50ce9bc30823da64b6a
This is based on the list of php 7.4 functions using
MYSQLI_RETURN_LONG_INT in mysqli_api.c
Tyson Andre [Sun, 9 Jun 2019 21:32:04 +0000 (17:32 -0400)]
Fix opcache signatures for mysqli_stat
See mysqli_api.c and https://www.php.net/manual/en/mysqli.stat.php
Tyson Andre [Sun, 9 Jun 2019 20:35:34 +0000 (16:35 -0400)]
Fix bug in opcache flags for mysqli_get_charset
https://www.php.net/manual/en/mysqli.get-charset.php
tests/mysqli_field_seek.phpt has a test of this returning an object.
Looking at the source in ext/mysqli/mysqli_nonapi.c,
this should be object|null, not array|null
This might actually cause bugs in opcache's inferences,
(no proof of this)
so it might make sense to pull this patch into an earlier minor version.
Joe Watkins [Tue, 11 Jun 2019 13:16:16 +0000 (15:16 +0200)]
Merge branch 'PHP-7.4' of git://github.com/php/php-src into PHP-7.4
Joe Watkins [Tue, 11 Jun 2019 13:15:31 +0000 (15:15 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
This reverts
0e5d4ea55554872fe72e5d984b73fc21abc561fe to fix the build on MacOSX
Joe Watkins [Tue, 11 Jun 2019 13:13:27 +0000 (15:13 +0200)]
This reverts
0e5d4ea55554872fe72e5d984b73fc21abc561fe to fix the build on MacOSX
On Mac thread_local and __thread are not ABI compatible, in addition, thread_local
comes with additional overhead, __thread seems to be the most suitable linkage to use
regardless of c++/c
Christoph M. Becker [Tue, 11 Jun 2019 11:32:42 +0000 (13:32 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Next is 7.3.8
Christoph M. Becker [Tue, 11 Jun 2019 11:32:14 +0000 (13:32 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Next is 7.3.8
Christoph M. Becker [Tue, 11 Jun 2019 11:31:30 +0000 (13:31 +0200)]
Next is 7.3.8
Nikita Popov [Tue, 11 Jun 2019 11:15:03 +0000 (13:15 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 27 May 2019 09:39:56 +0000 (11:39 +0200)]
Support full variance if autoloading is used
Keep track of delayed variance obligations and check them after
linking a class is otherwise finished. Obligations may either be
unresolved method compatibility (because the necessecary classes
aren't available yet) or open parent/interface dependencies. The
latter occur because we allow the use of not fully linked classes
as parents/interfaces now.
An important aspect of the implementation is we do not require
classes involved in variance checks to be fully linked in order for
the class to be fully linked. Because the involved types do have to
exist in the class table (as partially linked classes) and we do
check these for correct variance, we have the guarantee that either
those classes will successfully link lateron or generate an error,
but there is no way to actually use them until that point and as
such no possibility of violating the variance contract. This is
important because it ensures that a class declaration always either
errors or will produce an immediately usable class afterwards --
there are no cases where the finalization of the class declaration
has to be delayed until a later time, as earlier variants of this
patch did.
Because variance checks deal with classes in various stages of
linking, we need to use a special instanceof implementation that
supports this, and also introduce finer-grained flags that tell us
which parts have been linked already and which haven't.
Class autoloading for variance checks is delayed into a separate
stage after the class is otherwise linked and before delayed
variance obligations are processed. This separation is needed to
handle cases like A extends B extends C, where B is the autoload
root, but C is required to check variance. This could end up
loading C while the class structure of B is in an inconsistent
state.
Nikita Popov [Fri, 24 May 2019 12:28:44 +0000 (14:28 +0200)]
Register class before fetching parent
We want the class declaration to be available while compiling the
parent class.
Joe Watkins [Tue, 11 Jun 2019 10:53:34 +0000 (12:53 +0200)]
use XFAILIF rather than XFAIL to avoid warnings [ci skip]
Joe Watkins [Tue, 11 Jun 2019 10:53:34 +0000 (12:53 +0200)]
use XFAILIF rather than XFAIL to avoid warnings [ci skip]
Nikita Popov [Tue, 11 Jun 2019 10:30:11 +0000 (12:30 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Tue, 26 Mar 2019 09:09:49 +0000 (10:09 +0100)]
Add specialized pair construction API
Closes GH-3990.
Remi Collet [Tue, 11 Jun 2019 10:19:55 +0000 (12:19 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
next is 7.2.21
Remi Collet [Tue, 11 Jun 2019 10:19:39 +0000 (12:19 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
next is 7.2.21
Remi Collet [Tue, 11 Jun 2019 10:19:17 +0000 (12:19 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
next is 7.2.21
Remi Collet [Tue, 11 Jun 2019 10:18:43 +0000 (12:18 +0200)]
next is 7.2.21
Joe Watkins [Tue, 11 Jun 2019 09:09:24 +0000 (11:09 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
drop docker until tested locally
Joe Watkins [Tue, 11 Jun 2019 09:09:06 +0000 (11:09 +0200)]
drop docker until tested locally
Joe Watkins [Tue, 11 Jun 2019 08:45:41 +0000 (10:45 +0200)]
Merge branch 'PHP-7.4' of git://github.com/php/php-src into PHP-7.4
Joe Watkins [Tue, 11 Jun 2019 08:43:26 +0000 (10:43 +0200)]
Merge branch 'master' of git://github.com/php/php-src
Joe Watkins [Tue, 11 Jun 2019 08:42:54 +0000 (10:42 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
checkout depth of one doesn't always work with batched builds, it seems
Joe Watkins [Tue, 11 Jun 2019 08:42:25 +0000 (10:42 +0200)]
checkout depth of one doesn't always work with batched builds, it seems
Nikita Popov [Tue, 11 Jun 2019 08:29:20 +0000 (10:29 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Tue, 14 May 2019 12:27:10 +0000 (14:27 +0200)]
Add get_mangled_object_vars() function
Joe Watkins [Tue, 11 Jun 2019 08:25:39 +0000 (10:25 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
i386 build
Joe Watkins [Tue, 11 Jun 2019 08:23:59 +0000 (10:23 +0200)]
Merge branch 'i386-azure' into PHP-7.4
* i386-azure:
i386 build
Joe Watkins [Sun, 9 Jun 2019 13:31:19 +0000 (15:31 +0200)]
i386 build
Nikita Popov [Tue, 11 Jun 2019 08:07:19 +0000 (10:07 +0200)]
Remove ldap zpp tests
Missed these in the zpp test purge -- they've been failing on master
for a while, but nobody compiles with ldap.
Tyson Andre [Sun, 9 Jun 2019 20:55:56 +0000 (16:55 -0400)]
Fix php 8.0's opcache flags for pathinfo()
See https://php.net/pathinfo
This fixes a bug introduced in the cleanup for commit
0d79c70cf3c10f60a2e8fbfd68903d8716b7b43c
`pathinfo($str, PATHINFO_EXTENSION)` will always return a string
(if there is no extension, the function returns the empty string)