]>
granicus.if.org Git - php/log
Derick Rethans [Thu, 7 Feb 2019 11:13:01 +0000 (11:13 +0000)]
Merge branch 'PHP-7.3' into PHP-7.4
Derick Rethans [Thu, 7 Feb 2019 11:12:42 +0000 (11:12 +0000)]
Merge branch 'PHP-7.2' into PHP-7.3
Derick Rethans [Wed, 6 Feb 2019 10:39:55 +0000 (10:39 +0000)]
Use pkg-config for ICU, as the old icu-config has been deprecated
Nikita Popov [Thu, 7 Feb 2019 10:00:51 +0000 (11:00 +0100)]
Require icu-uc and icu-i18n next to icu-io
Nikita Popov [Thu, 7 Feb 2019 09:04:54 +0000 (10:04 +0100)]
Fix DIM_OBJ specialization in zend_vm_get_opcode_handler_func
DIM_OBJ also specializes over ASSIGN_STATIC_PROP nowadays.
Christoph M. Becker [Tue, 5 Feb 2019 22:05:37 +0000 (23:05 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix NEWS
Christoph M. Becker [Tue, 5 Feb 2019 22:04:31 +0000 (23:04 +0100)]
Fix NEWS
Bug #77287 is already fixed in PHP 7.3.2.
Nikita Popov [Tue, 5 Feb 2019 11:42:00 +0000 (12:42 +0100)]
Some more test removals
Noticed these while implementing error handler changes.
Nikita Popov [Fri, 1 Feb 2019 11:57:55 +0000 (12:57 +0100)]
Remove zpp variation tests
Dmitry Stogov [Tue, 5 Feb 2019 07:33:28 +0000 (10:33 +0300)]
Remove copyright years.
Côme Chilliet [Mon, 4 Feb 2019 11:09:51 +0000 (12:09 +0100)]
Mark ldap_control_paged_result and ldap_control_paged_result_response as deprecated
These functions have serious limitations and may confuse users.
Same operations can be done using the new ldap control system in search
operations.
Dmitry Stogov [Mon, 4 Feb 2019 10:57:03 +0000 (13:57 +0300)]
Reset common fields of EG(trampoline)
Peter Kokot [Tue, 22 Jan 2019 20:39:32 +0000 (21:39 +0100)]
Remove local variables
This patch removes the so called local variables defined per
file basis for certain editors to properly show tab width, and
similar settings. These are mainly used by Vim and Emacs editors
yet with recent changes the once working definitions don't work
anymore in Vim without custom plugins or additional configuration.
Neither are these settings synced across the PHP code base.
A simpler and better approach is EditorConfig and fixing code
using some code style fixing tools in the future instead.
This patch also removes the so called modelines for Vim. Modelines
allow Vim editor specifically to set some editor configuration such as
syntax highlighting, indentation style and tab width to be set in the
first line or the last 5 lines per file basis. Since the php test
files have syntax highlighting already set in most editors properly and
EditorConfig takes care of the indentation settings, this patch removes
these as well for the Vim 6.0 and newer versions.
With the removal of local variables for certain editors such as
Emacs and Vim, the footer is also probably not needed anymore when
creating extensions using ext_skel.php script.
Additionally, Vim modelines for setting php syntax and some editor
settings has been removed from some *.phpt files. All these are
mostly not relevant for phpt files neither work properly in the
middle of the file.
Christoph M. Becker [Sun, 3 Feb 2019 17:32:01 +0000 (18:32 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
[ci skip] Add missing notes regarding gc_status()
Christoph M. Becker [Sun, 3 Feb 2019 17:28:43 +0000 (18:28 +0100)]
[ci skip] Add missing notes regarding gc_status()
Joe Watkins [Sun, 3 Feb 2019 07:42:07 +0000 (08:42 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Properly check for array_replace_recursive in sccp.c
Joe Watkins [Sun, 3 Feb 2019 07:41:26 +0000 (08:41 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Properly check for array_replace_recursive in sccp.c
Tyson Andre [Sat, 2 Feb 2019 01:54:21 +0000 (20:54 -0500)]
Properly check for array_replace_recursive in sccp.c
Due to a typo, this code used to check for array_merge_recursive
twice.
Nikita Popov [Fri, 1 Feb 2019 13:58:10 +0000 (14:58 +0100)]
Deprecate mb_ereg_replace with non-string pattern
I'm counting this towards the non-string needle deprecation from
https://wiki.php.net/rfc/deprecations_php_7_3. I wasn't aware that
mb_ereg_replace() is also affected by this issue. It's even more
ridiculous than usual here, because the integer is interpreted as
an ASCII codepoint, even though these are supposed to be multibyte
functions :(
Nikita Popov [Fri, 1 Feb 2019 10:41:18 +0000 (11:41 +0100)]
Fix bogus $PHP_PCRE_REGEX checks
This variable was dropped in the pkg-config migration, which resulted
in spurious warnings about using valgrind with external PCRE. Fix the
checks to use the right variable.
Dmitry Stogov [Fri, 1 Feb 2019 08:13:25 +0000 (11:13 +0300)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fixed bug #77329 (Buffer Overflow via overly long Error Messages)
Dmitry Stogov [Fri, 1 Feb 2019 08:11:15 +0000 (11:11 +0300)]
Fixed bug #77329 (Buffer Overflow via overly long Error Messages)
Nikita Popov [Thu, 31 Jan 2019 08:39:10 +0000 (09:39 +0100)]
Revert "Don't silence fatal errors with @"
This reverts commit
abd36289e26cc0365e82373699aba4c1ffff464d .
This wasn't ready for merging yet, there are still some test
failures.
Nikita Popov [Mon, 26 Nov 2018 20:20:03 +0000 (21:20 +0100)]
Don't silence fatal errors with @
Joe Watkins [Wed, 30 Jan 2019 17:28:36 +0000 (18:28 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix bug 76596: phpdbg supports display_errors=stderr
Joe Watkins [Wed, 30 Jan 2019 17:28:09 +0000 (18:28 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix bug 76596: phpdbg supports display_errors=stderr
Kevin Abel [Mon, 9 Jul 2018 02:18:20 +0000 (21:18 -0500)]
Fix bug 76596: phpdbg supports display_errors=stderr
Joe Watkins [Wed, 30 Jan 2019 16:10:19 +0000 (17:10 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #77546 iptcembed broken function
Guillaume Degoulet [Wed, 30 Jan 2019 10:38:17 +0000 (11:38 +0100)]
Fix #77546 iptcembed broken function
David Carlier [Wed, 28 Nov 2018 10:29:34 +0000 (10:29 +0000)]
opcache/FreeBSD huge code page pragma support
Sort of following up on super pages support earlier, here
we also detect page mappings possibly eligible to go to
super pages.
Zeev Suraski [Wed, 30 Jan 2019 09:26:28 +0000 (11:26 +0200)]
Take out some last remnants of the yearly copyright range
Zeev Suraski [Wed, 30 Jan 2019 09:23:29 +0000 (11:23 +0200)]
Adios, yearly copyright ranges
Zeev Suraski [Wed, 30 Jan 2019 09:03:12 +0000 (11:03 +0200)]
Remove yearly range from copyright notice
Christoph M. Becker [Wed, 30 Jan 2019 00:30:37 +0000 (01:30 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Prepare main branch for PHP 7.2.16
Christoph M. Becker [Wed, 30 Jan 2019 00:29:05 +0000 (01:29 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Prepare main branch for PHP 7.2.16
Christoph M. Becker [Wed, 30 Jan 2019 00:27:57 +0000 (01:27 +0100)]
Prepare main branch for PHP 7.2.16
Nikita Popov [Tue, 29 Jan 2019 08:40:19 +0000 (09:40 +0100)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Tue, 29 Jan 2019 08:40:06 +0000 (09:40 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Tue, 29 Jan 2019 08:39:12 +0000 (09:39 +0100)]
Make special assert() handling independent of compiler flags
Nikita Popov [Mon, 28 Jan 2019 10:26:45 +0000 (11:26 +0100)]
Avoid mention of php7 in credits script
Nikita Popov [Mon, 28 Jan 2019 08:23:53 +0000 (09:23 +0100)]
Merge branch 'PHP-7.3'
Nikita Popov [Mon, 28 Jan 2019 08:22:49 +0000 (09:22 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
ekinhbayar [Mon, 28 Jan 2019 06:46:29 +0000 (09:46 +0300)]
Fixed bug #77530: PHP crashes when parsing "(2)::class"
Nikita Popov [Sun, 27 Jan 2019 19:50:08 +0000 (20:50 +0100)]
Fix assign to self detection
rjhdby [Sat, 26 Jan 2019 11:10:03 +0000 (14:10 +0300)]
zend_compile.c: zend_is_variable(). Removed unnecessary checks. Naming according to internal logic.
Jakub Zelenka [Fri, 25 Jan 2019 14:16:57 +0000 (14:16 +0000)]
Merge branch 'PHP-7.3'
Jakub Zelenka [Fri, 25 Jan 2019 14:16:08 +0000 (14:16 +0000)]
Merge branch 'PHP-7.2' into PHP-7.3
Jakub Zelenka [Thu, 17 Jan 2019 18:05:13 +0000 (18:05 +0000)]
Fix bug #77390 (feof might hang on TLS streams in case of fragmented TLS records)
Simplified version of the fix from Abyl Valg so credit to him.
Jakub Zelenka [Wed, 16 Jan 2019 18:14:30 +0000 (18:14 +0000)]
Update and integrate openssl client proxy test
Abyr Valg [Sun, 29 Apr 2018 09:05:59 +0000 (12:05 +0300)]
Add a test for fragmented SSL packets
Dmitry Stogov [Fri, 25 Jan 2019 10:36:32 +0000 (13:36 +0300)]
Don't hide real peak usage.
Nikita Popov [Fri, 25 Jan 2019 10:12:34 +0000 (11:12 +0100)]
Fixed bug #77518
Nikita Popov [Fri, 25 Jan 2019 10:03:29 +0000 (11:03 +0100)]
Merge branch 'PHP-7.3'
Nikita Popov [Fri, 25 Jan 2019 10:00:35 +0000 (11:00 +0100)]
Fixed bug #77498
I've renamed the function to the same name as the exported symbol
in master.
Dmitry Stogov [Fri, 25 Jan 2019 08:53:31 +0000 (11:53 +0300)]
Fixed crash
Nikita Popov [Thu, 24 Jan 2019 15:11:35 +0000 (16:11 +0100)]
Remove unused prototype in mbstring
Reported by legale.
Andreas Treichel [Sat, 29 Dec 2018 21:10:19 +0000 (22:10 +0100)]
Allow strip_tags with an array of allowed tagnames
Dmitry Stogov [Thu, 24 Jan 2019 15:01:24 +0000 (18:01 +0300)]
Reduce amount of updated memory
Dmitry Stogov [Thu, 24 Jan 2019 15:00:45 +0000 (18:00 +0300)]
Fixed crash
Nikita Popov [Thu, 24 Jan 2019 14:14:09 +0000 (15:14 +0100)]
Merge branch 'PHP-7.3'
Nikita Popov [Thu, 24 Jan 2019 14:13:49 +0000 (15:13 +0100)]
Fixed bug #77514
Dmitry Stogov [Thu, 24 Jan 2019 13:01:04 +0000 (16:01 +0300)]
Delay hash table allocation
Dmitry Stogov [Thu, 24 Jan 2019 12:59:33 +0000 (15:59 +0300)]
Disallow PHP startup, in case some ext ext/standard sub-module is not initialized sucessfully.
Nikita Popov [Thu, 24 Jan 2019 12:45:48 +0000 (13:45 +0100)]
Merge branch 'PHP-7.3'
Nikita Popov [Thu, 24 Jan 2019 12:45:40 +0000 (13:45 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Thu, 24 Jan 2019 12:45:27 +0000 (13:45 +0100)]
Merge remote-tracking branch 'php-src/PHP-7.2' into PHP-7.2
Nikita Popov [Thu, 24 Jan 2019 12:40:54 +0000 (13:40 +0100)]
Merge branch 'PHP-7.3'
Nikita Popov [Thu, 24 Jan 2019 12:40:36 +0000 (13:40 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Thu, 24 Jan 2019 12:36:47 +0000 (13:36 +0100)]
Revert "Prefix error_code with underscore in FastZPP implementation"
This reverts commit
6305119a5193d4318add01190ca4afbb49ded102 .
This is a source-compatibility break for extensions that define
custom FastZPP macros, such as ext/uv:
https://github.com/bwoebi/php-uv/blob/
a983eb17b69f74a45d785ddc6a7bff3d4531b88c /php_uv.c#L75
I don't think that FastZPP was intended to be used this way, but
let's revert this from release branches to avoid extension breakage.
Christoph M. Becker [Thu, 24 Jan 2019 12:09:18 +0000 (13:09 +0100)]
Improve wording
As suggested by Tom Sommer[1].
[1] <https://github.com/php/php-src/commit/
8a4c2f16217fb8f8d098355f3943f31e82bcfd71 #r32037340>
Christoph M. Becker [Thu, 24 Jan 2019 11:41:53 +0000 (12:41 +0100)]
Fix README.RELEASE_PROCESS
According to current practice, and as discussed with other RMs.
Dmitry Stogov [Thu, 24 Jan 2019 10:08:00 +0000 (13:08 +0300)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Fixed bug #77494 (Disabling class causes segfault on member access)
Dmitry Stogov [Thu, 24 Jan 2019 10:07:31 +0000 (13:07 +0300)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fixed bug #77494 (Disabling class causes segfault on member access)
Dmitry Stogov [Thu, 24 Jan 2019 10:06:36 +0000 (13:06 +0300)]
Fixed bug #77494 (Disabling class causes segfault on member access)
Nikita Popov [Thu, 24 Jan 2019 09:58:24 +0000 (10:58 +0100)]
Merge branch 'PHP-7.3'
Nikita Popov [Thu, 24 Jan 2019 09:57:45 +0000 (10:57 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Thu, 24 Jan 2019 09:56:04 +0000 (10:56 +0100)]
Add flag to disable jumptable optimization
This is useful for coverage. While it is currently safe to just
skip over the SWITCH_* opcodes, this may not be true in the future
due to opcache optimizations, so it's safer to disable emission of
SWITCH_* opcodes entirely.
Gabriel Caruso [Mon, 24 Dec 2018 16:27:53 +0000 (14:27 -0200)]
Make more tests run os MacOS
Nikita Popov [Tue, 22 Jan 2019 17:07:46 +0000 (18:07 +0100)]
Remove the "o" serialization format
We never generate the "o" format during serialization, so let's not
keep this unnecessary attack surface around.
Christoph M. Becker [Tue, 22 Jan 2019 13:06:34 +0000 (14:06 +0100)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Prepare main branch for PHP 7.3.3
Christoph M. Becker [Tue, 22 Jan 2019 13:04:03 +0000 (14:04 +0100)]
Prepare main branch for PHP 7.3.3
Nikita Popov [Tue, 22 Jan 2019 11:28:44 +0000 (12:28 +0100)]
Merge branch 'PHP-7.3'
Nikita Popov [Tue, 22 Jan 2019 11:15:06 +0000 (12:15 +0100)]
Fixed bug #77287
There may be an EXT_NOP opcode before the parameter list, we should
skip over it.
Nikita Popov [Tue, 15 Jan 2019 16:04:24 +0000 (17:04 +0100)]
Implement ??= operator
RFC: https://wiki.php.net/rfc/null_coalesce_equal_operator
$a ??= $b is $a ?? ($a = $b), with the difference that $a is only
evaluated once, to the degree that this is possible. In particular
in $a[foo()] ?? $b function foo() is only ever called once.
However, the variable access themselves will be reevaluated.
Nikita Popov [Wed, 16 Jan 2019 15:23:52 +0000 (16:23 +0100)]
Make tokenizer test robust against token renumbering
Dmitry Stogov [Mon, 21 Jan 2019 23:11:50 +0000 (02:11 +0300)]
Most opcodes that don't consume their OP1 operand, must be terminated with real consumer, and don't have to be checked.
These checks are replaced by ZEND_ASSERT.
Dmitry Stogov [Mon, 21 Jan 2019 22:33:35 +0000 (01:33 +0300)]
Use SSA instead of bogus reverse linear scan.
Dmitry Stogov [Mon, 21 Jan 2019 20:34:09 +0000 (23:34 +0300)]
Fixed odd ROPE_ADD instruction placement.
Christoph M. Becker [Mon, 21 Jan 2019 19:23:53 +0000 (20:23 +0100)]
[ci skip] List FFI extension
Dmitry Stogov [Mon, 21 Jan 2019 19:18:07 +0000 (22:18 +0300)]
Use ZEND_FUNC_FREE_LOOP_VAR flag to avoid useless iterations.
Christoph M. Becker [Mon, 21 Jan 2019 16:55:53 +0000 (17:55 +0100)]
[ci skip] Add opcache.preload directive
Dmitry Stogov [Mon, 21 Jan 2019 15:17:10 +0000 (18:17 +0300)]
Avoid double live ranges recalculation.
Christoph M. Becker [Mon, 21 Jan 2019 14:58:02 +0000 (15:58 +0100)]
[ci skip] Note preloading and ext/ffi in UPGRADING
Christoph M. Becker [Mon, 21 Jan 2019 14:22:48 +0000 (15:22 +0100)]
Remove superfluous variable
This has been missed when libsqlite3 has been unbundled.
Dmitry Stogov [Mon, 21 Jan 2019 14:25:24 +0000 (17:25 +0300)]
Live ranges construction optimization
Christoph M. Becker [Mon, 21 Jan 2019 13:01:34 +0000 (14:01 +0100)]
Use pkg-config to detect and configure for system libgd
Formerly, a single option `--with-gd` was sufficient to enable the
extension, and to determine whether to use the system or the bundled
libgd depending on whether a directory was passed. Since pkg-config
determines the path automatically, we now offer `--enable-gd` (whether
the extension should be build) and `--with-external-gd` (whether to use
the system libgd).
Nikita Popov [Thu, 17 Jan 2019 15:07:17 +0000 (16:07 +0100)]
Implement single-pass live range calculation
Instead of interleaving creation of live-ranges with the main
compiler code, compute them in a separate pass over the opcodes
as part of pass_two. Additionally, do not keep live ranges
synchronized during optimization in opcache and instead use the
same mechanism to recompute them after optimization.
George Wang [Sun, 20 Jan 2019 20:11:58 +0000 (15:11 -0500)]
Merge branch 'PHP-7.3'
George Wang [Sun, 20 Jan 2019 20:11:37 +0000 (15:11 -0500)]
Merge branch 'PHP-7.2' into PHP-7.3
George Wang [Sun, 20 Jan 2019 20:10:19 +0000 (15:10 -0500)]
Checkin LiteSpeed SAPI 7.2.