]>
granicus.if.org Git - php/log
Dmitry Stogov [Tue, 18 Jun 2019 10:52:52 +0000 (13:52 +0300)]
Fixed JIT failure, on ZTS build without global register vatriables
Joe Watkins [Tue, 18 Jun 2019 08:27:50 +0000 (10:27 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Turn system_id into a true global
Christoph M. Becker [Mon, 17 Jun 2019 16:43:05 +0000 (18:43 +0200)]
Turn system_id into a true global
The system_id is identical for all threads and can be computed during
module startup, so there is no need to calculate and store it for each
thread.
Christoph M. Becker [Tue, 18 Jun 2019 07:35:01 +0000 (09:35 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Update NEWS
Christoph M. Becker [Tue, 18 Jun 2019 07:34:24 +0000 (09:34 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Update NEWS
Christoph M. Becker [Tue, 18 Jun 2019 07:33:35 +0000 (09:33 +0200)]
Update NEWS
Joe Watkins [Tue, 18 Jun 2019 06:31:32 +0000 (08:31 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
fix flaky socket test
Joe Watkins [Tue, 18 Jun 2019 06:28:57 +0000 (08:28 +0200)]
fix flaky socket test
Remi Collet [Tue, 18 Jun 2019 05:51:33 +0000 (07:51 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
move NEWS entry
Remi Collet [Tue, 18 Jun 2019 05:51:17 +0000 (07:51 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
move NEWS entry
Remi Collet [Tue, 18 Jun 2019 05:51:05 +0000 (07:51 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
move NEWS entry
Remi Collet [Tue, 18 Jun 2019 05:50:44 +0000 (07:50 +0200)]
move NEWS entry
Christoph M. Becker [Mon, 17 Jun 2019 21:36:43 +0000 (23:36 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Implement SQLite3 backup API
BohwaZ [Mon, 17 Jun 2019 21:28:30 +0000 (23:28 +0200)]
Implement SQLite3 backup API
Nikita Popov [Mon, 17 Jun 2019 15:26:07 +0000 (17:26 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 17 Jun 2019 15:25:43 +0000 (17:25 +0200)]
Fix file clash in fgetcsv test
Christoph M. Becker [Mon, 17 Jun 2019 14:51:13 +0000 (16:51 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Improve create_verify_dir() diagnostics
Christoph M. Becker [Mon, 17 Jun 2019 14:44:49 +0000 (16:44 +0200)]
Improve create_verify_dir() diagnostics
If create_verify_dir() fails[1], we need more info why that happened.
[1] <https://ci.appveyor.com/project/cmb69/php-src/builds/
25324138 /job/dm1n12gqhdqa3ln5#L5753>
Dmitry Stogov [Mon, 17 Jun 2019 14:08:58 +0000 (17:08 +0300)]
Attempt to fix JIT on Mac OSX ZTS build
Nikita Popov [Mon, 17 Jun 2019 13:09:22 +0000 (15:09 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 17 Jun 2019 13:08:52 +0000 (15:08 +0200)]
Fix file conflicts in SplFileObject fputcsv tests
Nikita Popov [Mon, 17 Jun 2019 12:47:20 +0000 (14:47 +0200)]
Add types to a couple of builtin functions
Dmitry Stogov [Mon, 17 Jun 2019 11:56:42 +0000 (14:56 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove XFAIL mark
Dmitry Stogov [Mon, 17 Jun 2019 11:56:28 +0000 (14:56 +0300)]
Remove XFAIL mark
Dmitry Stogov [Mon, 17 Jun 2019 11:54:28 +0000 (14:54 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Avoid uninitilized field access
Dmitry Stogov [Mon, 17 Jun 2019 11:53:44 +0000 (14:53 +0300)]
Avoid uninitilized field access
Dmitry Stogov [Mon, 17 Jun 2019 11:40:48 +0000 (14:40 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed memory leaks in ext/ffi/tests/100.phpt on Mac OSX
Dmitry Stogov [Mon, 17 Jun 2019 11:40:19 +0000 (14:40 +0300)]
Fixed memory leaks in ext/ffi/tests/100.phpt on Mac OSX
Nikita Popov [Mon, 17 Jun 2019 11:31:11 +0000 (13:31 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 17 Jun 2019 11:31:04 +0000 (13:31 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 17 Jun 2019 11:30:56 +0000 (13:30 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Mon, 17 Jun 2019 11:30:15 +0000 (13:30 +0200)]
Accept null for preg_quote delimiter argument
Related to bug #78163.
Freddie Leeman [Tue, 11 Jun 2019 15:25:07 +0000 (17:25 +0200)]
Simplify pm.start_servers calculation in docs
This makes it more obvious that this is just the average.
Nikita Popov [Mon, 17 Jun 2019 11:14:26 +0000 (13:14 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 17 Jun 2019 11:14:18 +0000 (13:14 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Erik Lundin [Sat, 15 Jun 2019 07:31:16 +0000 (09:31 +0200)]
Add syslog.filter=raw
This passes through syslog message unchanged, without splitting
messages at newlines.
Nikita Popov [Mon, 17 Jun 2019 11:06:54 +0000 (13:06 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 17 Jun 2019 11:05:59 +0000 (13:05 +0200)]
Add debug output to posix_getlogin() test
Nikita Popov [Mon, 17 Jun 2019 10:44:42 +0000 (12:44 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 17 Jun 2019 10:43:45 +0000 (12:43 +0200)]
Make ext/curl/tests/bug48203_multi.phpt more robust
We don't have a guarantee in which order the output here will
occur. And it's not really relevant for the test anyway, so use a
wildcard.
George Peter Banyard [Fri, 14 Jun 2019 17:52:27 +0000 (19:52 +0200)]
Remove unnecessary short_open_tags use in tokenizer test
Tyson Andre [Sat, 15 Jun 2019 21:12:18 +0000 (17:12 -0400)]
zend_func_info: Remove null from methods with non-null return type
Detected by parsing the strings in zend_func_info.c, looping over them
and checking for inconsistencies with Reflection.
(new ReflectionFunction('str_shuffle')->getReturnType()) would be
a non-null 'string', for example.
- e.g. that change was made in
7393777da97977db5a4786a4dbe765bde4bc3921
for php 8.0
Closes GH-4269.
Nikita Popov [Mon, 17 Jun 2019 09:52:49 +0000 (11:52 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 17 Jun 2019 09:28:31 +0000 (11:28 +0200)]
Enable intl on macos
Nikita Popov [Mon, 17 Jun 2019 09:48:46 +0000 (11:48 +0200)]
Report test failures on macos
This was enabled on 7.4 but for some reason disabled on master.
Nikita Popov [Thu, 6 Jun 2019 12:25:49 +0000 (14:25 +0200)]
Remove bogus quieting in AppendIterator::append()
Nikita Popov [Thu, 6 Jun 2019 12:16:25 +0000 (14:16 +0200)]
ctor_params of mysqli_fetch_object should use "a"
Nikita Popov [Thu, 6 Jun 2019 11:05:11 +0000 (13:05 +0200)]
Don't verify arginfo types for internal functions
To avoid duplicate type checks. In debug builds arginfo is still
checked and will generate an assertions if the function doesn't
subsequently throw an exception.
Some test results change due to differences in zpp and arginfo
error messages.
Nikita Popov [Thu, 6 Jun 2019 10:50:09 +0000 (12:50 +0200)]
Allow null for weak scalar arg of internal func in arginfo
For parity with zpp.
Joe Watkins [Mon, 17 Jun 2019 05:49:28 +0000 (07:49 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
bugs in fpm logging #4273 #4007
Joe Watkins [Sun, 16 Jun 2019 06:24:32 +0000 (08:24 +0200)]
bugs in fpm logging #4273 #4007
Joe Watkins [Sun, 16 Jun 2019 17:20:37 +0000 (19:20 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Use uint64_t for time_sleep_until calculations
Nikita Popov [Sun, 16 Jun 2019 14:14:30 +0000 (16:14 +0200)]
Use uint64_t for time_sleep_until calculations
Christoph M. Becker [Sun, 16 Jun 2019 09:56:21 +0000 (11:56 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Prevent parallel test conflict
Christoph M. Becker [Sun, 16 Jun 2019 09:48:48 +0000 (11:48 +0200)]
Prevent parallel test conflict
Cf. <https://travis-ci.org/php/php-src/jobs/
546112543 #L2865-L2866>.
Tyson Andre [Sat, 15 Jun 2019 21:20:34 +0000 (17:20 -0400)]
Make opcache zend_func_info consistent with Reflection for ctype
This follows up with php 8.0 adding a real return type
(non-null bool) in
1409a3b1535e221d8449416d77ed45175f3335d2
Tyson Andre [Sat, 15 Jun 2019 20:44:02 +0000 (16:44 -0400)]
Fix a typo in UPGRADING
Joe Watkins [Sun, 16 Jun 2019 06:29:41 +0000 (08:29 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
this mtime comparison makes assumptions that cannot always hold true
Joe Watkins [Sun, 16 Jun 2019 06:29:04 +0000 (08:29 +0200)]
this mtime comparison makes assumptions that cannot always hold true
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