]>
granicus.if.org Git - php/log
Peter Kokot [Sat, 13 Jul 2019 13:06:53 +0000 (15:06 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove php_multiple_shlib_versions_ok
Peter Kokot [Sat, 13 Jul 2019 13:06:35 +0000 (15:06 +0200)]
Remove php_multiple_shlib_versions_ok
Variable usage was removed via
913cec65517f11ebd972f920d1d320b853a175dd
Peter Kokot [Sat, 13 Jul 2019 12:53:07 +0000 (14:53 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove unused recode extension artefacts
Peter Kokot [Sat, 13 Jul 2019 12:52:36 +0000 (14:52 +0200)]
Remove unused recode extension artefacts
Closes GH-4395
Peter Kokot [Sat, 13 Jul 2019 12:49:00 +0000 (14:49 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove checks for always enabled spl and pcre
Peter Kokot [Sat, 13 Jul 2019 12:47:37 +0000 (14:47 +0200)]
Remove checks for always enabled spl and pcre
Closes GH-4397
Peter Kokot [Sat, 13 Jul 2019 12:40:17 +0000 (14:40 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove WARNING_LEVEL fix for QNX
Peter Kokot [Sat, 13 Jul 2019 12:39:29 +0000 (14:39 +0200)]
Remove WARNING_LEVEL fix for QNX
Fix is no longer relevant since the environment variable WARNING_LEVEL
is no longer used to define the value of the -w option for cc.
Closes GH-4398
Christoph M. Becker [Sat, 13 Jul 2019 10:03:59 +0000 (12:03 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #78283: no output for explicit environment
Christoph M. Becker [Sat, 13 Jul 2019 10:01:33 +0000 (12:01 +0200)]
Fix #78283: no output for explicit environment
This test does not work on Windows, if the child process has OPcache
enabled via php.ini, since TEMP is not set in the environment, so
OPcache can't find the base address file, and terminates the childs.
To avoid this (and potentially some other issues regarding missing
environment variables, such as PATH), we force the child process to
ignore any ini files.
Christoph M. Becker [Sat, 13 Jul 2019 07:45:14 +0000 (09:45 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #78282: atime and mtime mismatch
Christoph M. Becker [Sat, 13 Jul 2019 07:40:50 +0000 (09:40 +0200)]
Fix #78282: atime and mtime mismatch
The fix for bug #78241 assumed that `time_t` would always be 64bit, but
actually is 32bit for x86. We therefore enforce 64bit arithmetic to
avoid wrapping.
Peter Kokot [Sat, 13 Jul 2019 00:10:17 +0000 (02:10 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Convert all php_error_docref0 to php_error_docref
George Peter Banyard [Sat, 13 Jul 2019 00:05:17 +0000 (02:05 +0200)]
Convert all php_error_docref0 to php_error_docref
Closes GH-4394
Peter Kokot [Fri, 12 Jul 2019 23:58:38 +0000 (01:58 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove tsrm_config_common.h
Peter Kokot [Fri, 12 Jul 2019 00:57:52 +0000 (02:57 +0200)]
Remove tsrm_config_common.h
- Checks and defines are not relevant for files that include it anymore
- Some code is not used anymore
- Defines are a bit duplicated in zend_portability.h and TSRM.h file
- MAXPATHLEN defs moved to zend_virtual_cwd.h
Christoph M. Becker [Fri, 12 Jul 2019 16:56:09 +0000 (18:56 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
No more need to cater to pre-PHP-5.3 or PHP-6 versions
Christoph M. Becker [Fri, 12 Jul 2019 16:50:54 +0000 (18:50 +0200)]
No more need to cater to pre-PHP-5.3 or PHP-6 versions
Nikita Popov [Fri, 12 Jul 2019 15:22:58 +0000 (17:22 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Fri, 12 Jul 2019 15:22:11 +0000 (17:22 +0200)]
Don't split T_INLINE_HTML at partial PHP tag
If <?php occurs without required trailing whitespace, we should keep
it as part of a single T_INLINE_HTML region.
Nikita Popov [Fri, 12 Jul 2019 14:52:00 +0000 (16:52 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Fri, 12 Jul 2019 14:51:52 +0000 (16:51 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Fri, 12 Jul 2019 14:51:47 +0000 (16:51 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Fri, 12 Jul 2019 14:50:43 +0000 (16:50 +0200)]
Use TRY_ADDREF/TRY_DELREF in soap
The DELREF part is a possible fix for bug #78278, the ADDREF part
is a drive-by fix.
Nikita Popov [Fri, 12 Jul 2019 14:30:54 +0000 (16:30 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Fri, 12 Jul 2019 14:30:47 +0000 (16:30 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Fri, 12 Jul 2019 14:29:55 +0000 (16:29 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Fri, 12 Jul 2019 14:29:18 +0000 (16:29 +0200)]
Fixed bug #78279
Even if we don't initialize the callback on every request, we
should still reset our globals to default values...
Christoph M. Becker [Fri, 12 Jul 2019 12:36:10 +0000 (14:36 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Update NEWS and UPGRADING wrt. ext/recode unbundling
Christoph M. Becker [Fri, 12 Jul 2019 12:35:44 +0000 (14:35 +0200)]
Update NEWS and UPGRADING wrt. ext/recode unbundling
Christoph M. Becker [Fri, 12 Jul 2019 11:58:42 +0000 (13:58 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Removed ext/recode
Christoph M. Becker [Fri, 12 Jul 2019 11:58:17 +0000 (13:58 +0200)]
Removed ext/recode
Cf. <https://wiki.php.net/rfc/unbundle_recode>.
Christoph M. Becker [Fri, 12 Jul 2019 11:28:39 +0000 (13:28 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Swap implode() argument order in the test helper
Christoph M. Becker [Fri, 12 Jul 2019 11:26:54 +0000 (13:26 +0200)]
Swap implode() argument order in the test helper
Nikita Popov [Fri, 12 Jul 2019 11:18:53 +0000 (13:18 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Fri, 12 Jul 2019 11:18:18 +0000 (13:18 +0200)]
Remove duplicate XtOffsetOf() definitions in php.h
These are already defined in zend_portability.h.
Nikita Popov [Fri, 12 Jul 2019 11:14:38 +0000 (13:14 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Fri, 12 Jul 2019 11:12:56 +0000 (13:12 +0200)]
Remove unused tsrm_strtok_r() function
There is also a php_strtok_r() function, which is actually used,
but nothing uses the tsrm_strtok_r() variant...
Nikita Popov [Fri, 12 Jul 2019 10:55:21 +0000 (12:55 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Fri, 12 Jul 2019 10:43:41 +0000 (12:43 +0200)]
Remove unnecessary uses of allow_url_include in tests
Nikita Popov [Fri, 12 Jul 2019 10:17:24 +0000 (12:17 +0200)]
Remove unnecessary uses of restore_include_path() in tests
Nikita Popov [Fri, 12 Jul 2019 08:43:32 +0000 (10:43 +0200)]
Swap implode() argument order in some tests
Nikita Popov [Fri, 12 Jul 2019 08:34:49 +0000 (10:34 +0200)]
Improve bless_tests
If a string var_dump contains a wildcard, also make the length a
wildcard.
Dmitry Stogov [Fri, 12 Jul 2019 08:42:11 +0000 (11:42 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Use common code for double math
Dmitry Stogov [Fri, 12 Jul 2019 08:40:56 +0000 (11:40 +0300)]
Use common code for double math
Christoph M. Becker [Thu, 11 Jul 2019 21:34:09 +0000 (23:34 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Revert "Temporarily skip test"
Christoph M. Becker [Thu, 11 Jul 2019 21:33:34 +0000 (23:33 +0200)]
Revert "Temporarily skip test"
This reverts commit
4e5a717866ed18c5ee539e339e33cc71f0ac8a88 .
As of commit
17f7fb76053cabe20225472debe4d1801221ef9f the test should
no longer hang.
Dmitry Stogov [Thu, 11 Jul 2019 21:01:31 +0000 (00:01 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Allow GOTO style helpers in HYBRID VM
Dmitry Stogov [Thu, 11 Jul 2019 21:00:55 +0000 (00:00 +0300)]
Allow GOTO style helpers in HYBRID VM
Dmitry Stogov [Thu, 11 Jul 2019 17:45:12 +0000 (20:45 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Separate "cold" parts of comparison instructions
Dmitry Stogov [Thu, 11 Jul 2019 17:44:39 +0000 (20:44 +0300)]
Separate "cold" parts of comparison instructions
Dmitry Stogov [Thu, 11 Jul 2019 15:23:48 +0000 (18:23 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Separate "cold" parts of binary op instructions
Dmitry Stogov [Thu, 11 Jul 2019 15:23:08 +0000 (18:23 +0300)]
Separate "cold" parts of binary op instructions
Nikita Popov [Thu, 11 Jul 2019 15:09:23 +0000 (17:09 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Thu, 11 Jul 2019 15:03:48 +0000 (17:03 +0200)]
Remove redundant 64-bit ezmlm_hash() test
This test is the same as the as ezmlm_hash_basic.phpt. This function
does not behave differently on 32-bit and 64-bit.
Nikita Popov [Thu, 11 Jul 2019 11:40:20 +0000 (13:40 +0200)]
Add ZEND_DEP_ME macro
Nikita Popov [Thu, 11 Jul 2019 14:20:22 +0000 (16:20 +0200)]
Merge branch 'PHP-7.4'
George Peter Banyard [Thu, 11 Jul 2019 14:06:41 +0000 (16:06 +0200)]
Convert short tag to standard tag in Zend test file
Closes GH-4389.
Nikita Popov [Thu, 11 Jul 2019 13:49:02 +0000 (15:49 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 1 Jul 2019 11:07:30 +0000 (13:07 +0200)]
Switch to using shell-less proc_open() in various server tests
Nikita Popov [Fri, 5 Jul 2019 15:41:59 +0000 (17:41 +0200)]
Support redirect+null descriptors in proc_open
This adds support for doing something like:
[1 => ['pipe', 'w'], 2 => ['redirect', 1]]
This will make descriptor 2 on the child end a dup'd descriptor 1.
This is mainly useful in conjunction with shell-less mode, because
we don't have an easy way to do "2>&1" there.
Additionally we support:
[1 => ['pipe', 'w'], 2 => ['null']]
Which would be the same as a >/dev/null or >nul redirect, depending
on platform.
Nikita Popov [Thu, 11 Jul 2019 12:15:02 +0000 (14:15 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Thu, 11 Jul 2019 12:13:05 +0000 (14:13 +0200)]
Don't call Reflection::export() internally
export() methods were implemented in a roundabout way, where they
would call Reflection::export(), which would then call __toString().
Cut out the middleman by directly calling __toString().
Christoph M. Becker [Thu, 11 Jul 2019 11:11:40 +0000 (13:11 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #78212: Segfault in built-in webserver
Christoph M. Becker [Thu, 11 Jul 2019 11:10:41 +0000 (13:10 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #78212: Segfault in built-in webserver
Christoph M. Becker [Thu, 27 Jun 2019 09:34:51 +0000 (11:34 +0200)]
Fix #78212: Segfault in built-in webserver
Since syslog's ident and facility parameters have been added to
config[1], vsyslog() segfaults on Windows, if openlog() has not been
called before. We bring back the removed lines to fix this.
[1] <http://git.php.net/?p=php-src.git;a=commit;h=
2475337bd8a0fad0dac03db3f5e7e9d331d53653 >
Nikita Popov [Thu, 11 Jul 2019 11:00:06 +0000 (13:00 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Thu, 11 Jul 2019 10:45:49 +0000 (12:45 +0200)]
Include test name in JUnit testcase name
Azure does not show the classname attribute in any convenient way,
and the file name is the part we usually care about.
Nikita Popov [Thu, 11 Jul 2019 10:32:57 +0000 (12:32 +0200)]
Make proc_open_bug64438.phpt more robust
The test currently assumes that we'll first read the data of
stdout and stderr and then see eof on stdout and stderr. However
we could also read stdout, see eof on stdout, read stderr and see
eof on stderr, depending on timing.
Avoid output ordering issues by collecting events into a per-pipe
array, so interleaving is not visible.
Dmitry Stogov [Thu, 11 Jul 2019 09:04:51 +0000 (12:04 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
neon vectorization for base64
Sebastian Pop [Wed, 3 Jul 2019 20:10:38 +0000 (20:10 +0000)]
neon vectorization for base64
A similar algorithm is used to vectorize on x86_64, with a good description in
https://arxiv.org/abs/1704.00605 . On AArch64 the implementation differs in that
instead of using multiplies to shift bits around, it uses the vld3+vst4 and
vld4+vst3 combinations to load and store interleaved data. This patch is based
on the NEON implementation of Wojciech Mula:
https://github.com/WojciechMula/base64simd/blob/master/encode/encode.neon.cpp
https://github.com/WojciechMula/base64simd/blob/master/encode/lookup.neon.cpp
and
https://github.com/WojciechMula/base64simd/blob/master/encode/encode.neon.cpp
https://github.com/WojciechMula/base64simd/blob/master/encode/encode.neon.cpp
adapted to php/ext/standard/base64.c and vectorized with factor 16 instead of 8.
On a Graviton A1 instance and on the synthetic benchmarks in
https://github.com/lemire/fastbase64 I see 175% speedup on base64 encoding and
60% speedup on base64 decode compared to the scalar implementation.
The patch passes `make test` regression testing on aarch64-linux.
Nikita Popov [Thu, 11 Jul 2019 08:30:14 +0000 (10:30 +0200)]
Merge branch 'PHP-7.4'
Sebastian Pop [Wed, 1 May 2019 16:05:11 +0000 (16:05 +0000)]
[AArch64] Use crc32 instructions when available
The time goes from 0.838s down to 0.029s (a 28x speedup) on a Graviton A1
instance and the following benchmark:
function simple_crc32() {
$a = "foo";
for ($i = 0; $i < 10000; $i++) {
crc32($a);
$a .= "o".$i;
}
}
Nikita Popov [Thu, 11 Jul 2019 08:26:59 +0000 (10:26 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Thu, 11 Jul 2019 08:26:19 +0000 (10:26 +0200)]
Add server conflict to soap custom content type test
Peter Kokot [Thu, 11 Jul 2019 00:02:01 +0000 (02:02 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Refactor undefining PACKAGE_* symbols
Peter Kokot [Thu, 11 Jul 2019 00:00:51 +0000 (02:00 +0200)]
Refactor undefining PACKAGE_* symbols
Instead of patching configuration headers template generated by
the given tools - autoheader, this moves patching these symbols to
the configure step before creating and invoking the config.status
and before the configuration header file is generated from the
patched template.
Closes GH-4374
Peter Kokot [Wed, 10 Jul 2019 19:20:10 +0000 (21:20 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove TSRM/tsrm_config.w32.h
Peter Kokot [Wed, 10 Jul 2019 19:19:44 +0000 (21:19 +0200)]
Remove TSRM/tsrm_config.w32.h
The tsrm_config.w32.h file is a simple wrapper for already defined
symbols and includes elsewhere.
Closes GH-4383
Nikita Popov [Wed, 10 Jul 2019 13:44:02 +0000 (15:44 +0200)]
Drop support for JIT without SSE
Closes GH-4388.
Dmitry Stogov [Wed, 10 Jul 2019 15:29:56 +0000 (18:29 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Set expectation to reduce hot code fragmentation
Dmitry Stogov [Wed, 10 Jul 2019 15:29:35 +0000 (18:29 +0300)]
Set expectation to reduce hot code fragmentation
Nikita Popov [Wed, 10 Jul 2019 15:28:52 +0000 (17:28 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Wed, 10 Jul 2019 15:28:37 +0000 (17:28 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Wed, 10 Jul 2019 15:25:04 +0000 (17:25 +0200)]
Fix bug #78271
When cleaning nops in the dfa pass, we were always keeping the
smart branch inhibiting nop that occurs directly before the jump
instruction. However, as we skip unreachable blocks entirely, it
may happen that we need to keep a nop that occurs further back,
prior to the unreachable blocks. Account for that case now.
We should really do something about the smart branch situation,
this is very fragile...
Nikita Popov [Wed, 10 Jul 2019 13:19:43 +0000 (15:19 +0200)]
Merge branch 'PHP-7.4'
Cyril Pascal [Wed, 10 Jul 2019 11:50:46 +0000 (12:50 +0100)]
Align segments on huge page boundary only for x86
Closes GH-4387.
Nikita Popov [Wed, 10 Jul 2019 12:12:02 +0000 (14:12 +0200)]
Read from original address
References are derefed into FCARG1, which is later clobbered by the
undef handling code. Make sure we load from the original address
instead.
Nikita Popov [Wed, 10 Jul 2019 11:10:12 +0000 (13:10 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Wed, 10 Jul 2019 11:10:07 +0000 (13:10 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Wed, 10 Jul 2019 11:09:06 +0000 (13:09 +0200)]
Add CONFLICTS to recognized sections
It does nothing on 7.3, but this makes it easier to write tests in
3rd party extensions.
Nikita Popov [Wed, 10 Jul 2019 10:55:52 +0000 (12:55 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Wed, 10 Jul 2019 10:55:40 +0000 (12:55 +0200)]
Fix file collisions in phar tests
Nikita Popov [Wed, 10 Jul 2019 10:42:17 +0000 (12:42 +0200)]
Additional fix for mysqli_fork test
Nikita Popov [Wed, 10 Jul 2019 10:20:16 +0000 (12:20 +0200)]
Implement array access notice in JIT
Nikita Popov [Wed, 10 Jul 2019 10:05:24 +0000 (12:05 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Wed, 10 Jul 2019 08:28:58 +0000 (10:28 +0200)]
Throw notice on array access on illegal type
No notice is thrown for list() accesses, because we did not come
to an agreement regarding patterns like
while ([$key, $value] = yield $it->next()) { ... }
where silent null access may be desirable.
No effort is made to suppress multiple notices in access chains
likes $x[0][0][0], because the technical complexity this causes
does not seem worthwhile.
RFC: https://wiki.php.net/rfc/notice-for-non-valid-array-container
Nikita Popov [Wed, 10 Jul 2019 09:39:30 +0000 (11:39 +0200)]
Fix invalid array access in mysqli_fork test
Dmitry Stogov [Wed, 10 Jul 2019 09:41:19 +0000 (12:41 +0300)]
Reduce cost for GC references to strings and resources in JIT
Dmitry Stogov [Wed, 10 Jul 2019 09:29:26 +0000 (12:29 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Reduce cost for references to strings and resources