]>
granicus.if.org Git - php/log
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.
Joe Watkins [Thu, 28 Mar 2019 06:35:15 +0000 (07:35 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
fix build: readline support must be disabled by default in phpdbg
Joe Watkins [Thu, 28 Mar 2019 06:34:45 +0000 (07:34 +0100)]
fix build: readline support must be disabled by default in phpdbg
Nikita Popov [Mon, 11 Feb 2019 11:31:59 +0000 (12:31 +0100)]
Validate subject encoding in mb_split and mb_ereg_match
We were already validating the subject encoding in most functions,
but not these two.
Nikita Popov [Mon, 11 Feb 2019 11:10:40 +0000 (12:10 +0100)]
Validate pattern against mbregex encoding
Oniguruma does not consistently perform this validation itself (at least
on older versions), so make sure we check pattern encoding validity on the
PHP side.
Joe Watkins [Wed, 27 Mar 2019 09:38:45 +0000 (10:38 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Consider phpdbg as cli
Samuele Kaplun [Tue, 18 Sep 2018 12:49:36 +0000 (14:49 +0200)]
Consider phpdbg as cli
* When configuring extensions, considers the PHPDBG SAPI as CLI thus
allowing e.g. to have the pcntl extension available within PHPDBG.
Signed-off-by: Samuele Kaplun <kaplun@protonmail.com>
Joe Watkins [Wed, 27 Mar 2019 09:03:50 +0000 (10:03 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #77805 phpdbg build fails when readline is shared
Joe Watkins [Wed, 27 Mar 2019 08:58:40 +0000 (09:58 +0100)]
Fix #77805 phpdbg build fails when readline is shared
Joe Watkins [Tue, 26 Mar 2019 23:02:31 +0000 (00:02 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
more work on phpdbg conditional breaks
Joe Watkins [Tue, 26 Mar 2019 23:02:15 +0000 (00:02 +0100)]
more work on phpdbg conditional breaks
Joe Watkins [Tue, 26 Mar 2019 22:06:00 +0000 (23:06 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #77800 phpdbg segfaults on conditional breakpoints
Joe Watkins [Tue, 26 Mar 2019 22:05:06 +0000 (23:05 +0100)]
Fix #77800 phpdbg segfaults on conditional breakpoints
Peter Kokot [Mon, 25 Mar 2019 20:57:20 +0000 (21:57 +0100)]
[ci skip] Update NEWS
Peter Kokot [Mon, 25 Mar 2019 20:56:39 +0000 (21:56 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
[ci skip] Update NEWS
Fix #77794: Incorrect Date header format in built-in server
Peter Kokot [Mon, 25 Mar 2019 20:46:41 +0000 (21:46 +0100)]
[ci skip] Update NEWS
Niklas Keller [Sun, 24 Mar 2019 18:39:25 +0000 (19:39 +0100)]
Fix #77794: Incorrect Date header format in built-in server
- Fix the date format to be compliant with https://tools.ietf.org/html/rfc7231#section-7.1.1.2
- Fix date format length and use GMT time
- Previously, local time was used instead of GMT.
- Remove extra whitespace
- Simplify string appends in php_cli_server.c
Nikita Popov [Mon, 25 Mar 2019 16:45:03 +0000 (17:45 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
Vlad Temian [Tue, 19 Mar 2019 16:36:45 +0000 (18:36 +0200)]
Fix bug #77680: Correctly implement recursive mkdir on FTP stream
If the root directory was missing, an extra CWD without arguments was
made. Also, the MKD contained an empty string.
Now the CWD will use / and MKDs will be issued starting from the root
directory.
Nikita Popov [Mon, 25 Mar 2019 16:33:17 +0000 (17:33 +0100)]
Fixed bug #77793
By making sure that we always first increment the refcount of the
new value before we destroy the old one.
Nikita Popov [Mon, 25 Mar 2019 15:42:48 +0000 (16:42 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Mon, 25 Mar 2019 15:41:21 +0000 (16:41 +0100)]
Fixed bug #72175
Make sure we don't close the connection we're trying to reuse...
Joe Watkins [Sat, 23 Mar 2019 08:48:04 +0000 (09:48 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
fix bug #76801: phpdbg too many open files error
Alessandro Chitolina [Tue, 19 Mar 2019 16:34:34 +0000 (17:34 +0100)]
fix bug #76801: phpdbg too many open files error
Remi Collet [Fri, 22 Mar 2019 14:31:36 +0000 (15:31 +0100)]
ensure pcre.jit=1 for this test
Remi Collet [Fri, 22 Mar 2019 14:01:49 +0000 (15:01 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
ensure pcre.jit=1 for these tests
Remi Collet [Fri, 22 Mar 2019 14:00:31 +0000 (15:00 +0100)]
ensure pcre.jit=1 for these tests
Nikita Popov [Fri, 22 Mar 2019 12:07:00 +0000 (13:07 +0100)]
Fixed bug #77773
Nikita Popov [Fri, 22 Mar 2019 11:40:21 +0000 (12:40 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Fri, 22 Mar 2019 11:39:27 +0000 (12:39 +0100)]
Fixed bug #77772
Remi Collet [Thu, 21 Mar 2019 08:19:42 +0000 (09:19 +0100)]
fix test
Remi Collet [Wed, 20 Mar 2019 13:08:18 +0000 (14:08 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix tests after fix for #76717
Remi Collet [Wed, 20 Mar 2019 13:07:26 +0000 (14:07 +0100)]
Fix tests after fix for #76717
Remi Collet [Wed, 20 Mar 2019 10:55:06 +0000 (11:55 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
NEWS
Revert "Fix #77609: Tests from mailparse extension fails"
Remi Collet [Wed, 20 Mar 2019 10:54:49 +0000 (11:54 +0100)]
NEWS
Remi Collet [Wed, 20 Mar 2019 10:54:27 +0000 (11:54 +0100)]
Revert "Fix #77609: Tests from mailparse extension fails"
This reverts commit
3ead67239419632eecb83f0f101ead2021ee6c14 .
Sara Golemon [Tue, 19 Mar 2019 18:32:28 +0000 (14:32 -0400)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Bump versions for 7.2.18