]>
granicus.if.org Git - php/log
Peter Kokot [Sat, 13 Oct 2018 13:23:48 +0000 (15:23 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix failing tests/lang due to whitespace
Peter Kokot [Sat, 13 Oct 2018 13:23:35 +0000 (15:23 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix failing tests/lang due to whitespace
Peter Kokot [Sat, 13 Oct 2018 13:22:49 +0000 (15:22 +0200)]
Fix failing tests/lang due to whitespace
Peter Kokot [Sat, 13 Oct 2018 13:16:15 +0000 (15:16 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix failing ext/zlib/tests due to whitespace
Peter Kokot [Sat, 13 Oct 2018 13:15:39 +0000 (15:15 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix failing ext/zlib/tests due to whitespace
Peter Kokot [Sat, 13 Oct 2018 13:15:26 +0000 (15:15 +0200)]
Fix failing ext/zlib/tests due to whitespace
Peter Kokot [Sat, 13 Oct 2018 12:16:33 +0000 (14:16 +0200)]
Trim trailing whitespace in source code files
Peter Kokot [Sat, 13 Oct 2018 12:15:15 +0000 (14:15 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Trim trailing whitespace in source code files
Trim trailing whitespace in source code files
Peter Kokot [Sat, 13 Oct 2018 12:14:50 +0000 (14:14 +0200)]
Trim trailing whitespace in source code files
Peter Kokot [Sat, 13 Oct 2018 12:13:37 +0000 (14:13 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Trim trailing whitespace in source code files
Peter Kokot [Sat, 13 Oct 2018 12:12:55 +0000 (14:12 +0200)]
Trim trailing whitespace in source code files
Peter Kokot [Sat, 13 Oct 2018 09:23:20 +0000 (11:23 +0200)]
Convert CRLF line endings to LF
This patch simplifies line endings tracked in the Git repository and
syncs them to all include the LF style instead of the CRLF files.
Newline characters:
- LF (\n) (*nix and Mac)
- CRLF (\r\n) (Windows)
- CR (\r) (old Mac, obsolete)
To see which line endings are in the index and in the working copy the
following command can be used:
`git ls-files --eol`
Git additionally provides `.gitattributes` file to specify if some files
need to have specific line endings on all platforms (either CRLF or LF).
Changed files shouldn't cause issues on modern Windows platforms because
also Git can do output conversion is core.autocrlf=true is set on
Windows and use CRLF newlines in all files in the working tree.
Unless CRLF files are tracked specifically, Git by default tracks all
files in the index using LF newlines.
Peter Kokot [Sat, 13 Oct 2018 09:22:47 +0000 (11:22 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Convert CRLF line endings to LF
Convert CRLF line endings to LF
Peter Kokot [Sat, 13 Oct 2018 09:22:30 +0000 (11:22 +0200)]
Convert CRLF line endings to LF
This patch simplifies line endings tracked in the Git repository and
syncs them to all include the LF style instead of the CRLF files.
Newline characters:
- LF (\n) (*nix and Mac)
- CRLF (\r\n) (Windows)
- CR (\r) (old Mac, obsolete)
To see which line endings are in the index and in the working copy the
following command can be used:
`git ls-files --eol`
Git additionally provides `.gitattributes` file to specify if some files
need to have specific line endings on all platforms (either CRLF or LF).
Changed files shouldn't cause issues on modern Windows platforms because
also Git can do output conversion is core.autocrlf=true is set on
Windows and use CRLF newlines in all files in the working tree.
Unless CRLF files are tracked specifically, Git by default tracks all
files in the index using LF newlines.
Peter Kokot [Sat, 13 Oct 2018 09:22:02 +0000 (11:22 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Convert CRLF line endings to LF
Peter Kokot [Sat, 13 Oct 2018 09:21:27 +0000 (11:21 +0200)]
Convert CRLF line endings to LF
This patch simplifies line endings tracked in the Git repository and
syncs them to all include the LF style instead of the CRLF files.
Newline characters:
- LF (\n) (*nix and Mac)
- CRLF (\r\n) (Windows)
- CR (\r) (old Mac, obsolete)
To see which line endings are in the index and in the working copy the
following command can be used:
`git ls-files --eol`
Git additionally provides `.gitattributes` file to specify if some files
need to have specific line endings on all platforms (either CRLF or LF).
Changed files shouldn't cause issues on modern Windows platforms because
also Git can do output conversion is core.autocrlf=true is set on
Windows and use CRLF newlines in all files in the working tree.
Unless CRLF files are tracked specifically, Git by default tracks all
files in the index using LF newlines.
Derick Rethans [Fri, 12 Oct 2018 10:50:36 +0000 (11:50 +0100)]
Upgrade timelib to 2018.01RC1, to fix bug #77007
Derick Rethans [Fri, 12 Oct 2018 10:41:24 +0000 (11:41 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
Derick Rethans [Fri, 12 Oct 2018 10:41:05 +0000 (11:41 +0100)]
Upgrade timelib to 2017.08, to fix bug #77007
Derick Rethans [Thu, 11 Oct 2018 16:00:42 +0000 (17:00 +0100)]
Update news with further fixed bugs due to timelib upgrade
Nikita Popov [Wed, 10 Oct 2018 12:57:46 +0000 (14:57 +0200)]
Fixed bug #76991
Back up exceptions while the scan-ahead loop, to avoid an early
bail out.
Peter Kokot [Tue, 9 Oct 2018 19:16:17 +0000 (21:16 +0200)]
[ci skip] Update UPGRADING about Autoconf version
Peter Kokot [Tue, 9 Oct 2018 19:06:10 +0000 (21:06 +0200)]
Bump minimum Autoconf requirement to 2.68
This patch syncs and bumps the minimum required version of Autoconf for
the `phpize.m4` script and the main `configure.ac` from previously mixed
2.64 and 2.59 to 2.68.
At the time of this writing Autoconf 2.63 is still the version on
Centos 6, however by the PHP 7.3 release current systems out there
should all have pretty much updated Autoconf versions to 2.64+ at
least. Centos 7 already has Autoconf 2.69, for example.
This provides more options to update and get current with the *nix
build system and also avoids broken builds in certain cases as pointed
out in the relevant discussion [1].
Additionally, phpize also already provides the `AX_CHECK_COMPILE_FLAG`
Autoconf Archive m4 file that has Autoconf 2.64 minimum requirement.
Autoconf 2.68 was released in 2010, 8 years ago, relative to this patch.
[1] https://github.com/php/php-src/pull/3562
Christoph M. Becker [Tue, 9 Oct 2018 14:08:28 +0000 (16:08 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #30875: xml_parse_into_struct() does not resolve entities
Christoph M. Becker [Tue, 9 Oct 2018 14:05:55 +0000 (16:05 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix #30875: xml_parse_into_struct() does not resolve entities
Christoph M. Becker [Tue, 9 Oct 2018 14:04:43 +0000 (16:04 +0200)]
Fix #30875: xml_parse_into_struct() does not resolve entities
Setting up an empty default handler is not only useless, but actually
harmful, since internal entity-references are not resolved anymore.
From the libexpat docs[1]:
| Setting the handler with this call has the side effect of
| turning off expansion of references to internally defined general
| entities. Instead these references are passed to the default
| handler.
[1] <https://www.xml.com/pub/1999/09/expat/reference.html#setdefhandler>
Christoph M. Becker [Tue, 9 Oct 2018 11:30:59 +0000 (13:30 +0200)]
[ci skip] Update NEWS
Derick Rethans [Tue, 9 Oct 2018 10:37:53 +0000 (11:37 +0100)]
Fixed tests
Derick Rethans [Tue, 9 Oct 2018 10:06:58 +0000 (11:06 +0100)]
Added test case for bug #75577
Derick Rethans [Tue, 9 Oct 2018 10:06:42 +0000 (11:06 +0100)]
Fixed bug #75577: DateTime::createFromFormat does not accept 'v' format specifier, by updating timelib to 2018.01alpha2
Christoph M. Becker [Tue, 9 Oct 2018 09:57:22 +0000 (11:57 +0200)]
[ci skip] Update NEWS wrt. php-7.3.0RC3 tagging
Pierrick Charron [Tue, 9 Oct 2018 05:26:55 +0000 (01:26 -0400)]
Merge branch 'PHP-7.2' into PHP-7.3
Pierrick Charron [Tue, 9 Oct 2018 05:20:01 +0000 (01:20 -0400)]
Merge branch 'PHP-7.1' into PHP-7.2
Pierrick Charron [Sat, 6 Oct 2018 14:42:05 +0000 (10:42 -0400)]
Fixed bug #76965 INI_SCANNER_RAW doesn't strip trailing whitespace
Pierrick Charron [Mon, 8 Oct 2018 14:15:20 +0000 (10:15 -0400)]
Add constants from curl 7.56 to 7.61
Nikita Popov [Mon, 8 Oct 2018 11:14:54 +0000 (13:14 +0200)]
Fix ref ID handling when serializing $GLOBALS
This was already broken previously, but in PHP 7.3 stricter
validation during unserialization made this into an error.
Christoph M. Becker [Mon, 8 Oct 2018 10:46:41 +0000 (12:46 +0200)]
[ci skip] Note the required configure changes for bundled libzip
Christoph M. Becker [Mon, 8 Oct 2018 10:32:21 +0000 (12:32 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #76954: apache_response_headers removes last character from header name
Christoph M. Becker [Mon, 8 Oct 2018 10:30:14 +0000 (12:30 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix #76954: apache_response_headers removes last character from header name
stodorovic [Tue, 2 Oct 2018 06:36:29 +0000 (08:36 +0200)]
Fix #76954: apache_response_headers removes last character from header name
Christoph M. Becker [Mon, 8 Oct 2018 09:51:54 +0000 (11:51 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #75851: Year component overflow with date formats "c", "o", "r" and "y"
Christoph M. Becker [Mon, 8 Oct 2018 09:49:56 +0000 (11:49 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix #75851: Year component overflow with date formats "c", "o", "r" and "y"
Adam Saponara [Wed, 11 Jul 2018 03:55:13 +0000 (23:55 -0400)]
Fix #75851: Year component overflow with date formats "c", "o", "r" and "y"
Pedro Magalhães [Sat, 6 Oct 2018 14:58:51 +0000 (15:58 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Remove unstable dns tests
Pedro Magalhães [Sat, 6 Oct 2018 14:58:32 +0000 (15:58 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Remove unstable dns tests
Pedro Magalhães [Fri, 5 Oct 2018 15:24:55 +0000 (16:24 +0100)]
Remove unstable dns tests
Pedro Magalhães [Sat, 6 Oct 2018 14:46:11 +0000 (15:46 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #76888 - Remove unstable test
Pedro Magalhães [Fri, 5 Oct 2018 00:09:39 +0000 (01:09 +0100)]
Fix #76888 - Remove unstable test
Michael Moravec [Fri, 5 Oct 2018 22:07:41 +0000 (00:07 +0200)]
Fix bug #76979: define() error message does not mention resources as valid values
Christoph M. Becker [Sat, 6 Oct 2018 09:05:41 +0000 (11:05 +0200)]
Fix #76975: preg_match difference between 7.3 and < 7.3 - II
[ci skip]
Anatol Belski [Fri, 5 Oct 2018 21:01:03 +0000 (23:01 +0200)]
[ci skip] Update NEWS
Anatol Belski [Fri, 5 Oct 2018 21:00:24 +0000 (23:00 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
[ci skip] Update NEWS
[ci skip] Update NEWS
Add test for bug #76942
Anatol Belski [Fri, 5 Oct 2018 20:59:55 +0000 (22:59 +0200)]
[ci skip] Update NEWS
Anatol Belski [Fri, 5 Oct 2018 20:57:45 +0000 (22:57 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
[ci skip] Update NEWS
Add test for bug #76942
Anatol Belski [Fri, 5 Oct 2018 20:57:27 +0000 (22:57 +0200)]
[ci skip] Update NEWS
Anatol Belski [Fri, 5 Oct 2018 20:51:58 +0000 (22:51 +0200)]
Add test for bug #76942
Anatol Belski [Fri, 5 Oct 2018 20:53:11 +0000 (22:53 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Add test for bug #76942
Fixed Bug #76942 U_ARGUMENT_TYPE_MISMATCH
Anatol Belski [Fri, 5 Oct 2018 20:52:53 +0000 (22:52 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Add test for bug #76942
Fixed Bug #76942 U_ARGUMENT_TYPE_MISMATCH
Anatol Belski [Fri, 5 Oct 2018 20:51:58 +0000 (22:51 +0200)]
Add test for bug #76942
Anatol Belski [Fri, 5 Oct 2018 20:50:34 +0000 (22:50 +0200)]
Fixed Bug #76942 U_ARGUMENT_TYPE_MISMATCH
ref bug #74484
twosee [Mon, 1 Oct 2018 11:22:25 +0000 (19:22 +0800)]
Optimize MySQL statement execute without parameters
Nikita Popov [Fri, 5 Oct 2018 16:41:42 +0000 (18:41 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Fri, 5 Oct 2018 16:41:16 +0000 (18:41 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
Manuel Mausz [Thu, 4 Oct 2018 16:40:26 +0000 (18:40 +0200)]
Fix #76972: FTP data truncation due to forceful ssl socket shutdown
Do a correct bidirectional shutdown instead
Remi Collet [Thu, 4 Oct 2018 09:45:35 +0000 (11:45 +0200)]
Allow to disable pcre.jit when system library is used
as it is for now broken on some arch (s390x...)
Pierrick Charron [Thu, 4 Oct 2018 01:18:47 +0000 (21:18 -0400)]
Update NEWS [ci skip]
Pierrick Charron [Wed, 3 Oct 2018 23:43:59 +0000 (19:43 -0400)]
Add constants from curl 7.50 to 7.55
Christoph M. Becker [Wed, 3 Oct 2018 22:30:10 +0000 (00:30 +0200)]
libzip has been unbundled in master only
Cf. <https://github.com/php/php-src/pull/3532>.
Anatol Belski [Wed, 3 Oct 2018 16:54:08 +0000 (18:54 +0200)]
Update NEWS [ci skip]
Anatol Belski [Wed, 3 Oct 2018 16:51:48 +0000 (18:51 +0200)]
Update NEWS [ci skip]
Anatol Belski [Wed, 3 Oct 2018 16:50:24 +0000 (18:50 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Update NEWS [ci skip]
Update NEWS [ci skip]
Anatol Belski [Wed, 3 Oct 2018 16:49:52 +0000 (18:49 +0200)]
Update NEWS [ci skip]
Anatol Belski [Wed, 3 Oct 2018 16:49:13 +0000 (18:49 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Update NEWS [ci skip]
Anatol Belski [Wed, 3 Oct 2018 16:48:40 +0000 (18:48 +0200)]
Update NEWS [ci skip]
Anatol Belski [Wed, 3 Oct 2018 12:35:38 +0000 (14:35 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Avoid code duplication and don't miss env restore
Anatol Belski [Wed, 3 Oct 2018 12:34:08 +0000 (14:34 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Avoid code duplication and don't miss env restore
Anatol Belski [Wed, 3 Oct 2018 12:32:52 +0000 (14:32 +0200)]
Avoid code duplication and don't miss env restore
Remi Collet [Wed, 3 Oct 2018 10:59:31 +0000 (12:59 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
bump zip extension version
Remi Collet [Wed, 3 Oct 2018 10:59:01 +0000 (12:59 +0200)]
bump zip extension version
Anatol Belski [Wed, 3 Oct 2018 10:15:15 +0000 (12:15 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fixed bug #76948 Failed shutdown/reboot or end session in Windows
Anatol Belski [Wed, 3 Oct 2018 10:13:22 +0000 (12:13 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed bug #76948 Failed shutdown/reboot or end session in Windows
Anatol Belski [Wed, 3 Oct 2018 10:11:43 +0000 (12:11 +0200)]
Fixed bug #76948 Failed shutdown/reboot or end session in Windows
Nikita Popov [Wed, 3 Oct 2018 08:50:27 +0000 (10:50 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Wed, 3 Oct 2018 08:50:16 +0000 (10:50 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
Nikita Popov [Wed, 3 Oct 2018 08:48:42 +0000 (10:48 +0200)]
Reflection: Copy invoke function also in the variadic case
It doesn't matter how the parameters are provided, we always have
to copy the trampoline invoke function.
Anatol Belski [Tue, 2 Oct 2018 22:15:43 +0000 (00:15 +0200)]
Fixed bug #76947 file_put_contents() blocks the directory of the file (__DIR__)
The condition was wrong. The target buffer size only matters, when some
output is going to be copied into it.
Nikita Popov [Tue, 2 Oct 2018 16:20:15 +0000 (18:20 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Tue, 2 Oct 2018 16:19:53 +0000 (18:19 +0200)]
Fixed bug #66430
Nikita Popov [Tue, 2 Oct 2018 15:48:56 +0000 (17:48 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Tue, 2 Oct 2018 15:47:07 +0000 (17:47 +0200)]
Fixed bug #76936
Nikita Popov [Tue, 2 Oct 2018 14:13:51 +0000 (16:13 +0200)]
Fixed bug #76958
Nikita Popov [Tue, 2 Oct 2018 14:07:22 +0000 (16:07 +0200)]
Don't fall back to vtbl_pass if no matching vtbl found
If we don't know how to convert between two encodings, make sure
we error instead of ignoring the issue.
Explicitly use vtbl_pass if we are round-tripping wchar->wchar or
8bit->8bit. Fingers crossed that nothing else relies on the
vtbl_pass fallback...
Nikita Popov [Sun, 30 Sep 2018 18:07:58 +0000 (20:07 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Sun, 30 Sep 2018 18:07:44 +0000 (20:07 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
Nikita Popov [Sun, 30 Sep 2018 18:05:30 +0000 (20:05 +0200)]
Fixed bug #75479
Wrap the zend_signal_init() call, so the hook arguments line up.
Nikita Popov [Sat, 29 Sep 2018 19:20:01 +0000 (21:20 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
James Titcumb [Sat, 29 Sep 2018 17:14:53 +0000 (19:14 +0200)]
Fix reflection arguments for sodium_memzero function
Nikita Popov [Sat, 29 Sep 2018 12:15:58 +0000 (14:15 +0200)]
Fixed bug #72635
This seems to be a simple oversight, where we did not enable
exceptions. Other constexpr conditions already throw, so there is
no particular reason to stick to a fatal error here.
Nikita Popov [Fri, 28 Sep 2018 17:17:43 +0000 (19:17 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Fri, 28 Sep 2018 17:16:03 +0000 (19:16 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2