Commit Graph

112165 Commits

Author SHA1 Message Date
Nikita Popov
d924b426c9 Fix file clash in fgetcsv test 2019-06-17 17:25:43 +02:00
Christoph M. Becker
e58e2fd0d4 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>
2019-06-17 16:49:52 +02:00
Nikita Popov
4e9a65447f Fix file conflicts in SplFileObject fputcsv tests 2019-06-17 15:08:52 +02:00
Dmitry Stogov
938d2359ae Remove XFAIL mark 2019-06-17 14:56:28 +03:00
Dmitry Stogov
eda916cc98 Avoid uninitilized field access 2019-06-17 14:53:44 +03:00
Dmitry Stogov
1e0b0467b6 Fixed memory leaks in ext/ffi/tests/100.phpt on Mac OSX 2019-06-17 14:40:19 +03:00
Nikita Popov
ad1b62fca7 Merge branch 'PHP-7.3' into PHP-7.4 2019-06-17 13:31:04 +02:00
Nikita Popov
11b354dd54 Merge branch 'PHP-7.2' into PHP-7.3 2019-06-17 13:30:56 +02:00
Nikita Popov
03db04c3ab Accept null for preg_quote delimiter argument
Related to bug #78163.
2019-06-17 13:30:15 +02:00
Freddie Leeman
482784284a Simplify pm.start_servers calculation in docs
This makes it more obvious that this is just the average.
2019-06-17 13:24:22 +02:00
Nikita Popov
1b63528d38 Merge branch 'PHP-7.3' into PHP-7.4 2019-06-17 13:14:18 +02:00
Erik Lundin
9f0515c40c Add syslog.filter=raw
This passes through syslog message unchanged, without splitting
messages at newlines.
2019-06-17 13:13:25 +02:00
Nikita Popov
d584f92195 Add debug output to posix_getlogin() test 2019-06-17 13:05:59 +02:00
Nikita Popov
6381b1ee82 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.
2019-06-17 12:43:45 +02:00
George Peter Banyard
b2d6d29632 Remove unnecessary short_open_tags use in tokenizer test 2019-06-17 12:43:00 +02:00
Nikita Popov
36d94f73bb Enable intl on macos 2019-06-17 11:52:26 +02:00
Joe Watkins
116d42d990
bugs in fpm logging #4273 #4007 2019-06-17 07:48:37 +02:00
Nikita Popov
4befe320e3
Use uint64_t for time_sleep_until calculations 2019-06-16 19:20:08 +02:00
Christoph M. Becker
11c3215251 Prevent parallel test conflict
Cf. <https://travis-ci.org/php/php-src/jobs/546112543#L2865-L2866>.
2019-06-16 11:48:48 +02:00
Joe Watkins
2283884475
this mtime comparison makes assumptions that cannot always hold true 2019-06-16 08:29:04 +02:00
Joe Watkins
7e1972796b
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.
2019-06-16 07:02:28 +02:00
Anatol Belski
5a83bfb37d Set correct default version 2019-06-15 17:39:13 +02:00
Joe Watkins
91f0ef04af
PHP-7.4 branch should not run JIT tests, ever [ci skip] 2019-06-15 10:07:01 +02:00
Joe Watkins
3852a35fdb
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.
2019-06-15 09:57:51 +02:00
George Peter Banyard
cfdca10910
Remove dead code in sockets extension [ci skip] 2019-06-15 08:39:35 +02:00
Joe Watkins
afdf7ed5ba
fix flaky socket tests 2019-06-15 08:08:08 +02:00
Nikita Popov
7410155dab 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.
2019-06-14 17:06:47 +02:00
Nikita Popov
8a5ce6f16f 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.
2019-06-14 16:55:51 +02:00
George Peter Banyard
6bd66f77fc Remove useless param in php_snmp_error()
It is always NULL.
2019-06-14 16:15:38 +02:00
Rosen Penev
32e6d08dcd Fix compilation without deprecated OpenSSL 1.1 APIs 2019-06-14 15:38:12 +02:00
Joe Watkins
8f4e24eeef
disable this test temporarily 2019-06-14 14:22:25 +02:00
twosee
42cc58ff7b 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.
2019-06-14 13:10:27 +02:00
Joe Watkins
dd10bf5450
Merge branch 'mac-tests' into PHP-7.4
* mac-tests:
  fix mac tests on azure
2019-06-14 12:56:08 +02:00
Joe Watkins
f16b012116
fix mac tests on azure 2019-06-14 12:55:00 +02:00
Nikita Popov
e6aec81470 Fix SNMP build warnings 2019-06-14 12:45:46 +02:00
Dmitry Stogov
6e397e9887 Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
  Backport 96a12578c1
2019-06-14 13:29:40 +03:00
Dmitry Stogov
96a6f7f7f5 Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
  Backport 96a12578c1
2019-06-14 13:29:30 +03:00
Dmitry Stogov
28808ca96d Backport 96a12578c1 2019-06-14 13:29:13 +03:00
Dmitry Stogov
cfa3866578 Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
  Backport 91a6cdbff5
2019-06-14 13:26:04 +03:00
Dmitry Stogov
a5b39abd86 Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
  Backport 91a6cdbff5
2019-06-14 13:25:06 +03:00
Dmitry Stogov
40f463b560 Backport 91a6cdbff5 2019-06-14 13:24:47 +03:00
Dmitry Stogov
96a12578c1 More edge case fixes that may cause bug #78106 2019-06-14 13:10:02 +03:00
Dmitry Stogov
91a6cdbff5 Attempt to fix edge conditions that may cause bug #78106 2019-06-14 12:47:22 +03:00
Theodore Brown
f74109d9a4 Implement numeric literal separators
RFC: https://wiki.php.net/rfc/numeric_literal_separator
2019-06-14 11:37:04 +02:00
Nikita Popov
ec77cca5f3 Merge branch 'PHP-7.3' into PHP-7.4 2019-06-14 11:13:43 +02:00
Nikita Popov
98457b6d60 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.
2019-06-14 11:11:24 +02:00
Nikita Popov
646b64b119 Fix skipif syntax errors
Apparently I did this only on masster...
2019-06-14 09:29:14 +02:00
Joe Watkins
8b6b4870e7
disable phpdbg on i386 builds [ci skip] 2019-06-14 08:30:20 +02:00
Côme Chilliet
9684d5f282 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
2019-06-13 22:15:13 +02:00
Côme Chilliet
5d2fe48785 Some more string conversion handling, fixing bug #77958 2019-06-13 22:12:34 +02:00