]>
granicus.if.org Git - php/log
Dmitry Stogov [Thu, 8 Aug 2019 07:09:04 +0000 (10:09 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed bug #78379 (Cast to object confuses GC, causes crash)
Dmitry Stogov [Thu, 8 Aug 2019 07:07:39 +0000 (10:07 +0300)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fixed bug #78379 (Cast to object confuses GC, causes crash)
Dmitry Stogov [Thu, 8 Aug 2019 07:05:59 +0000 (10:05 +0300)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fixed bug #78379 (Cast to object confuses GC, causes crash)
Dmitry Stogov [Thu, 8 Aug 2019 07:00:39 +0000 (10:00 +0300)]
Fixed bug #78379 (Cast to object confuses GC, causes crash)
Christoph M. Becker [Wed, 7 Aug 2019 11:25:27 +0000 (13:25 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix detection of pg_config.h
Christoph M. Becker [Wed, 7 Aug 2019 11:24:05 +0000 (13:24 +0200)]
Fix detection of pg_config.h
pg_config.h is supposed to be placed right besides libpq-fe.h, so we
should check the same paths.
Christoph M. Becker [Wed, 7 Aug 2019 11:04:42 +0000 (13:04 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Skip test if ext/json is not available
Christoph M. Becker [Wed, 7 Aug 2019 11:02:23 +0000 (13:02 +0200)]
Skip test if ext/json is not available
Otherwise the test fails.
Christoph M. Becker [Wed, 7 Aug 2019 09:31:29 +0000 (11:31 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Make extension compatibility check more liberal
Christoph M. Becker [Tue, 6 Aug 2019 09:53:41 +0000 (11:53 +0200)]
Make extension compatibility check more liberal
Checking for the exact linker version appears to be too restrictive; it
should be fine if the tens match.
We also refactor to avoid repeating ourselves.
Christoph M. Becker [Tue, 6 Aug 2019 15:29:13 +0000 (17:29 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #78282: atime and mtime mismatch
Christoph M. Becker [Tue, 6 Aug 2019 15:28:36 +0000 (17:28 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #78282: atime and mtime mismatch
Christoph M. Becker [Tue, 6 Aug 2019 15:27:32 +0000 (17:27 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
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.
(cherry picked from commit
bf242d58e77d50d4d8fdaaaca7ede686ec4467c0 )
Dmitry Stogov [Tue, 6 Aug 2019 13:33:27 +0000 (16:33 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Inline zend_zval_ptr() in executor explicitely (only on hot paths)
Dmitry Stogov [Tue, 6 Aug 2019 13:28:42 +0000 (16:28 +0300)]
Inline zend_zval_ptr() in executor explicitely (only on hot paths)
Dmitry Stogov [Tue, 6 Aug 2019 10:58:29 +0000 (13:58 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
typo
Dmitry Stogov [Tue, 6 Aug 2019 10:58:17 +0000 (13:58 +0300)]
typo
Dmitry Stogov [Tue, 6 Aug 2019 09:45:48 +0000 (12:45 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Preloading is not comatible with dl() function
Dmitry Stogov [Tue, 6 Aug 2019 09:44:55 +0000 (12:44 +0300)]
Preloading is not comatible with dl() function
Dmitry Stogov [Tue, 6 Aug 2019 08:37:08 +0000 (11:37 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Don't set GC_HAS_DESTRUCTORS flag if destructors were already called
Update NEWS for 7.4.0beta3
Update NEWS for PHP 7.4.0beta2
Dmitry Stogov [Tue, 6 Aug 2019 08:35:53 +0000 (11:35 +0300)]
Don't set GC_HAS_DESTRUCTORS flag if destructors were already called
Derick Rethans [Tue, 6 Aug 2019 06:55:20 +0000 (06:55 +0000)]
Update NEWS for 7.4.0beta3
Derick Rethans [Tue, 6 Aug 2019 06:54:01 +0000 (06:54 +0000)]
Update NEWS for PHP 7.4.0beta2
Dmitry Stogov [Mon, 5 Aug 2019 19:56:03 +0000 (22:56 +0300)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed bug #78376 (Incorrect preloading of constant static properties)
Dmitry Stogov [Mon, 5 Aug 2019 19:55:06 +0000 (22:55 +0300)]
Fixed bug #78376 (Incorrect preloading of constant static properties)
Christoph M. Becker [Mon, 5 Aug 2019 09:39:09 +0000 (11:39 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix handling of succeeding XFAIL tests
Christoph M. Becker [Mon, 5 Aug 2019 09:35:17 +0000 (11:35 +0200)]
Fix handling of succeeding XFAIL tests
Due to a typo in commit
e1151c9 [1], succeeding XFAIL test without an
EXPECTF or EXPECTREGEX section have been reported reported as passed
instead of warned.
[1] <http://git.php.net/?p=php-src.git;a=commit;h=
e1151c9549cf5a7235c1609019f79bbb1bbcdbea >
Christoph M. Becker [Sun, 4 Aug 2019 10:14:31 +0000 (12:14 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Support calling convention specific function name mangling
Christoph M. Becker [Fri, 26 Jul 2019 12:37:34 +0000 (14:37 +0200)]
Support calling convention specific function name mangling
On Windows certain calling conventions cause C function names to be
mangled, so to import them we have to use the properly mangled names.
Christoph M. Becker [Fri, 2 Aug 2019 15:05:01 +0000 (17:05 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #78346: strip_tags no longer handling nested php tags
Christoph M. Becker [Fri, 2 Aug 2019 15:03:47 +0000 (17:03 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #78346: strip_tags no longer handling nested php tags
Christoph M. Becker [Fri, 2 Aug 2019 15:03:20 +0000 (17:03 +0200)]
Fix #78346: strip_tags no longer handling nested php tags
When the strip tags state machine has been flattened, an if statement
has mistakenly been treated as else if. We fix this, and also simplify
a bit right away.
Christoph M. Becker [Fri, 2 Aug 2019 14:46:06 +0000 (16:46 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #78179: MariaDB server version incorrectly detected
Christoph M. Becker [Fri, 2 Aug 2019 14:45:08 +0000 (16:45 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #78179: MariaDB server version incorrectly detected
Christoph M. Becker [Fri, 2 Aug 2019 14:43:19 +0000 (16:43 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #78179: MariaDB server version incorrectly detected
Christoph M. Becker [Fri, 2 Aug 2019 14:42:49 +0000 (16:42 +0200)]
Fix #78179: MariaDB server version incorrectly detected
As of MariaDB 10.0.2, the server reports a fake version number as work-
around for replication issues[1]. We apply the same "fix" as in the
MariaDB client to cater to this.
[1] <https://github.com/MariaDB/server/commit/
c50ee6c23dbeb090963580754bec2f0a96ac0557 #diff-
5b45fa673c88c06a9651c7906364f592 >
Nikita Popov [Fri, 2 Aug 2019 08:38:39 +0000 (10:38 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Fri, 2 Aug 2019 08:38:26 +0000 (10:38 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Fri, 2 Aug 2019 08:37:44 +0000 (10:37 +0200)]
Add test for bug #78363
Nikita Popov [Fri, 2 Aug 2019 08:35:48 +0000 (10:35 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Fri, 2 Aug 2019 08:35:24 +0000 (10:35 +0200)]
Fixed bug #78363
Nikita Popov [Thu, 1 Aug 2019 15:00:49 +0000 (17:00 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Thu, 1 Aug 2019 13:21:12 +0000 (15:21 +0200)]
Fix forwarding of extra args in opcache server tests
Christoph M. Becker [Thu, 1 Aug 2019 08:50:40 +0000 (10:50 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Remove upgrade-pcre.php script
Christoph M. Becker [Thu, 1 Aug 2019 08:50:08 +0000 (10:50 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Remove upgrade-pcre.php script
Christoph M. Becker [Thu, 1 Aug 2019 08:49:05 +0000 (10:49 +0200)]
Remove upgrade-pcre.php script
This script has not been updated for PCRE2, and it's mostly useless
anyway. Therefore we remove it altogether.
Nikita Popov [Thu, 1 Aug 2019 08:11:02 +0000 (10:11 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Thu, 1 Aug 2019 08:10:28 +0000 (10:10 +0200)]
Add test for bug #78356
Nikita Popov [Thu, 1 Aug 2019 08:06:23 +0000 (10:06 +0200)]
Revert "Use RW fetch for argument unpacking"
This reverts commit
6913ec3282149914e999d91b056fe1cc68d15ed7 .
This reverts commit
a9e332e02777c9b3805f6af846a4f48504109d2b .
Causes https://bugs.php.net/bug.php?id=78356, which I don't have
a good solution for.
Christoph M. Becker [Wed, 31 Jul 2019 16:08:19 +0000 (18:08 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix 78213: Empty row pocket
Christoph M. Becker [Wed, 31 Jul 2019 16:08:05 +0000 (18:08 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix 78213: Empty row pocket
Christoph M. Becker [Wed, 31 Jul 2019 16:05:40 +0000 (18:05 +0200)]
Fix 78213: Empty row pocket
We have to ensure that we don't create an arena which is smaller than
its header, regardless of the configured alignment.
Peter Kokot [Tue, 30 Jul 2019 20:09:18 +0000 (22:09 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Update NEWS
Fix #78348: Remove -lrt from pdo_sqlite.so
Peter Kokot [Tue, 30 Jul 2019 20:09:00 +0000 (22:09 +0200)]
Update NEWS
Peter Kokot [Mon, 29 Jul 2019 19:12:40 +0000 (21:12 +0200)]
Fix #78348: Remove -lrt from pdo_sqlite.so
The fdatasync check has been removed since PHP 5.3.
The Solaris fix was introduced via
8d63360fc40dec579af5b5f455ef02b85caff5c5
and is today no longer relevant since the sqlite library is neither
bundled in php-src anymore neither the check needs to be done via the
PHP build system.
Closes GH-4485
Christoph M. Becker [Tue, 30 Jul 2019 14:33:16 +0000 (16:33 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix tests
Christoph M. Becker [Tue, 30 Jul 2019 14:32:49 +0000 (16:32 +0200)]
Fix tests
Apparently, nobody is testing with MySQL < 5.6 for quite a while. We
should consider dropping support for these very old versions.
Remi Collet [Tue, 30 Jul 2019 12:59:37 +0000 (14:59 +0200)]
add php-keyring.gpg update step
Nikita Popov [Tue, 30 Jul 2019 08:32:26 +0000 (10:32 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Tue, 30 Jul 2019 08:31:51 +0000 (10:31 +0200)]
Handle RW UNPACK in inference
Nikita Popov [Tue, 30 Jul 2019 08:19:01 +0000 (10:19 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Tue, 23 Jul 2019 13:54:35 +0000 (15:54 +0200)]
Fix FPM timer event re-registration
Make sure that fpm_event_add calls inside a timer callback work by
unregistering the event from the queue before invoking its callback.
The read timeout in tester.inc is increased because the added test
needs two seconds (one for SIGTERM, one for SIGKILL) until the
reload succeeds, so we should wait longer than that for a response.
Nikita Popov [Tue, 30 Jul 2019 08:07:25 +0000 (10:07 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Tue, 30 Jul 2019 08:05:12 +0000 (10:05 +0200)]
Use RW fetch for argument unpacking
Argument unpacking may need to create references inside the array
that is being unpacked. However, it currently can only do this
if a plain variable is unpacked, not for any nested accesses,
because the value is fetched for read. Resolve this by fetching
the operands for RW.
Christoph M. Becker [Tue, 30 Jul 2019 07:52:07 +0000 (09:52 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Add security related NEWS entries [ci skip]
Christoph M. Becker [Tue, 30 Jul 2019 07:50:18 +0000 (09:50 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Add security related NEWS entries [ci skip]
Christoph M. Becker [Tue, 30 Jul 2019 07:49:39 +0000 (09:49 +0200)]
Add security related NEWS entries [ci skip]
Remi Collet [Tue, 30 Jul 2019 07:27:35 +0000 (09:27 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
add security NEW entries + reorder [ci skip]
Remi Collet [Tue, 30 Jul 2019 07:27:20 +0000 (09:27 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
add security NEW entries + reorder [ci skip]
Remi Collet [Tue, 30 Jul 2019 07:27:06 +0000 (09:27 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
add security NEW entries + reorder [ci skip]
Remi Collet [Tue, 30 Jul 2019 07:26:50 +0000 (09:26 +0200)]
add security NEW entries + reorder [ci skip]
Stanislav Malyshev [Mon, 29 Jul 2019 21:51:35 +0000 (14:51 -0700)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #78338: Array cross-border reading in PCRE
Stanislav Malyshev [Mon, 29 Jul 2019 21:51:21 +0000 (14:51 -0700)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #78338: Array cross-border reading in PCRE
Christoph M. Becker [Mon, 29 Jul 2019 17:31:47 +0000 (19:31 +0200)]
Fix #78338: Array cross-border reading in PCRE
We backport r1092 from pcre2.
Stanislav Malyshev [Mon, 29 Jul 2019 20:20:59 +0000 (13:20 -0700)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #77919: Potential UAF in Phar RSHUTDOWN
Update NEWS
Fix bug #78256 (heap-buffer-overflow on exif_process_user_comment)
Fix bug #78222 (heap-buffer-overflow on exif_scan_thumbnail)
Stanislav Malyshev [Mon, 29 Jul 2019 20:20:52 +0000 (13:20 -0700)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix #77919: Potential UAF in Phar RSHUTDOWN
Update NEWS
Fix bug #78256 (heap-buffer-overflow on exif_process_user_comment)
Fix bug #78222 (heap-buffer-overflow on exif_scan_thumbnail)
Stanislav Malyshev [Mon, 29 Jul 2019 20:20:44 +0000 (13:20 -0700)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #77919: Potential UAF in Phar RSHUTDOWN
Update NEWS
Fix bug #78256 (heap-buffer-overflow on exif_process_user_comment)
Fix bug #78222 (heap-buffer-overflow on exif_scan_thumbnail)
Stanislav Malyshev [Mon, 29 Jul 2019 20:19:16 +0000 (13:19 -0700)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix #77919: Potential UAF in Phar RSHUTDOWN
Update NEWS
Fix bug #78256 (heap-buffer-overflow on exif_process_user_comment)
Fix bug #78222 (heap-buffer-overflow on exif_scan_thumbnail)
Christoph M. Becker [Mon, 29 Jul 2019 14:08:03 +0000 (16:08 +0200)]
Fix #77919: Potential UAF in Phar RSHUTDOWN
We have to properly clean up in case phar_flush() is failing.
We also make the expectation of the respective test case less liberal
to avoid missing such bugs in the future.
Stanislav Malyshev [Mon, 29 Jul 2019 07:55:18 +0000 (00:55 -0700)]
Update NEWS
Nikita Popov [Mon, 29 Jul 2019 19:08:39 +0000 (21:08 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 29 Jul 2019 18:01:20 +0000 (20:01 +0200)]
Don't explicitly install homebrew
It is already installed on azure, and this installation step is
very unreliable lately.
Christoph M. Becker [Mon, 29 Jul 2019 16:50:13 +0000 (18:50 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix build for --disable-signals
Christoph M. Becker [Mon, 29 Jul 2019 16:46:05 +0000 (18:46 +0200)]
Fix build for --disable-signals
Nikita Popov [Mon, 29 Jul 2019 15:34:42 +0000 (17:34 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 29 Jul 2019 15:34:21 +0000 (17:34 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 29 Jul 2019 15:34:08 +0000 (17:34 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Albert Casademont [Tue, 23 Jul 2019 12:03:06 +0000 (14:03 +0200)]
Fix bug #78326
Similar to what fread() does, truncate the stream_get_contents()
result if the original buffer was way too large.
Nikita Popov [Mon, 29 Jul 2019 15:15:35 +0000 (17:15 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 29 Jul 2019 14:58:29 +0000 (16:58 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
Nikita Popov [Mon, 29 Jul 2019 14:57:57 +0000 (16:57 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Tue, 23 Jul 2019 08:38:23 +0000 (10:38 +0200)]
Fix Zend signals unblocking
There are a few parts here:
* opcache should not be blocking signals while invoking compile_file,
otherwise signals may remain blocked on a compile error. While at
it, also protect SHM memory during compile_file.
* We should deactivate Zend signals at the end of the request, to make
sure that we gracefully recover from a missing unblock and signals
don't remain blocked forever.
* We don't use a critical section in deactivation, because it should
not be necessary. Additionally we want to clean up the signal queue,
if it is non-empty.
* Enable SIGG(check) in debug builds so we notice issues in the future.
Christoph M. Becker [Mon, 29 Jul 2019 12:49:18 +0000 (14:49 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Update NEWS [ci skip]
Christoph M. Becker [Mon, 29 Jul 2019 12:48:57 +0000 (14:48 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Update NEWS [ci skip]
Christoph M. Becker [Mon, 29 Jul 2019 12:48:23 +0000 (14:48 +0200)]
Update NEWS [ci skip]
The fix has been cherry-picked into PHP-7.3.8, so the bug will be fixed
already there.
Christoph M. Becker [Mon, 29 Jul 2019 11:39:28 +0000 (13:39 +0200)]
Merge branch 'PHP-7.4'
* PHP-7.4:
Document how to generate ffi_parser.c
Christoph M. Becker [Thu, 25 Jul 2019 15:05:43 +0000 (17:05 +0200)]
Document how to generate ffi_parser.c
Nikita Popov [Mon, 29 Jul 2019 11:03:59 +0000 (13:03 +0200)]
Merge branch 'PHP-7.4'
Nikita Popov [Mon, 29 Jul 2019 11:03:28 +0000 (13:03 +0200)]
Merge branch 'PHP-7.3' into PHP-7.4