]>
granicus.if.org Git - php/log
Nikita Popov [Mon, 8 Apr 2019 11:00:28 +0000 (13:00 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 8 Apr 2019 11:00:20 +0000 (13:00 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 8 Apr 2019 11:00:05 +0000 (13:00 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
twosee [Mon, 8 Apr 2019 10:58:46 +0000 (12:58 +0200)]
Preserve keys in emulate_read_fd_set()
Keys are already preserved in the non-emulated case.
Nikita Popov [Mon, 8 Apr 2019 09:42:34 +0000 (11:42 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 8 Apr 2019 09:41:53 +0000 (11:41 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 8 Apr 2019 09:41:26 +0000 (11:41 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Mon, 8 Apr 2019 09:40:50 +0000 (11:40 +0200)]
Fixed bug #77853
Xinchen Hui [Mon, 8 Apr 2019 09:18:37 +0000 (17:18 +0800)]
Merge branch 'master' of git.php.net:/php-src
* 'master' of git.php.net:/php-src:
Fixed bug #77844
Xinchen Hui [Mon, 8 Apr 2019 09:14:06 +0000 (17:14 +0800)]
Change to php.net mail address
Nikita Popov [Mon, 8 Apr 2019 09:13:19 +0000 (11:13 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 8 Apr 2019 09:13:10 +0000 (11:13 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 8 Apr 2019 09:12:42 +0000 (11:12 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Mon, 8 Apr 2019 09:11:58 +0000 (11:11 +0200)]
Fixed bug #77844
We should probably return an integer result from the operation in
typed mode, right now the result is always a string.
Nikita Popov [Mon, 8 Apr 2019 08:20:17 +0000 (10:20 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 8 Apr 2019 08:18:26 +0000 (10:18 +0200)]
Fix invalid function by-ref prop assign handling
Nikita Popov [Mon, 8 Apr 2019 07:44:41 +0000 (09:44 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 8 Apr 2019 07:43:47 +0000 (09:43 +0200)]
Avoid time(NULL) call if explicit timestamp given
As suggested by Benjamin Coutu.
Peter Kokot [Sun, 7 Apr 2019 22:16:37 +0000 (00:16 +0200)]
[ci skip] Ignore Opcache Jit generated files
David Carlier [Sat, 6 Apr 2019 18:17:35 +0000 (19:17 +0100)]
Fix few compiler warnings.
Peter Kokot [Sun, 7 Apr 2019 21:29:12 +0000 (23:29 +0200)]
Add AS_HELP_STRING to Opcache JIT option
Peter Kokot [Sun, 7 Apr 2019 21:24:25 +0000 (23:24 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Add AS_HELP_STRING to phpdbg options
Peter Kokot [Sun, 7 Apr 2019 21:24:10 +0000 (23:24 +0200)]
Add AS_HELP_STRING to phpdbg options
Peter Kokot [Sun, 7 Apr 2019 21:16:16 +0000 (23:16 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
[ci skip] Mention docs dir
Peter Kokot [Sun, 7 Apr 2019 21:16:08 +0000 (23:16 +0200)]
[ci skip] Mention docs dir
Peter Kokot [Sun, 7 Apr 2019 16:34:02 +0000 (18:34 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove checks for locale.h, setlocale, localeconv
Peter Kokot [Sun, 24 Feb 2019 09:21:25 +0000 (10:21 +0100)]
Remove checks for locale.h, setlocale, localeconv
The `<loccale.h>` header file, setlocale, and localeconv are part of the
standard C89 [1] and on current systems can be used unconditionally.
Since PHP 7.4 requires at least C89 or greater, the `HAVE_LOCALE_H`,
`HAVE_SETLOCALE`, and `HAVE_LOCALECONV` symbols defined by Autoconf in
configure.ac [2] can be ommitted and simplifed.
The bundled libmagic (file) has also been patched already in version
5.35 and up in upstream location so when it will be patched also in
php-src the check for locale.h header is still left in the configure.ac
and in windows headers definition file.
[1] https://port70.net/~nsz/c/c89/c89-draft.html#4.4
[2] https://git.savannah.gnu.org/cgit/autoconf.git/tree/lib/autoconf/headers.m4
Omit the bundled libmagic files
Peter Kokot [Sun, 7 Apr 2019 13:57:21 +0000 (15:57 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove HAVE_SIGNAL_H
Peter Kokot [Sun, 7 Apr 2019 13:55:34 +0000 (15:55 +0200)]
Remove HAVE_SIGNAL_H
The `<signal.h>` header file is part of the standard C89 headers [1] and
on current systems can be included unconditionally.
Since file requires at least C89 or greater, the `HAVE_SIGNAL_H` symbol
defined by Autoconf in Zend.m4 [2] can be ommitted and simplifed.
The bundled libmagic (file) also ommits the usage of HAVE_SIGNAL_H since
5.35 however current version in PHP is very modified 5.34 version and
will be refactored separately. Check for HAVE_SIGNAL_H is therefore
still done in the configure.ac.
Refs:
[1] https://port70.net/~nsz/c/c89/c89-draft.html#4.1.2
[2] https://git.savannah.gnu.org/cgit/autoconf.git/tree/lib/autoconf/headers.m4
Peter Kokot [Sun, 7 Apr 2019 13:21:48 +0000 (15:21 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove HAVE_LIMITS_H
Peter Kokot [Sun, 7 Apr 2019 13:20:02 +0000 (15:20 +0200)]
Remove HAVE_LIMITS_H
The `<limits.h>` header file is part of the standard C89 headers [1]
and on current systems can be included unconditionally.
Since PHP requires at least C89 or greater, the `HAVE_LIMITS_H` symbol
defined by Autoconf in configure.ac [2] can be ommitted and simplifed
however due to bundled file library (libmagic) and timelib still using
it, the removal there was omitted and done only in Zend.m4 file.
Current bundled libraries libtime, oniguruma, and libmagic still include
partial `HAVE_LIMITS_H` usage and will be more refactored when this is
possible.
Refs:
[1] https://port70.net/~nsz/c/c89/c89-draft.html#4.1.2
[2] https://git.savannah.gnu.org/cgit/autoconf.git/tree/lib/autoconf/headers.m4
Peter Kokot [Sun, 7 Apr 2019 03:54:12 +0000 (05:54 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Refactor AC_INIT in configure.ac and PHP versions
Peter Kokot [Tue, 19 Mar 2019 22:49:26 +0000 (23:49 +0100)]
Refactor AC_INIT in configure.ac and PHP versions
Since Autoconf 2.53 the AC_INIT call with only a single argument has
been made obsolete and now includes several other optional arguments to
make installation experience a bit better by providing program version
and links to the project in the `./configure -h` output. This patch also
updates win build version. The phpize.m4 AC_INIT has been updated with
the call without arguments.
Stanislav Malyshev [Sun, 7 Apr 2019 02:06:29 +0000 (19:06 -0700)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Always use ZEND_SECURE_ZERO() when cleaning up data
bump versions after release
Stanislav Malyshev [Sun, 7 Apr 2019 02:06:21 +0000 (19:06 -0700)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Always use ZEND_SECURE_ZERO() when cleaning up data
bump versions after release
Stanislav Malyshev [Sun, 7 Apr 2019 02:06:16 +0000 (19:06 -0700)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Always use ZEND_SECURE_ZERO() when cleaning up data
bump versions after release
Stanislav Malyshev [Sun, 7 Apr 2019 02:05:37 +0000 (19:05 -0700)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Always use ZEND_SECURE_ZERO() when cleaning up data
bump versions after release
Stanislav Malyshev [Sun, 7 Apr 2019 01:15:42 +0000 (18:15 -0700)]
Always use ZEND_SECURE_ZERO() when cleaning up data
Optimizing compilers have an annoying tendency to throw out
memsets over data that they think aren't used anymore. Apply secure
zero-out in cases where this has potential to happen.
Peter Kokot [Sat, 6 Apr 2019 22:59:33 +0000 (00:59 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
[ci skip] Update release process docs to Markdown
Peter Kokot [Sat, 6 Apr 2019 22:57:41 +0000 (00:57 +0200)]
[ci skip] Update release process docs to Markdown
- Markdown
- CS syncs
- Some partial readability fixes
- The protocol hasn't been changed
Christoph M. Becker [Sat, 6 Apr 2019 15:39:20 +0000 (17:39 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix ASAN configuration
Christoph M. Becker [Sat, 6 Apr 2019 15:38:18 +0000 (17:38 +0200)]
Fix ASAN configuration
Commit
6a624c1 [1] mostly replaced `COMPILER_NAME` with
`COMPILER_NAME_LONG` and `COMPILER_NAME_SHORT`, but not all
occurrences, what broke the Clang ASAN configuration. We fix this by
getting rid of `COMPILER_NAME` altogether.
[1] <http://git.php.net/?p=php-src.git;a=commit;h=
6a624c1dfda0dbfaaff3e453e6cb58de12748fb3 >
Joe Watkins [Fri, 5 Apr 2019 23:32:15 +0000 (01:32 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Follow up #77849 PDOStatement objects in undefined state after clone
Joe Watkins [Fri, 5 Apr 2019 23:30:03 +0000 (01:30 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Follow up #77849 PDOStatement objects in undefined state after clone
Joe Watkins [Fri, 5 Apr 2019 23:27:58 +0000 (01:27 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Follow up #77849 PDOStatement objects in undefined state after clone
Joe Watkins [Fri, 5 Apr 2019 23:26:47 +0000 (01:26 +0200)]
Follow up #77849 PDOStatement objects in undefined state after clone
Joe Watkins [Fri, 5 Apr 2019 22:56:36 +0000 (00:56 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix bug #77849 Disable cloning of PDO handle/connection objects to avoid segfault
Joe Watkins [Fri, 5 Apr 2019 22:55:58 +0000 (00:55 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix bug #77849 Disable cloning of PDO handle/connection objects to avoid segfault
Joe Watkins [Fri, 5 Apr 2019 22:55:31 +0000 (00:55 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix bug #77849 Disable cloning of PDO handle/connection objects to avoid segfault
Cameron Porter [Fri, 5 Apr 2019 18:42:04 +0000 (13:42 -0500)]
Fix bug #77849 Disable cloning of PDO handle/connection objects to avoid segfault
Christoph M. Becker [Fri, 5 Apr 2019 21:16:48 +0000 (23:16 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Update Appveyor CI to php-sdk-2.2.0beta4
Christoph M. Becker [Fri, 5 Apr 2019 21:16:12 +0000 (23:16 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Update Appveyor CI to php-sdk-2.2.0beta4
Christoph M. Becker [Fri, 5 Apr 2019 21:15:50 +0000 (23:15 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Update Appveyor CI to php-sdk-2.2.0beta4
Christoph M. Becker [Fri, 5 Apr 2019 21:15:22 +0000 (23:15 +0200)]
Update Appveyor CI to php-sdk-2.2.0beta4
Peter Kokot [Fri, 5 Apr 2019 20:38:11 +0000 (22:38 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
[ci skip] Bring release process docs up 2 date
Peter Kokot [Fri, 5 Apr 2019 20:37:01 +0000 (22:37 +0200)]
[ci skip] Bring release process docs up 2 date
This syncs the latest version and the PHP-7.4 version release process
docs.
Peter Kokot [Fri, 5 Apr 2019 17:46:11 +0000 (19:46 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Add opcache.lockfile_path and opcache.lockfile_path to ini settings
Peter Kokot [Fri, 5 Apr 2019 17:44:56 +0000 (19:44 +0200)]
Add opcache.lockfile_path and opcache.lockfile_path to ini settings
Some default opcache settings were missing.
Joe Watkins [Fri, 5 Apr 2019 05:57:54 +0000 (07:57 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
typo
Markus Staab [Fri, 5 Apr 2019 05:51:30 +0000 (07:51 +0200)]
typo
David Carlier [Thu, 4 Apr 2019 21:54:19 +0000 (22:54 +0100)]
JIT register dump, fix BSD build.
Dmitry Stogov [Thu, 4 Apr 2019 22:12:34 +0000 (01:12 +0300)]
Fixed JIT for === and !==
Dmitry Stogov [Thu, 4 Apr 2019 21:26:20 +0000 (00:26 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Optimized "smart branch" instructions
Dmitry Stogov [Thu, 4 Apr 2019 21:25:45 +0000 (00:25 +0300)]
Optimized "smart branch" instructions
Javier Eguiluz [Thu, 4 Apr 2019 09:16:54 +0000 (11:16 +0200)]
Fixed a typo
Dmitry Stogov [Thu, 4 Apr 2019 15:18:52 +0000 (18:18 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Make is_identical() functions return zend_bool (instead of int)
Dmitry Stogov [Thu, 4 Apr 2019 15:18:12 +0000 (18:18 +0300)]
Make is_identical() functions return zend_bool (instead of int)
Dmitry Stogov [Thu, 4 Apr 2019 14:52:42 +0000 (17:52 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
unused variable
Dmitry Stogov [Thu, 4 Apr 2019 14:52:17 +0000 (17:52 +0300)]
unused variable
Christoph M. Becker [Thu, 4 Apr 2019 12:25:44 +0000 (14:25 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix typos
Christoph M. Becker [Thu, 4 Apr 2019 12:24:56 +0000 (14:24 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix typos
Christoph M. Becker [Thu, 4 Apr 2019 12:22:36 +0000 (14:22 +0200)]
Fix typos
Dmitry Stogov [Wed, 3 Apr 2019 21:47:51 +0000 (00:47 +0300)]
Avoid code generation for BB with single VM instruction
Dmitry Stogov [Wed, 3 Apr 2019 20:37:25 +0000 (23:37 +0300)]
jump optimization
Dmitry Stogov [Wed, 3 Apr 2019 19:46:49 +0000 (22:46 +0300)]
Fixed crash
Dmitry Stogov [Wed, 3 Apr 2019 19:28:23 +0000 (22:28 +0300)]
Avoid useless code generation for RECV opcodes
Matteo Beccati [Wed, 3 Apr 2019 12:36:27 +0000 (14:36 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Ref #76801 remove old file source from file_sources hash in case of file included more than once
Matteo Beccati [Wed, 3 Apr 2019 12:36:20 +0000 (14:36 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Ref #76801 remove old file source from file_sources hash in case of file included more than once
Matteo Beccati [Wed, 3 Apr 2019 12:36:11 +0000 (14:36 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Ref #76801 remove old file source from file_sources hash in case of file included more than once
Alessandro Chitolina [Tue, 2 Apr 2019 12:36:59 +0000 (14:36 +0200)]
Ref #76801 remove old file source from file_sources hash in case of file included more than once
Dmitry Stogov [Wed, 3 Apr 2019 12:02:04 +0000 (15:02 +0300)]
Use inlined HYBRID VM handlers for DO_FCALL* and ZEND_RETRUN
Dmitry Stogov [Wed, 3 Apr 2019 10:05:09 +0000 (13:05 +0300)]
Fixed incorrect address usage
Dmitry Stogov [Wed, 3 Apr 2019 09:39:26 +0000 (12:39 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove RC1 and RCN from scalar types.
Dmitry Stogov [Wed, 3 Apr 2019 09:38:25 +0000 (12:38 +0300)]
Remove RC1 and RCN from scalar types.
Dmitry Stogov [Wed, 3 Apr 2019 08:23:37 +0000 (11:23 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed SCCP support for ZEND_ASSIGN_OBJ_REF
Dmitry Stogov [Wed, 3 Apr 2019 08:22:59 +0000 (11:22 +0300)]
Fixed SCCP support for ZEND_ASSIGN_OBJ_REF
Dmitry Stogov [Wed, 3 Apr 2019 00:56:39 +0000 (03:56 +0300)]
JIT code improvement for ocache.jit=1 (IP consistency)
Dmitry Stogov [Wed, 3 Apr 2019 00:12:13 +0000 (03:12 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed CFG construction for SWITCH opcodes
Dmitry Stogov [Wed, 3 Apr 2019 00:11:15 +0000 (03:11 +0300)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fixed CFG construction for SWITCH opcodes
Dmitry Stogov [Wed, 3 Apr 2019 00:09:47 +0000 (03:09 +0300)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fixed CFG construction for SWITCH opcodes
Dmitry Stogov [Wed, 3 Apr 2019 00:09:03 +0000 (03:09 +0300)]
Fixed CFG construction for SWITCH opcodes
Dmitry Stogov [Tue, 2 Apr 2019 23:00:54 +0000 (02:00 +0300)]
Improve JIT code for smart branches
Dmitry Stogov [Tue, 2 Apr 2019 21:45:52 +0000 (00:45 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
array_merge() may return argument with incremented reference counter
Dmitry Stogov [Tue, 2 Apr 2019 21:44:31 +0000 (00:44 +0300)]
array_merge() may return argument with incremented reference counter
Peter Kokot [Tue, 2 Apr 2019 21:24:27 +0000 (23:24 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Clean ext/spl/tests/bug42364.phpt files after tests
Peter Kokot [Tue, 2 Apr 2019 21:24:21 +0000 (23:24 +0200)]
Clean ext/spl/tests/bug42364.phpt files after tests
Dmitry Stogov [Tue, 2 Apr 2019 20:49:31 +0000 (23:49 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Use fastcall calling convention
Dmitry Stogov [Tue, 2 Apr 2019 20:49:13 +0000 (23:49 +0300)]
Use fastcall calling convention
Dmitry Stogov [Tue, 2 Apr 2019 20:47:03 +0000 (23:47 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Improved comparison opcode handlers
Dmitry Stogov [Tue, 2 Apr 2019 20:46:21 +0000 (23:46 +0300)]
Improved comparison opcode handlers