]>
granicus.if.org Git - php/log
Nikita Popov [Thu, 23 May 2019 11:41:26 +0000 (13:41 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Thu, 23 May 2019 11:41:17 +0000 (13:41 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Thu, 23 May 2019 10:29:08 +0000 (12:29 +0200)]
Fix bug #77955
Free metadata before freeing the arena. I don't have a repro script,
but the added assertion fails for many existing tests prior to this
change.
Christoph M. Becker [Thu, 23 May 2019 11:14:38 +0000 (13:14 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Prevent further potential test conflicts
Christoph M. Becker [Thu, 23 May 2019 11:09:14 +0000 (13:09 +0200)]
Prevent further potential test conflicts
These tests partially use the same resource names; as a quick-fix we're
marking them all as conflicting.
Joe Watkins [Thu, 23 May 2019 11:09:33 +0000 (13:09 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
fix notice in run-tests
Joe Watkins [Thu, 23 May 2019 11:09:18 +0000 (13:09 +0200)]
fix notice in run-tests
Christoph M. Becker [Thu, 23 May 2019 09:41:18 +0000 (11:41 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Prevent potential test conflict
Christoph M. Becker [Thu, 23 May 2019 09:40:39 +0000 (11:40 +0200)]
Prevent potential test conflict
bug48746_tmp.lnk is also created by bug48746_2.phpt which might clash,
if both are run simultaneouly.
Nikita Popov [Thu, 23 May 2019 09:13:22 +0000 (11:13 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Thu, 23 May 2019 09:13:14 +0000 (11:13 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Thu, 23 May 2019 09:12:34 +0000 (11:12 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Thu, 23 May 2019 09:11:54 +0000 (11:11 +0200)]
Fixed bug #78038 socket_select with references
Joe Watkins [Thu, 23 May 2019 08:59:03 +0000 (10:59 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
run-tests improvements: Add XLEAK section, this is made necessary by the support for valgrind tools other than memcheck. XLEAK is to a leaking test what XFAIL is to a failing test. Tidy up summary a little to exclude Expected Fail and Expected Leak when there are no expected fail/leaks
Joe Watkins [Thu, 23 May 2019 08:55:25 +0000 (10:55 +0200)]
run-tests improvements:
Add XLEAK section, this is made necessary by the support
for valgrind tools other than memcheck.
XLEAK is to a leaking test what XFAIL is to a failing test.
Tidy up summary a little to exclude Expected Fail and Expected Leak
when there are no expected fail/leaks
Nikita Popov [Thu, 23 May 2019 08:41:27 +0000 (10:41 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Wed, 22 May 2019 09:13:28 +0000 (11:13 +0200)]
Forbid use of not fully linked classes
Dmitry Stogov [Thu, 23 May 2019 08:21:15 +0000 (11:21 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed double mutex unlock
Dmitry Stogov [Thu, 23 May 2019 08:20:46 +0000 (11:20 +0300)]
Fixed double mutex unlock
Nikita Popov [Thu, 23 May 2019 08:01:46 +0000 (10:01 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Wed, 15 May 2019 13:27:17 +0000 (15:27 +0200)]
Don't require NO_ESCAPE for partial arrays in SCCP
Dmitry Stogov [Wed, 22 May 2019 21:21:26 +0000 (00:21 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed race condition in opcache restart
Dmitry Stogov [Wed, 22 May 2019 21:21:15 +0000 (00:21 +0300)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fixed race condition in opcache restart
Dmitry Stogov [Wed, 22 May 2019 21:21:04 +0000 (00:21 +0300)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fixed race condition in opcache restart
Dmitry Stogov [Wed, 22 May 2019 21:20:35 +0000 (00:20 +0300)]
Fixed race condition in opcache restart
Dmitry Stogov [Wed, 22 May 2019 20:02:18 +0000 (23:02 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed dump of constant flags
Dmitry Stogov [Wed, 22 May 2019 20:00:26 +0000 (23:00 +0300)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fixed dump of constant flags
Dmitry Stogov [Wed, 22 May 2019 19:59:40 +0000 (22:59 +0300)]
Fixed dump of constant flags
Joe Watkins [Wed, 22 May 2019 18:20:36 +0000 (20:20 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
add support for valgrind tools to run-tests.php
Joe Watkins [Wed, 22 May 2019 18:20:13 +0000 (20:20 +0200)]
add support for valgrind tools to run-tests.php
Nikita Popov [Wed, 22 May 2019 10:45:33 +0000 (12:45 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Wed, 22 May 2019 10:45:25 +0000 (12:45 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Wed, 22 May 2019 10:45:05 +0000 (12:45 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Sjon Hortensius [Sat, 18 May 2019 15:14:21 +0000 (17:14 +0200)]
Fix #77956 - When mysqli.allow_local_infile = Off, return a client error
Christoph M. Becker [Wed, 22 May 2019 10:03:10 +0000 (12:03 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix test case for cURL 7.65.0
Christoph M. Becker [Wed, 22 May 2019 10:02:43 +0000 (12:02 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix test case for cURL 7.65.0
Christoph M. Becker [Wed, 22 May 2019 10:02:03 +0000 (12:02 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix test case for cURL 7.65.0
Christoph M. Becker [Wed, 22 May 2019 10:00:06 +0000 (12:00 +0200)]
Fix test case for cURL 7.65.0
Reported and patch provided by @Jan-E.
Nikita Popov [Wed, 22 May 2019 09:45:31 +0000 (11:45 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Wed, 22 May 2019 09:43:56 +0000 (11:43 +0200)]
Mark bug44811.phpt as an online test
For some reason this was checked on PHP-7.2 and PHP-7.3, but not
on PHP-7.4. Bad merge?
Nikita Popov [Wed, 22 May 2019 09:43:40 +0000 (11:43 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Wed, 22 May 2019 09:43:26 +0000 (11:43 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Wed, 22 May 2019 09:41:51 +0000 (11:41 +0200)]
Use a different URL in bug44811.phpt
Dmitry Stogov [Wed, 22 May 2019 09:21:07 +0000 (12:21 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
.text segment may be not the first one
Dmitry Stogov [Wed, 22 May 2019 09:20:34 +0000 (12:20 +0300)]
.text segment may be not the first one
Nikita Popov [Wed, 22 May 2019 07:35:49 +0000 (09:35 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Wed, 22 May 2019 07:34:35 +0000 (09:34 +0200)]
Fix bug #78034
Don't def non-cv variables in assign_obj_ref data operand.
Nikita Popov [Wed, 22 May 2019 07:06:23 +0000 (09:06 +0200)]
Merge branch 'PHP-7.4'
Jaroslav Hanslík [Thu, 9 May 2019 19:58:46 +0000 (21:58 +0200)]
Fixed some arg infos to match documentation
Hugh McMaster [Mon, 20 May 2019 12:48:14 +0000 (22:48 +1000)]
Use PKG_CHECK_MODULES to detect unixODBC
Rasmus Lerdorf [Tue, 21 May 2019 21:47:28 +0000 (14:47 -0700)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix precedence issue causing sub-second timeouts to be 0 in curl_multi_select
Rasmus Lerdorf [Tue, 21 May 2019 21:46:44 +0000 (14:46 -0700)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix precedence issue causing sub-second timeouts to be 0 in curl_multi_select
Rasmus Lerdorf [Tue, 21 May 2019 21:46:24 +0000 (14:46 -0700)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix precedence issue causing sub-second timeouts to be 0 in curl_multi_select
Rasmus Lerdorf [Tue, 21 May 2019 21:44:11 +0000 (14:44 -0700)]
Fix precedence issue causing sub-second timeouts to be 0 in
curl_multi_select
Nikita Popov [Tue, 21 May 2019 15:35:33 +0000 (17:35 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Tue, 21 May 2019 15:35:28 +0000 (17:35 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Tue, 21 May 2019 15:35:03 +0000 (17:35 +0200)]
Don't evaluate functions with partial array arguments
Nikita Popov [Tue, 21 May 2019 15:18:01 +0000 (17:18 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Tue, 21 May 2019 15:17:30 +0000 (17:17 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Tue, 21 May 2019 15:15:07 +0000 (17:15 +0200)]
Fix null check in sccp add_array_elem chain handling
We need to check result_use rather than result_def for a null zval.
Previously we were later assuming that the null zval is really a
partial array, which does not go well.
Nikita Popov [Tue, 21 May 2019 15:04:17 +0000 (17:04 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Tue, 21 May 2019 15:03:52 +0000 (17:03 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Tue, 21 May 2019 14:59:27 +0000 (16:59 +0200)]
Fix partial array handling in FE_RESET edge feasibility
Nikita Popov [Tue, 21 May 2019 14:51:35 +0000 (16:51 +0200)]
Handle partial arrays in zend_is_true() checks
Nikita Popov [Tue, 21 May 2019 14:43:41 +0000 (16:43 +0200)]
Extract ct_eval_binary_op()
And use it in more places, though some of them are currently not
reachable by partial arrays to the best of my knowledge.
Nikita Popov [Tue, 21 May 2019 14:40:18 +0000 (16:40 +0200)]
Improve SCCP debug code
In particular properly dump partial arrays when tracing execution.
Remi Collet [Tue, 21 May 2019 14:15:08 +0000 (16:15 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
sodium: fix shared build
enchant: fix shared build
Remi Collet [Tue, 21 May 2019 14:14:42 +0000 (16:14 +0200)]
sodium: fix shared build
Remi Collet [Tue, 21 May 2019 14:14:12 +0000 (16:14 +0200)]
enchant: fix shared build
Christoph M. Becker [Tue, 21 May 2019 12:34:55 +0000 (14:34 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix ASLR related invalid opline handler issues
Christoph M. Becker [Mon, 20 May 2019 13:59:54 +0000 (15:59 +0200)]
Fix ASLR related invalid opline handler issues
Opcache stores `opline->handler`s in shared memory. These pointers are
invalid, if the main PHP DLL is loaded at another base address due to
ASLR. We therefore store the address of `execute_ex` in the mmap base
file, and check on startup whether it matches its current address. If
not, we fall back on the file cache if enabled, and bail out otherwise.
This still does not address cases where the opline handler is located
inside of another DLL (e.g. for some profilers, debuggers), but there
seems to be no general solution for now.
Remi Collet [Tue, 21 May 2019 12:26:08 +0000 (14:26 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
fix typo breaking shared build
Remi Collet [Tue, 21 May 2019 12:25:55 +0000 (14:25 +0200)]
fix typo breaking shared build
Christoph M. Becker [Tue, 21 May 2019 09:19:35 +0000 (11:19 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Prevent test case failure
Christoph M. Becker [Tue, 21 May 2019 09:19:05 +0000 (11:19 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Prevent test case failure
Christoph M. Becker [Tue, 21 May 2019 09:18:32 +0000 (11:18 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Prevent test case failure
Christoph M. Becker [Tue, 21 May 2019 09:17:28 +0000 (11:17 +0200)]
Prevent test case failure
If opcache.log_verbosity_level is greater than 1, opcache will raise
warnings, which will be written to stderr in the default case. These
warnings are actually to be expected, but would break the test, so we
make sure that the log_verbosity_level is 1 when running this test.
Nikita Popov [Tue, 21 May 2019 08:05:12 +0000 (10:05 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Tue, 21 May 2019 08:05:03 +0000 (10:05 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Tue, 21 May 2019 08:04:51 +0000 (10:04 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Vincent JARDIN [Tue, 23 Apr 2019 21:10:38 +0000 (23:10 +0200)]
Support content_type stream context option in soap
Allows overriding the HTTP header using the HTTP context:
$client = new SoapClient('http://url.wsdl&v=latest', [
'stream_context' => stream_context_create([
'http' => [
'content_type' => 'foobarX',
],
]),
]);
This is a backport of
c55af3c65ac116bbd935bd3d695869d88056c49c
to the PHP 7.2 branch.
Christoph M. Becker [Tue, 21 May 2019 07:03:51 +0000 (09:03 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
use {TMP} placeholder in phpt tests
Christoph M. Becker [Tue, 21 May 2019 07:03:20 +0000 (09:03 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
use {TMP} placeholder in phpt tests
Christoph M. Becker [Tue, 21 May 2019 07:03:01 +0000 (09:03 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
use {TMP} placeholder in phpt tests
Holly Li (WIPRO LIMITED) [Tue, 21 May 2019 05:53:08 +0000 (07:53 +0200)]
use {TMP} placeholder in phpt tests
Dmitry Stogov [Mon, 20 May 2019 21:08:22 +0000 (00:08 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Prevent race condition in opcache_reset()
Dmitry Stogov [Mon, 20 May 2019 21:08:12 +0000 (00:08 +0300)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Prevent race condition in opcache_reset()
Dmitry Stogov [Mon, 20 May 2019 21:08:03 +0000 (00:08 +0300)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Prevent race condition in opcache_reset()
Dmitry Stogov [Mon, 20 May 2019 21:07:17 +0000 (00:07 +0300)]
Prevent race condition in opcache_reset()
Dmitry Stogov [Mon, 20 May 2019 15:16:01 +0000 (18:16 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed bug #78014 (Preloaded classes may depend on non-preloaded classes due to unresolved consts)
Dmitry Stogov [Mon, 20 May 2019 15:15:38 +0000 (18:15 +0300)]
Fixed bug #78014 (Preloaded classes may depend on non-preloaded classes due to unresolved consts)
Christoph M. Becker [Mon, 20 May 2019 09:11:39 +0000 (11:11 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix test wrt. opcache.error_log
Christoph M. Becker [Mon, 20 May 2019 09:11:06 +0000 (11:11 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix test wrt. opcache.error_log
Christoph M. Becker [Mon, 20 May 2019 09:10:20 +0000 (11:10 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix test wrt. opcache.error_log
Christoph M. Becker [Mon, 20 May 2019 09:09:44 +0000 (11:09 +0200)]
Fix test wrt. opcache.error_log
Since the test expects log messages to be written to stderr, we have to
make sure that opcache.error_log is set correctly when running the
test.
Joe Watkins [Mon, 20 May 2019 04:07:03 +0000 (06:07 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Revert "Rename *.l files to *.re"
Joe Watkins [Mon, 20 May 2019 04:06:38 +0000 (06:06 +0200)]
Revert "Rename *.l files to *.re"
This reverts commit
969047749d33bb88a0573aa91a57e2070335111a .
Gabriel Caruso [Sun, 19 May 2019 11:47:53 +0000 (08:47 -0300)]
Fix test related to
714d9fc358640069bda5540c2b1136a6241c4c94
The string value in the test array was removed, as the `chr` function
only accepts an integer
Gabriel Caruso [Sun, 19 May 2019 10:25:56 +0000 (07:25 -0300)]
Fix tests related to
714d9fc358640069bda5540c2b1136a6241c4c94
Some changes did not get into master during merge conflits.
Peter Kokot [Sat, 18 May 2019 19:42:45 +0000 (21:42 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
[ci skip] Migrate Coding standards docs to Markdown
Move CODING_STANDARDS to CODING_STANDARDS.md