]>
granicus.if.org Git - php/log
Joe Watkins [Sun, 16 Jun 2019 05:18:17 +0000 (07:18 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
gettimeofday cannot be used to reliably implement high precision process synchronization
Joe Watkins [Sun, 16 Jun 2019 05:02:28 +0000 (07:02 +0200)]
gettimeofday cannot be used to reliably implement high precision process synchronization
The use of gettimeofday in time_sleep_until is technically incorrect, it's not possible
to use gettimeofday in this way reliably on any platform: It relies on operating system
global structures, which may be modified by any other process on the system at any time.
While in practice, users may be ignoring this flaw, it entirely depends on the other software
running on the system to which the application is deployed, there is no possible way to write
a test that will always pass on any system, therefore it must be marked XFAIL.
Anatol Belski [Sat, 15 Jun 2019 15:42:04 +0000 (17:42 +0200)]
Set correct default version
Anatol Belski [Sat, 15 Jun 2019 15:39:44 +0000 (17:39 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Set correct default version
Anatol Belski [Sat, 15 Jun 2019 15:39:13 +0000 (17:39 +0200)]
Set correct default version
Joe Watkins [Sat, 15 Jun 2019 08:08:48 +0000 (10:08 +0200)]
PHP-8.0 should run JIT tests, always [ci skip]
Joe Watkins [Sat, 15 Jun 2019 08:07:15 +0000 (10:07 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
PHP-7.4 branch should not run JIT tests, ever [ci skip]
Joe Watkins [Sat, 15 Jun 2019 08:06:51 +0000 (10:06 +0200)]
PHP-7.4 branch should not run JIT tests, ever [ci skip]
Joe Watkins [Sat, 15 Jun 2019 08:01:22 +0000 (10:01 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
This test is flaky, and some of it doesn't make sense.
Joe Watkins [Sat, 15 Jun 2019 07:57:51 +0000 (09:57 +0200)]
This test is flaky, and some of it doesn't make sense.
I've refactored based on the original bug report, related bugs, and commits
to php-src that were related to them.
It is supposed to be testing windows specific behaviour related to non-blocking pipes,
nevertheless the test runs everywhere.
Joe Watkins [Sat, 15 Jun 2019 06:39:50 +0000 (08:39 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove dead code in sockets extension [ci skip]
George Peter Banyard [Fri, 14 Jun 2019 17:01:02 +0000 (19:01 +0200)]
Remove dead code in sockets extension [ci skip]
Joe Watkins [Sat, 15 Jun 2019 06:09:17 +0000 (08:09 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
fix flaky socket tests
Joe Watkins [Sat, 15 Jun 2019 06:08:08 +0000 (08:08 +0200)]
fix flaky socket tests
Nikita Popov [Fri, 14 Jun 2019 15:09:21 +0000 (17:09 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Fri, 14 Jun 2019 15:06:47 +0000 (17:06 +0200)]
Remove file/005_variation.phpt
As this test doesn't check differences in times before and after
operations, it doesn't actually verify anything and just wastes
30 seconds of test time.
As we already have other tests that do check how stat times change,
I'm removing it entirely.
Nikita Popov [Fri, 14 Jun 2019 14:56:42 +0000 (16:56 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Fri, 14 Jun 2019 14:55:51 +0000 (16:55 +0200)]
Make curl_multi_info_read.phpt more robust
I don't think there's any need to make remote connections here
(and bugs.php.net is down right now...) so just use local files
instead.
Nikita Popov [Fri, 14 Jun 2019 14:16:26 +0000 (16:16 +0200)]
Merge branch 'PHP-7.4'
George Peter Banyard [Wed, 12 Jun 2019 19:27:49 +0000 (21:27 +0200)]
Remove useless param in php_snmp_error()
It is always NULL.
Nikita Popov [Fri, 14 Jun 2019 13:38:27 +0000 (15:38 +0200)]
Merge branch 'PHP-7.4'
Rosen Penev [Sat, 27 Apr 2019 18:17:28 +0000 (11:17 -0700)]
Fix compilation without deprecated OpenSSL 1.1 APIs
Joe Watkins [Fri, 14 Jun 2019 12:22:41 +0000 (14:22 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
disable this test temporarily
Joe Watkins [Fri, 14 Jun 2019 12:22:25 +0000 (14:22 +0200)]
disable this test temporarily
Nikita Popov [Fri, 14 Jun 2019 11:12:08 +0000 (13:12 +0200)]
Merge branch 'PHP-7.4'
twosee [Tue, 11 Jun 2019 14:07:32 +0000 (22:07 +0800)]
Turn add_index_zval and add_next_index_zval into inline function
Avoids expression warnings and allows explicitly namespaced use in
C++.
Closes GH-4250.
Joe Watkins [Fri, 14 Jun 2019 10:59:05 +0000 (12:59 +0200)]
enable JIT only in master for macosx
Joe Watkins [Fri, 14 Jun 2019 10:57:47 +0000 (12:57 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
fix mac tests on azure
Joe Watkins [Fri, 14 Jun 2019 10:56:08 +0000 (12:56 +0200)]
Merge branch 'mac-tests' into PHP-7.4
* mac-tests:
fix mac tests on azure
Joe Watkins [Thu, 13 Jun 2019 09:28:46 +0000 (11:28 +0200)]
fix mac tests on azure
Nikita Popov [Fri, 14 Jun 2019 10:46:56 +0000 (12:46 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Fri, 14 Jun 2019 10:44:54 +0000 (12:44 +0200)]
Fix SNMP build warnings
Dmitry Stogov [Fri, 14 Jun 2019 10:29:50 +0000 (13:29 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Backport
96a12578c13b5c37195b10526fcdc669b795644d
Dmitry Stogov [Fri, 14 Jun 2019 10:29:40 +0000 (13:29 +0300)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Backport
96a12578c13b5c37195b10526fcdc669b795644d
Dmitry Stogov [Fri, 14 Jun 2019 10:29:30 +0000 (13:29 +0300)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Backport
96a12578c13b5c37195b10526fcdc669b795644d
Dmitry Stogov [Fri, 14 Jun 2019 10:29:13 +0000 (13:29 +0300)]
Dmitry Stogov [Fri, 14 Jun 2019 10:26:26 +0000 (13:26 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Backport
91a6cdbff5ebd1ca4db1d6e8c42d3265ce80ace4
Dmitry Stogov [Fri, 14 Jun 2019 10:26:04 +0000 (13:26 +0300)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Backport
91a6cdbff5ebd1ca4db1d6e8c42d3265ce80ace4
Dmitry Stogov [Fri, 14 Jun 2019 10:25:06 +0000 (13:25 +0300)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Backport
91a6cdbff5ebd1ca4db1d6e8c42d3265ce80ace4
Dmitry Stogov [Fri, 14 Jun 2019 10:24:47 +0000 (13:24 +0300)]
Dmitry Stogov [Fri, 14 Jun 2019 10:10:39 +0000 (13:10 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
More edge case fixes that may cause bug #78106
Dmitry Stogov [Fri, 14 Jun 2019 10:10:02 +0000 (13:10 +0300)]
More edge case fixes that may cause bug #78106
Dmitry Stogov [Fri, 14 Jun 2019 09:48:00 +0000 (12:48 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Attempt to fix edge conditions that may cause bug #78106
Dmitry Stogov [Fri, 14 Jun 2019 09:47:22 +0000 (12:47 +0300)]
Attempt to fix edge conditions that may cause bug #78106
Nikita Popov [Fri, 14 Jun 2019 09:37:41 +0000 (11:37 +0200)]
Merge branch 'PHP-7.4'
Theodore Brown [Thu, 2 May 2019 17:10:19 +0000 (12:10 -0500)]
Implement numeric literal separators
RFC: https://wiki.php.net/rfc/numeric_literal_separator
Nikita Popov [Fri, 14 Jun 2019 09:14:08 +0000 (11:14 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Fri, 14 Jun 2019 09:13:15 +0000 (11:13 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Fri, 14 Jun 2019 09:11:24 +0000 (11:11 +0200)]
Fix some leaks in ldap
The result of zval_get_string() needs to be released. In some places
where it is inconvenient to manage, I went back to convert_to_string.
It is safe in those places due to existing array separations.
Also fix a preexisting leak when getting controls, the previous
value was not destroyed.
Nikita Popov [Fri, 14 Jun 2019 07:30:22 +0000 (09:30 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Fri, 14 Jun 2019 07:29:14 +0000 (09:29 +0200)]
Fix skipif syntax errors
Apparently I did this only on masster...
Joe Watkins [Fri, 14 Jun 2019 06:30:46 +0000 (08:30 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
disable phpdbg on i386 builds [ci skip]
Joe Watkins [Fri, 14 Jun 2019 06:30:20 +0000 (08:30 +0200)]
disable phpdbg on i386 builds [ci skip]
Dmitry Stogov [Thu, 13 Jun 2019 21:29:22 +0000 (00:29 +0300)]
Fixed incorect register allocation in ZTS build
Christoph M. Becker [Thu, 13 Jun 2019 15:05:47 +0000 (17:05 +0200)]
Throw TypeError instead of warning in case of invalid path
For consistency with imagegd(), imagegd2() and imagexbm(), which throw
a TypeError if a path containing NUL bytes is given, we throw a
TypeError for the other image writer functions as well.
Côme Chilliet [Thu, 13 Jun 2019 20:15:41 +0000 (22:15 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Some more string conversion handling, fixing bug #77958
Avoid converting zval when not needed
Côme Chilliet [Thu, 13 Jun 2019 20:15:13 +0000 (22:15 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Some more string conversion handling, fixing bug #77958
Avoid converting zval when not needed
Côme Chilliet [Thu, 13 Jun 2019 20:12:34 +0000 (22:12 +0200)]
Some more string conversion handling, fixing bug #77958
Côme Chilliet [Thu, 13 Jun 2019 18:58:45 +0000 (20:58 +0200)]
Avoid converting zval when not needed
Also added exception checks so that exception from __toString are
correctly handled in the future
Nikita Popov [Thu, 13 Jun 2019 14:53:25 +0000 (16:53 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Thu, 13 Jun 2019 14:50:57 +0000 (16:50 +0200)]
Revert "ext/standard: Use PKG_CHECK_MODULES to detect the Argon2 library"
This reverts commit
bdcef51bcb367323f2eea4808f34a1b3e58bd3d8 .
It seems that pkg-config support for libargon2 is still flaky:
* No pc file on Alpine.
* Custom builds of released libargon2 versions create a broken
pc file. This is fixed in master, but not released.
Go back to the old detection code for now.
Christoph M. Becker [Thu, 13 Jun 2019 12:32:06 +0000 (14:32 +0200)]
Remove superfluous CLEAN sections
These actually should have been removed with commit
be73ae3 [1].
[1] <https://github.com/php/php-src/commit/
be73ae31324f7f3294a9467c0646dba4324c78ef >
Nikita Popov [Thu, 13 Jun 2019 12:22:48 +0000 (14:22 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Thu, 13 Jun 2019 12:20:47 +0000 (14:20 +0200)]
Condition some azure jobs on schedule trigger
Christoph M. Becker [Thu, 13 Jun 2019 11:07:30 +0000 (13:07 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Add BMP support to PHP info
Christoph M. Becker [Thu, 13 Jun 2019 11:03:58 +0000 (13:03 +0200)]
Add BMP support to PHP info
Nikita Popov [Thu, 13 Jun 2019 10:54:17 +0000 (12:54 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Thu, 13 Jun 2019 10:54:10 +0000 (12:54 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Thu, 13 Jun 2019 10:52:22 +0000 (12:52 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Thu, 13 Jun 2019 10:51:35 +0000 (12:51 +0200)]
Fixed bug #78106
When disabling opcache during the request via opcache.enable ini
setting, make sure we also disable ZCG(accelerator_enabled).
Nikita Popov [Thu, 13 Jun 2019 10:41:14 +0000 (12:41 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Thu, 13 Jun 2019 10:40:23 +0000 (12:40 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Thu, 13 Jun 2019 10:38:57 +0000 (12:38 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Thu, 13 Jun 2019 10:35:29 +0000 (12:35 +0200)]
Add test for bug #78106
Also add PHP_TEST_EXTRA_ARGS environment variable, which allows
to pass on -c, -d etc flags provided by run-tests.php. Otherwise
we won't get the built-in server to run with opcache.
Nikita Popov [Thu, 13 Jun 2019 10:11:23 +0000 (12:11 +0200)]
Fix helper call on 32-bit
This is using the fast-call calling convention. Use FCARG1a and
same code for 32-bit and 64-bit.
Nikita Popov [Thu, 13 Jun 2019 09:53:31 +0000 (11:53 +0200)]
Fix bug #78154 with JIT
Nikita Popov [Thu, 13 Jun 2019 08:59:18 +0000 (10:59 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Thu, 13 Jun 2019 08:59:01 +0000 (10:59 +0200)]
Fixed bug #78154
Nikita Popov [Thu, 13 Jun 2019 08:34:49 +0000 (10:34 +0200)]
Reenable -Werror for macos build
Nikita Popov [Thu, 13 Jun 2019 07:58:55 +0000 (09:58 +0200)]
Suppress -Wtautological-compare in dasc file
Nikita Popov [Thu, 13 Jun 2019 07:55:09 +0000 (09:55 +0200)]
Determine thread ID on macos
Also initialize the variable to 0 -- I don't think we really care
if this is not determine on some platform, but it should at least
not be uninitialized.
Nikita Popov [Thu, 13 Jun 2019 07:38:19 +0000 (09:38 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Thu, 13 Jun 2019 07:37:30 +0000 (09:37 +0200)]
Fixed bug #78151
Nikita Popov [Wed, 12 Jun 2019 14:57:28 +0000 (16:57 +0200)]
Don't throw warning if testing multiple ports
Joe Watkins [Wed, 12 Jun 2019 20:39:43 +0000 (22:39 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
test for bug #78151
Joe Watkins [Wed, 12 Jun 2019 20:39:00 +0000 (22:39 +0200)]
test for bug #78151
Joe Watkins [Wed, 12 Jun 2019 19:54:22 +0000 (21:54 +0200)]
temporarily disable werror on mac in master because of build failures in JIT
Joe Watkins [Wed, 12 Jun 2019 18:21:59 +0000 (20:21 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Revert "micro-optimization"
This micro optimization caused several bugs in at least Xdebug, while
i_init_func_execute_data is not exported, APIs that are exported call it
this makes their use awkward for no real gain.
Joe Watkins [Wed, 12 Jun 2019 18:04:47 +0000 (20:04 +0200)]
Revert "micro-optimization"
This reverts commit
374f7699821eb723a3a82a9854d18c0530b9d4e9 .
twosee [Sun, 26 May 2019 05:53:26 +0000 (13:53 +0800)]
Constify some char* arguments or return values of ZEND_API
Closes GH-4247.
Nikita Popov [Wed, 12 Jun 2019 14:47:48 +0000 (16:47 +0200)]
Mark label as potentially unused
twosee [Wed, 12 Jun 2019 10:49:33 +0000 (18:49 +0800)]
Add do...while(0) for RETURN_* and ZVAL_* APIs
Closes GH-4255.
Nikita Popov [Wed, 12 Jun 2019 14:16:39 +0000 (16:16 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Wed, 12 Jun 2019 13:30:44 +0000 (15:30 +0200)]
Enable -Werror on macos builds
Nikita Popov [Wed, 12 Jun 2019 13:56:38 +0000 (15:56 +0200)]
Skip syntax errors in skipif conditions
Nikita Popov [Wed, 12 Jun 2019 13:47:42 +0000 (15:47 +0200)]
Fix two 32-bit tests for zpp changes
Nikita Popov [Wed, 12 Jun 2019 13:40:23 +0000 (15:40 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Wed, 12 Jun 2019 13:39:30 +0000 (15:39 +0200)]
Fix ext/exif/tests/bug76557.phpt for 32-bit builds
The error message is different there.
Nikita Popov [Wed, 12 Jun 2019 13:28:41 +0000 (15:28 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Wed, 12 Jun 2019 13:26:06 +0000 (15:26 +0200)]
Don't warn if libcurl SSL library not detected
libcurl may link against 7 different ssl libraries, all of which
are thread-safe -- apart from openssl, of course. We check for
openssl and register locking callbacks in that case, but we should
not warn if any other library is used.