]>
granicus.if.org Git - php/log
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
Sara Golemon [Tue, 19 Mar 2019 18:31:01 +0000 (14:31 -0400)]
Bump versions for 7.2.18
Remi Collet [Tue, 19 Mar 2019 15:27:57 +0000 (16:27 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
comment out sqlite3.defensive = 1 follow common practice, this is the default value
Remi Collet [Tue, 19 Mar 2019 15:26:26 +0000 (16:26 +0100)]
comment out sqlite3.defensive = 1
follow common practice, this is the default value
Christoph M. Becker [Tue, 19 Mar 2019 15:20:55 +0000 (16:20 +0100)]
Prepare main branch for PHP 7.3.5
Remi Collet [Tue, 19 Mar 2019 15:15:14 +0000 (16:15 +0100)]
fix test for upcoming pcre2 10.33
"group name ..." => "subpattern name ..."
Nikita Popov [Tue, 19 Mar 2019 12:57:39 +0000 (13:57 +0100)]
Fixed bug #76127
Per documentation, and consistent with other preg functions, we
should return false if an error occurred.
Nikita Popov [Tue, 19 Mar 2019 09:02:50 +0000 (10:02 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
Vlad Temian [Mon, 18 Mar 2019 16:35:24 +0000 (18:35 +0200)]
Fixed bug #77765
Set mode 40755 for directories, via FTP stream stat.
Because we already manage to CWD into the current directory,
we should set 40755 as mode, instead of 40644.
Nikita Popov [Tue, 19 Mar 2019 08:55:24 +0000 (09:55 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
Miriam Lauter [Mon, 18 Mar 2019 16:47:18 +0000 (12:47 -0400)]
Fix #77767: phpdbg break command help message shows incorrect aliases
Previously the aliases for at and del were listed as A and d
in the help message for break. This patch corrects the aliases
to be @ and ~ respectively.
Christoph M. Becker [Mon, 18 Mar 2019 19:07:38 +0000 (20:07 +0100)]
Fix order
Christoph M. Becker [Mon, 18 Mar 2019 18:22:51 +0000 (19:22 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #77578: Crash when php unload
Christoph M. Becker [Mon, 18 Mar 2019 17:47:34 +0000 (18:47 +0100)]
Fix #77578: Crash when php unload
Since we're putting `ITypeLib *`s into the hash, we're getting
`ITypeLib *`s back, not `ITypeLib **`s.
Christoph M. Becker [Mon, 18 Mar 2019 14:04:09 +0000 (15:04 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Add bison version check to configure
Christoph M. Becker [Mon, 18 Mar 2019 11:27:29 +0000 (12:27 +0100)]
Add bison version check to configure
Since we're already checking for the minimum required re2c version,
also checking for the minimum required bison version is sensible.
Xinchen Hui [Mon, 18 Mar 2019 11:30:11 +0000 (19:30 +0800)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Simplfy test case
Xinchen Hui [Mon, 18 Mar 2019 11:28:23 +0000 (19:28 +0800)]
Simplfy test case
(I was working on the same bug while nikic committed the similar fix
Nikita Popov [Mon, 18 Mar 2019 11:16:12 +0000 (12:16 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Mon, 18 Mar 2019 11:14:33 +0000 (12:14 +0100)]
Make test independent of icu version
We don't really care about the actual output here, just that it
doesn't fail.
Nikita Popov [Mon, 18 Mar 2019 10:39:58 +0000 (11:39 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Mon, 18 Mar 2019 10:39:16 +0000 (11:39 +0100)]
Allow DateTimeImmutable in datefmt_format_object()
As pointed out in a comment on bug #65683.
Nikita Popov [Mon, 18 Mar 2019 10:07:27 +0000 (11:07 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Mon, 18 Mar 2019 10:04:25 +0000 (11:04 +0100)]
Partial fix for bug #77751
This avoids the segfault, but it will not make writing to the
SplFileObject during output shutdown work.
Nikita Popov [Mon, 18 Mar 2019 09:50:39 +0000 (10:50 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Mon, 18 Mar 2019 09:49:53 +0000 (10:49 +0100)]
Fixed bug #77743
Christoph M. Becker [Mon, 18 Mar 2019 09:04:18 +0000 (10:04 +0100)]
Fix #76956: Wrong value for 'syslog.filter' documented in php.ini
Nikita Popov [Mon, 18 Mar 2019 09:12:15 +0000 (10:12 +0100)]
Remove x86 bit test optimization
This is undefined behavior and we cannot rely on it. Additionally it
breaks builds using undefined behavior sanitizers.
Nikita Popov [Mon, 18 Mar 2019 09:11:25 +0000 (10:11 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Mon, 18 Mar 2019 09:11:00 +0000 (10:11 +0100)]
Fix unused variable warning
Nikita Popov [Mon, 18 Mar 2019 09:04:29 +0000 (10:04 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
twosee [Sat, 16 Mar 2019 05:21:48 +0000 (13:21 +0800)]
Don't disable object slot reuse while running shutdown functions
We only need to do this once we're running destructors. The current
approach interferes with some event loop code that runs everything
inside a shutdown function.
Derick Rethans [Sun, 17 Mar 2019 18:55:53 +0000 (14:55 -0400)]
Merge branch 'PHP-7.2' into PHP-7.3
Derick Rethans [Sun, 17 Mar 2019 18:53:56 +0000 (14:53 -0400)]
Fixed 7.2 compat issue
Derick Rethans [Sun, 17 Mar 2019 18:38:04 +0000 (14:38 -0400)]
Merge branch 'PHP-7.2' into PHP-7.3
Derick Rethans [Sun, 17 Mar 2019 18:37:52 +0000 (14:37 -0400)]
Merge branch 'pr/3888' into PHP-7.2
Ignace Nyamagana Butera [Tue, 26 Feb 2019 20:21:46 +0000 (21:21 +0100)]
Fixed bug #75113: Added DatePeriod::getRecurrences() method.
Pedro Magalhães [Fri, 15 Mar 2019 18:12:55 +0000 (18:12 +0000)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Added test for #77535 fix
Pedro Magalhães [Fri, 15 Mar 2019 18:11:51 +0000 (18:11 +0000)]
Added test for #77535 fix
Nikita Popov [Fri, 15 Mar 2019 16:07:48 +0000 (17:07 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Fri, 15 Mar 2019 16:06:34 +0000 (17:06 +0100)]
Don't immediately destroy curl pushfunction
Xinchen Hui [Fri, 15 Mar 2019 08:58:08 +0000 (16:58 +0800)]
Fixed bug #77697 (Crash on Big_Endian platform)
Nikita Popov [Thu, 14 Mar 2019 16:25:44 +0000 (17:25 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Thu, 14 Mar 2019 16:24:50 +0000 (17:24 +0100)]
Fixed bug #77742
By avoiding integer overflow in the implementation entirely. The
multiplication was already explicitly checked for overflow, so also
add a check for the addition and remove the overflow checks after
the calculation.
Xinchen Hui [Thu, 14 Mar 2019 08:47:16 +0000 (16:47 +0800)]
updated NEWS
Xinchen Hui [Thu, 14 Mar 2019 08:46:46 +0000 (16:46 +0800)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fixed bug #77738 (Nullptr deref in zend_compile_expr)
Xinchen Hui [Thu, 14 Mar 2019 08:46:04 +0000 (16:46 +0800)]
Fixed bug #77738 (Nullptr deref in zend_compile_expr)
Nikita Popov [Tue, 12 Mar 2019 08:57:51 +0000 (09:57 +0100)]
Fixed bug #77722
Anatol Belski [Mon, 11 Mar 2019 19:59:23 +0000 (20:59 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Die hard if mc.exe or mt.exe not found
Anatol Belski [Mon, 11 Mar 2019 19:41:45 +0000 (20:41 +0100)]
Die hard if mc.exe or mt.exe not found
Even configure would pass, that producess quite subtle build errors
which are better to avoid at configure stage already.
Christoph M. Becker [Mon, 11 Mar 2019 15:28:46 +0000 (16:28 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
SQLite3: add DEFENSIVE config for SQLite >= 3.26.0 as a mitigation strategy against potential security flaws
bohwaz [Sun, 16 Dec 2018 21:52:37 +0000 (22:52 +0100)]
SQLite3: add DEFENSIVE config for SQLite >= 3.26.0 as a mitigation strategy against potential security flaws
Nikita Popov [Mon, 11 Mar 2019 14:36:16 +0000 (15:36 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Mon, 11 Mar 2019 14:35:02 +0000 (15:35 +0100)]
Fixed bug #76717
Print INT_MIN as -INT_MAX-1 to avoid it getting parsed as a float
literal due to integer overflow.
Jakub Zelenka [Sun, 10 Mar 2019 16:36:13 +0000 (16:36 +0000)]
Speed up TLS wrapper test for min and max versions
Jakub Zelenka [Sun, 10 Mar 2019 16:34:58 +0000 (16:34 +0000)]
Merge branch 'PHP-7.2' into PHP-7.3
Jakub Zelenka [Sun, 10 Mar 2019 16:23:44 +0000 (16:23 +0000)]
Speed up TLS wrapper tests when SSLv3 disabled
If SSLv3 is disabled in OpenSSL, then sslv3 is not available so the accept
times out. This commit removes the extra accept if SSLv3 is disabled.
Anatol Belski [Fri, 8 Mar 2019 20:55:15 +0000 (21:55 +0100)]
Update libmagic.patch [skip ci]
Fabien Villepinte [Fri, 8 Mar 2019 11:43:37 +0000 (12:43 +0100)]
Fix typo in libmagic version
Anatol Belski [Fri, 8 Mar 2019 19:32:15 +0000 (20:32 +0100)]
Fixed bug #77576 pull the libmagic implementation of gmtime_r
PHP already has all the checks to handle the *_r function variants.
Thus, reusing it to get right symbols.
Anatol Belski [Fri, 8 Mar 2019 14:55:34 +0000 (15:55 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Sync with behavior change in OpenSSL 1.1.1b
fix news
bump versions after release
Anatol Belski [Fri, 8 Mar 2019 14:54:27 +0000 (15:54 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Sync with behavior change in OpenSSL 1.1.1b
fix news
bump versions after release
Anatol Belski [Thu, 28 Feb 2019 11:48:47 +0000 (12:48 +0100)]
Sync with behavior change in OpenSSL 1.1.1b
A behavior change in revealed by some openssl_decrypt() based test,
where an encrypt API is used with a decrypt context. The EVP_Cipher*
functions will automatically choose the right operation depending on the
context passed.
(cherry picked from commit
19a44ffb7be91344550fa700830b8e62a73031ba )
Dmitry Stogov [Thu, 7 Mar 2019 10:59:18 +0000 (13:59 +0300)]
ws
Dmitry Stogov [Thu, 7 Mar 2019 10:33:19 +0000 (13:33 +0300)]
Fixed bug #77345 (Stack Overflow caused by circular reference in garbage collection)
Peter Kokot [Thu, 7 Mar 2019 00:05:22 +0000 (01:05 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Update editorconfig
Peter Kokot [Sun, 17 Feb 2019 13:21:58 +0000 (14:21 +0100)]
Update editorconfig
Changes:
- New property max_line_length
- COMMIT_EDITMSG file added when writing commit messages
- Markdown files can have trimmed trailing whitespace also to simplify
settings.
- https link used to EditorConfig page.
- Added also *.y, *.cpp, and *.inc files
- The tab_width moved to a new all files section
Christoph M. Becker [Tue, 5 Mar 2019 23:35:37 +0000 (00:35 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #77700: Writing truecolor images as GIF ignores interlace flag
Christoph M. Becker [Tue, 5 Mar 2019 23:27:16 +0000 (00:27 +0100)]
Fix #77700: Writing truecolor images as GIF ignores interlace flag
We revert the interlace flag related part of commit
ff2822a [1], since
contrary to the transparent color, the interlace flag is not retained
by `gdImageCreatePaletteFromTrueColor()`. This also matches upstream
libgd.
[1] <http://git.php.net/?p=php-src.git;a=commit;h=
ff2822a82b740edb8ccf307f080bae188c200fb9 >
Joe Watkins [Tue, 5 Mar 2019 19:50:07 +0000 (20:50 +0100)]
fix news
Joe Watkins [Tue, 5 Mar 2019 17:28:47 +0000 (18:28 +0100)]
bump versions after release
Remi Collet [Tue, 5 Mar 2019 06:32:54 +0000 (07:32 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
add NEWS entry
Remi Collet [Tue, 5 Mar 2019 06:32:24 +0000 (07:32 +0100)]
add NEWS entry
Christoph M. Becker [Mon, 4 Mar 2019 18:50:41 +0000 (19:50 +0100)]
Update NEWS
Stanislav Malyshev [Mon, 4 Mar 2019 17:18:22 +0000 (09:18 -0800)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix bug #77630 - safer rename() procedure
Stanislav Malyshev [Mon, 4 Mar 2019 17:17:14 +0000 (09:17 -0800)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix bug #77630 - safer rename() procedure
Stanislav Malyshev [Sun, 3 Mar 2019 07:42:53 +0000 (23:42 -0800)]
Fix bug #77630 - safer rename() procedure
In order to rename safer, we do the following:
- set umask to 077 (unfortunately, not TS, so excluding ZTS)
- chown() first, to set proper group before allowing group access
- chmod() after, even if chown() fails
Anatol Belski [Mon, 4 Mar 2019 13:30:01 +0000 (14:30 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix test portability
Anatol Belski [Mon, 4 Mar 2019 13:28:47 +0000 (14:28 +0100)]
Fix test portability
Christoph M. Becker [Mon, 4 Mar 2019 12:47:14 +0000 (13:47 +0100)]
Update NEWS
Nikita Popov [Mon, 4 Mar 2019 12:16:01 +0000 (13:16 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Mon, 4 Mar 2019 12:11:12 +0000 (13:11 +0100)]
Fixed bug #77691
We cannot replace an op1_def opcode with an ASSIGN, if it also has
a used res_def. Usually this doesn't happen because the res_def use
can be eliminated first. The example is a case where operand replacement
on the res_def use fails.
Remi Collet [Mon, 4 Mar 2019 10:09:17 +0000 (11:09 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
add NEWS entries
Remi Collet [Mon, 4 Mar 2019 10:09:01 +0000 (11:09 +0100)]
add NEWS entries