]>
granicus.if.org Git - php/log
Dmitry Stogov [Thu, 18 Apr 2019 11:26:15 +0000 (14:26 +0300)]
Check assert only when RC_DEBUG is enabled
Nikita Popov [Thu, 18 Apr 2019 10:24:34 +0000 (12:24 +0200)]
Add a dl() test to Travis
Compile the zend_test extension as shared and try loading it with dl()
to test for obvious issues. Doing this as a standalone call because this
is very specific to the CI setup.
Nikita Popov [Thu, 18 Apr 2019 10:08:09 +0000 (12:08 +0200)]
Fix more dl() interned string assertions
Dmitry Stogov [Wed, 17 Apr 2019 18:57:17 +0000 (21:57 +0300)]
It's safe to keep old string if it's stored not in SHM.
Dmitry Stogov [Wed, 17 Apr 2019 16:31:28 +0000 (19:31 +0300)]
Fixed dl() function. It failed in DEBUG build without opcache because of assert during string interning.
Christoph M. Becker [Wed, 17 Apr 2019 15:23:42 +0000 (17:23 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #77911: Wrong warning for session.sid_bits_per_character
Christoph M. Becker [Wed, 17 Apr 2019 15:23:23 +0000 (17:23 +0200)]
Fix #77911: Wrong warning for session.sid_bits_per_character
Derick Rethans [Wed, 17 Apr 2019 08:39:18 +0000 (09:39 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
Ignace Nyamagana Butera [Mon, 25 Mar 2019 19:30:02 +0000 (20:30 +0100)]
Fixed bug #77909: DatePeriod::__construct() with invalid recurrence count value
Improve error message on invalid reccurence count
Adding test when reccurence is -1
Christoph M. Becker [Wed, 17 Apr 2019 07:57:37 +0000 (09:57 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix tests for non English environments
Christoph M. Becker [Wed, 17 Apr 2019 07:54:01 +0000 (09:54 +0200)]
Fix tests for non English environments
Remi Collet [Tue, 16 Apr 2019 11:12:33 +0000 (13:12 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
next is 7.2.19
Remi Collet [Tue, 16 Apr 2019 11:11:23 +0000 (13:11 +0200)]
next is 7.2.19
Nikita Popov [Tue, 16 Apr 2019 09:47:41 +0000 (11:47 +0200)]
Fix HT flags copying wrt iterator count
HT_FLAGS() includes the full flag word, including the iterator
count. When we're fully reassigning it, we need to make sure that
we either really do want to copy the iterator count (as in some
cases in array.c) or we need to mask only the actual flag byte.
Add an assert to hash_iterators_del() to make sure the iterator
count is non-zero (which is how I ran into this) and make sure that
the iterator count is correctly preserved during array splicing.
Christoph M. Becker [Tue, 16 Apr 2019 09:56:03 +0000 (11:56 +0200)]
Prepare main branch for PHP 7.3.6
Nikita Popov [Tue, 16 Apr 2019 08:38:20 +0000 (10:38 +0200)]
Fix second part of bug #77903
When a HT iterator is one past the end and we rehash, we need to make
sure that it is move to the new one past the end position, to make
sure that newly inserted elements are picked up.
Nikita Popov [Tue, 16 Apr 2019 08:20:19 +0000 (10:20 +0200)]
Partial fix for bug #77903
In the hash position APIs, make sure we always advance to the next
non-undef element and not just when the position is 0 (similar to
what foreach does). This can happen when the position of an
ArrayIterator is one past its current end and a new element is
inserted not directly at that position because the array is packed.
There is still a bug here (as shown in the tests), but this is a
separate issue that also affects plain array iteration in foreach.
Nikita Popov [Mon, 15 Apr 2019 13:27:19 +0000 (15:27 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Mon, 15 Apr 2019 13:26:58 +0000 (15:26 +0200)]
Fixed bug #77895
Nikita Popov [Mon, 15 Apr 2019 13:00:49 +0000 (15:00 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Mon, 15 Apr 2019 12:59:05 +0000 (14:59 +0200)]
Zero sockaddr struct
in6 has a bunch of extra fields that we're leaving uninitialized. I
don't see them locally, but there's valgrind warnings on gcov.
Nikita Popov [Mon, 15 Apr 2019 08:54:31 +0000 (10:54 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Mon, 15 Apr 2019 08:53:33 +0000 (10:53 +0200)]
Fix uninitialized cert_captured
This is a legimitimate bug and also shows up under valgrind.
Nikita Popov [Mon, 15 Apr 2019 08:25:00 +0000 (10:25 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Mon, 15 Apr 2019 08:22:40 +0000 (10:22 +0200)]
Fixed bug #77882
Côme Chilliet [Mon, 15 Apr 2019 08:19:19 +0000 (10:19 +0200)]
Updated NEWS
Côme Chilliet [Mon, 15 Apr 2019 08:16:29 +0000 (10:16 +0200)]
Fix a NULL dereferencing crash in php-ldap
This happens when parsing a control response to a VLV request which does
not contain a "context" string.
See bug #77869
George Wang [Fri, 12 Apr 2019 21:44:32 +0000 (17:44 -0400)]
Merge branch 'PHP-7.2' into PHP-7.3
George Wang [Fri, 12 Apr 2019 21:43:45 +0000 (17:43 -0400)]
LiteSpeed SAPI 7.3, better process management, new API function litespeed_finish_request().
Christoph M. Becker [Fri, 12 Apr 2019 11:08:13 +0000 (13:08 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix tests wrt. internationalization
Christoph M. Becker [Fri, 12 Apr 2019 11:05:16 +0000 (13:05 +0200)]
Fix tests wrt. internationalization
Nikita Popov [Fri, 12 Apr 2019 08:37:08 +0000 (10:37 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Fri, 12 Apr 2019 08:36:26 +0000 (10:36 +0200)]
Fix key leaks in mb_convert_encoding()
Christoph M. Becker [Thu, 11 Apr 2019 16:30:27 +0000 (18:30 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix potential OPcache file cache related issues
Anatol Belski [Thu, 11 Apr 2019 16:17:03 +0000 (18:17 +0200)]
Fix potential OPcache file cache related issues
To solve issues detected during testing, we backport the following
commits to PHP 7.2:
129c5c1181bf344b37e13fd6dc5dfe76c13d7208
9ac133a0b3863ca4d9659140154ee237e5f4669a
ce72bc6b658c335dd37393d0beb28584e6805e97
Nikita Popov [Thu, 11 Apr 2019 10:34:18 +0000 (12:34 +0200)]
Avoid onig match param unused variable warning
Anatol Belski [Wed, 10 Apr 2019 13:20:36 +0000 (15:20 +0200)]
Ensure double slashes are replaced by the path normalization
Anatol Belski [Wed, 10 Apr 2019 12:56:29 +0000 (14:56 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix phar:// include handling with file cache
Anatol Belski [Wed, 10 Apr 2019 12:55:15 +0000 (14:55 +0200)]
Fix phar:// include handling with file cache
Nikita Popov [Wed, 10 Apr 2019 11:06:55 +0000 (13:06 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Wed, 10 Apr 2019 11:06:02 +0000 (13:06 +0200)]
Fix 29nb_async_connect.phpt
Intermediate states are unreliable across versions (I think), make
sure we go through the whole connect procedure.
Nikita Popov [Wed, 10 Apr 2019 10:22:34 +0000 (12:22 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Wed, 10 Apr 2019 10:18:57 +0000 (12:18 +0200)]
Fix pgsql use after free trying to reuse closed connection
When a connection is closed, we also need to remove the hash entry
from the regular_list, as it now points to freed memory. To do this
store a reverse mapping from the connection to the hash string.
It would be nicer to introduce a wrapping structure for the pgsql
link resource that could store the hash (and notices), but that would
require large changes to the extension, so I'm going for a more
minimal fix here.
Nikita Popov [Wed, 10 Apr 2019 08:38:32 +0000 (10:38 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Wed, 10 Apr 2019 08:36:11 +0000 (10:36 +0200)]
Fix use after free on pg_close() of default connection
Dmitry Stogov [Mon, 8 Apr 2019 22:11:02 +0000 (01:11 +0300)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Repare SWITCH VM
Dmitry Stogov [Mon, 8 Apr 2019 21:41:11 +0000 (00:41 +0300)]
Repare SWITCH VM
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: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
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.
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.
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: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: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
Christoph M. Becker [Thu, 4 Apr 2019 12:22:36 +0000 (14:22 +0200)]
Fix typos
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 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
Christoph M. Becker [Tue, 2 Apr 2019 14:54:15 +0000 (16:54 +0200)]
Update NEWS
Joe Watkins [Tue, 2 Apr 2019 14:50:20 +0000 (16:50 +0200)]
bump versions after release
Remi Collet [Tue, 2 Apr 2019 09:05:54 +0000 (11:05 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
fix paste issue
Remi Collet [Tue, 2 Apr 2019 09:05:39 +0000 (11:05 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
fix paste issue
Remi Collet [Tue, 2 Apr 2019 09:03:40 +0000 (11:03 +0200)]
fix paste issue
Christoph M. Becker [Tue, 2 Apr 2019 08:41:26 +0000 (10:41 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Pointer arithmetic on void pointers is illegal
Christoph M. Becker [Tue, 2 Apr 2019 08:40:56 +0000 (10:40 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Pointer arithmetic on void pointers is illegal
Christoph M. Becker [Tue, 2 Apr 2019 08:37:40 +0000 (10:37 +0200)]
Pointer arithmetic on void pointers is illegal
We quick-fix this by casting to char*; it might be more appropriate to
use char pointers in the first place.
Stanislav Malyshev [Tue, 2 Apr 2019 07:13:00 +0000 (00:13 -0700)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fixed bug #77831 - Heap-buffer-overflow in exif_iif_add_value in EXIF
Stanislav Malyshev [Tue, 2 Apr 2019 07:12:54 +0000 (00:12 -0700)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed bug #77831 - Heap-buffer-overflow in exif_iif_add_value in EXIF
Stanislav Malyshev [Tue, 2 Apr 2019 07:12:26 +0000 (00:12 -0700)]
Fixed bug #77831 - Heap-buffer-overflow in exif_iif_add_value in EXIF
Derick Rethans [Mon, 1 Apr 2019 09:38:40 +0000 (10:38 +0100)]
Updated to version 2019.1 (2019a)
Stanislav Malyshev [Mon, 1 Apr 2019 07:03:49 +0000 (00:03 -0700)]
Update NEWS & UPGRADING
Stanislav Malyshev [Mon, 1 Apr 2019 07:00:14 +0000 (00:00 -0700)]
Merge branch 'mb-limit-73' into PHP-7.3
* mb-limit-73:
Add fallbacks for older oniguruma versions
Add mbstring.regex_stack_limit to php.ini-*
Implement RF bug #72777 - ensure stack limits on mbstring functions.
Stanislav Malyshev [Mon, 1 Apr 2019 06:11:27 +0000 (23:11 -0700)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Update NEWS
Stanislav Malyshev [Mon, 1 Apr 2019 06:11:24 +0000 (23:11 -0700)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Update NEWS
Stanislav Malyshev [Mon, 1 Apr 2019 06:11:15 +0000 (23:11 -0700)]
Update NEWS
Stanislav Malyshev [Mon, 1 Apr 2019 06:09:57 +0000 (23:09 -0700)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix bug #77753 - Heap-buffer-overflow in php_ifd_get32s
Stanislav Malyshev [Mon, 1 Apr 2019 06:09:18 +0000 (23:09 -0700)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix bug #77753 - Heap-buffer-overflow in php_ifd_get32s
Stanislav Malyshev [Mon, 18 Mar 2019 05:54:46 +0000 (22:54 -0700)]
Fix bug #77753 - Heap-buffer-overflow in php_ifd_get32s
Christoph M. Becker [Sun, 31 Mar 2019 11:32:31 +0000 (13:32 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #77827: preg_match does not ignore \r in regex flags
Christoph M. Becker [Sun, 31 Mar 2019 11:31:54 +0000 (13:31 +0200)]
Fix #77827: preg_match does not ignore \r in regex flags
Stanislav Malyshev [Sat, 30 Mar 2019 21:52:04 +0000 (14:52 -0700)]
Add fallbacks for older oniguruma versions
Anatol Belski [Sat, 30 Mar 2019 20:27:37 +0000 (21:27 +0100)]
Fix memory leak
Matteo Beccati [Fri, 29 Mar 2019 13:09:39 +0000 (14:09 +0100)]
Fixed SKIPIF when --disable-mbregex is used
Matteo Beccati [Sat, 30 Mar 2019 17:29:44 +0000 (18:29 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fixed SKIPIF when --disable-mbregex is used
Matteo Beccati [Fri, 29 Mar 2019 13:09:39 +0000 (14:09 +0100)]
Fixed SKIPIF when --disable-mbregex is used
Christoph M. Becker [Fri, 29 Mar 2019 08:56:58 +0000 (09:56 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix test expectation
Christoph M. Becker [Fri, 29 Mar 2019 08:45:38 +0000 (09:45 +0100)]
Fix test expectation
The `W32_SM_SENDMAIL_FROM_MALFORMED` error message will only be shown
if the `$additional_headers` parameter is passed to `mail`, which is
not the case for this test. Instead we have to expect `BAD_MSG_RPATH`.
Stanislav Malyshev [Fri, 29 Mar 2019 05:57:07 +0000 (22:57 -0700)]
Add mbstring.regex_stack_limit to php.ini-*
Stanislav Malyshev [Thu, 28 Mar 2019 07:37:36 +0000 (00:37 -0700)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Validate subject encoding in mb_split and mb_ereg_match
Validate pattern against mbregex encoding
SQLite3: add DEFENSIVE config for SQLite >= 3.26.0 as a mitigation strategy against potential security flaws
Stanislav Malyshev [Thu, 28 Mar 2019 07:35:22 +0000 (00:35 -0700)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Validate subject encoding in mb_split and mb_ereg_match
Validate pattern against mbregex encoding
SQLite3: add DEFENSIVE config for SQLite >= 3.26.0 as a mitigation strategy against potential security flaws
Yasuo Ohgaki [Thu, 1 Sep 2016 10:15:32 +0000 (19:15 +0900)]
Implement RF bug #72777 - ensure stack limits on mbstring functions.
The patch creates new config: mbstring.regex_stack_limit, which
defaults to 100000.