]> granicus.if.org Git - php/log
php
6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Peter Kokot [Sun, 14 Oct 2018 17:43:39 +0000 (19:43 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Trim trailing whitespace in *.phpt

6 years agoTrim trailing whitespace in *.phpt
Peter Kokot [Sun, 14 Oct 2018 13:37:22 +0000 (15:37 +0200)]
Trim trailing whitespace in *.phpt

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Peter Kokot [Sun, 14 Oct 2018 11:41:09 +0000 (13:41 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix failing ext/session/tests due to final newlines

6 years agoFix failing ext/session/tests due to final newlines
Peter Kokot [Sun, 14 Oct 2018 11:38:28 +0000 (13:38 +0200)]
Fix failing ext/session/tests due to final newlines

6 years agoSync leading and final newlines in source code files
Peter Kokot [Sun, 14 Oct 2018 10:54:08 +0000 (12:54 +0200)]
Sync leading and final newlines in source code files

This patch adds missing newlines, trims multiple redundant final
newlines into a single one, and trims redundant leading newlines.

According to POSIX, a line is a sequence of zero or more non-' <newline>'
characters plus a terminating '<newline>' character. [1] Files should
normally have at least one final newline character.

C89 [2] and later standards [3] mention a final newline:
"A source file that is not empty shall end in a new-line character,
which shall not be immediately preceded by a backslash character."

Although it is not mandatory for all files to have a final newline
fixed, a more consistent and homogeneous approach brings less of commit
differences issues and a better development experience in certain text
editors and IDEs.

[1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_206
[2] https://port70.net/~nsz/c/c89/c89-draft.html#2.1.1.2
[3] https://port70.net/~nsz/c/c99/n1256.html#5.1.1.2

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Peter Kokot [Sun, 14 Oct 2018 10:52:38 +0000 (12:52 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Sync leading and final newlines in source code files

6 years agoSync leading and final newlines in source code files
Peter Kokot [Sun, 14 Oct 2018 10:51:01 +0000 (12:51 +0200)]
Sync leading and final newlines in source code files

This patch adds missing newlines, trims multiple redundant final
newlines into a single one, and trims redundant leading newlines.

According to POSIX, a line is a sequence of zero or more non-' <newline>'
characters plus a terminating '<newline>' character. [1] Files should
normally have at least one final newline character.

C89 [2] and later standards [3] mention a final newline:
"A source file that is not empty shall end in a new-line character,
which shall not be immediately preceded by a backslash character."

Although it is not mandatory for all files to have a final newline
fixed, a more consistent and homogeneous approach brings less of commit
differences issues and a better development experience in certain text
editors and IDEs.

[1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_206
[2] https://port70.net/~nsz/c/c89/c89-draft.html#2.1.1.2
[3] https://port70.net/~nsz/c/c99/n1256.html#5.1.1.2

6 years ago[ci skip] Update NEWS
Frank Denis [Sun, 14 Oct 2018 08:58:02 +0000 (10:58 +0200)]
[ci skip] Update NEWS

6 years agoext/sodium: sodium_pad(): do not copy any bytes if the string is empty
Frank Denis [Sun, 14 Oct 2018 08:43:21 +0000 (10:43 +0200)]
ext/sodium: sodium_pad(): do not copy any bytes if the string is empty

Spotted by San Zhang, thanks!

Backport from PECL libsodium-php 2.0.13

6 years agoext/sodium: Fix sodium_pad() with blocksize >= 256
Frank Denis [Sun, 14 Oct 2018 08:37:37 +0000 (10:37 +0200)]
ext/sodium: Fix sodium_pad() with blocksize >= 256

Backport from PECL libsodium-php 2.0.12

6 years agoext/sodium: Use a correct max output size for base64 decoding
Frank Denis [Sun, 14 Oct 2018 08:32:48 +0000 (10:32 +0200)]
ext/sodium: Use a correct max output size for base64 decoding

Also handle the case where the function is not available in test.

Backport from PECL libsodium-php 2.0.12

6 years agoext/sodium: Avoid shifts wider than 32 bits on size_t values
Frank Denis [Sun, 14 Oct 2018 08:21:29 +0000 (10:21 +0200)]
ext/sodium: Avoid shifts wider than 32 bits on size_t values

Backport from PECL libsodium-php 2.0.10

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
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

6 years agoFix 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

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
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

6 years agoFix 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

6 years agoTrim 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

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
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

6 years agoTrim 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

6 years agoConvert 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.

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
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

6 years agoConvert 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.

6 years agoUpgrade timelib to 2017.08, to fix bug #77007
Derick Rethans [Fri, 12 Oct 2018 10:41:05 +0000 (11:41 +0100)]
Upgrade timelib to 2017.08, to fix bug #77007

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
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

6 years agoFix #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>

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Pierrick Charron [Tue, 9 Oct 2018 05:20:01 +0000 (01:20 -0400)]
Merge branch 'PHP-7.1' into PHP-7.2

6 years agoFixed bug #76965 INI_SCANNER_RAW doesn't strip trailing whitespace
Pierrick Charron [Sat, 6 Oct 2018 14:42:05 +0000 (10:42 -0400)]
Fixed bug #76965 INI_SCANNER_RAW doesn't strip trailing whitespace

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
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

6 years agoFix #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

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
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"

6 years agoFix #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"

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
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

6 years agoRemove unstable dns tests
Pedro Magalhães [Fri, 5 Oct 2018 15:24:55 +0000 (16:24 +0100)]
Remove unstable dns tests

6 years agoFix #76888 - Remove unstable test
Pedro Magalhães [Fri, 5 Oct 2018 00:09:39 +0000 (01:09 +0100)]
Fix #76888 - Remove unstable test

6 years ago[ci skip] Update NEWS
Anatol Belski [Fri, 5 Oct 2018 20:59:55 +0000 (22:59 +0200)]
[ci skip] Update NEWS

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
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

6 years ago[ci skip] Update NEWS
Anatol Belski [Fri, 5 Oct 2018 20:57:27 +0000 (22:57 +0200)]
[ci skip] Update NEWS

6 years agoAdd test for bug #76942
Anatol Belski [Fri, 5 Oct 2018 20:51:58 +0000 (22:51 +0200)]
Add test for bug #76942

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
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

6 years agoAdd test for bug #76942
Anatol Belski [Fri, 5 Oct 2018 20:51:58 +0000 (22:51 +0200)]
Add test for bug #76942

6 years agoFixed Bug #76942 U_ARGUMENT_TYPE_MISMATCH
Anatol Belski [Fri, 5 Oct 2018 20:50:34 +0000 (22:50 +0200)]
Fixed Bug #76942 U_ARGUMENT_TYPE_MISMATCH

ref bug #74484

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Nikita Popov [Fri, 5 Oct 2018 16:41:16 +0000 (18:41 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

6 years agoFix #76972: FTP data truncation due to forceful ssl socket shutdown
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

6 years agoUpdate NEWS [ci skip]
Anatol Belski [Wed, 3 Oct 2018 16:49:52 +0000 (18:49 +0200)]
Update NEWS [ci skip]

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
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]

6 years agoUpdate NEWS [ci skip]
Anatol Belski [Wed, 3 Oct 2018 16:48:40 +0000 (18:48 +0200)]
Update NEWS [ci skip]

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
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

6 years agoAvoid 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

6 years agobump zip extension version
Remi Collet [Wed, 3 Oct 2018 10:59:01 +0000 (12:59 +0200)]
bump zip extension version

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
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

6 years agoFixed 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

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Nikita Popov [Wed, 3 Oct 2018 08:50:16 +0000 (10:50 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

6 years agoReflection: Copy invoke function also in the variadic case
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.

6 years agoFixed bug #66430
Nikita Popov [Tue, 2 Oct 2018 16:19:53 +0000 (18:19 +0200)]
Fixed bug #66430

6 years agoFixed bug #76936
Nikita Popov [Tue, 2 Oct 2018 15:47:07 +0000 (17:47 +0200)]
Fixed bug #76936

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Nikita Popov [Sun, 30 Sep 2018 18:07:44 +0000 (20:07 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

6 years agoFixed bug #75479
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.

6 years agoFix reflection arguments for sodium_memzero function
James Titcumb [Sat, 29 Sep 2018 17:14:53 +0000 (19:14 +0200)]
Fix reflection arguments for sodium_memzero function

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Nikita Popov [Fri, 28 Sep 2018 17:16:03 +0000 (19:16 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

6 years agoFixed bug #76946
Nikita Popov [Fri, 28 Sep 2018 17:14:47 +0000 (19:14 +0200)]
Fixed bug #76946

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Sara Golemon [Fri, 28 Sep 2018 15:32:41 +0000 (11:32 -0400)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Bump versions for 7.1.24-dev

6 years agoBump versions for 7.1.24-dev
Sara Golemon [Fri, 28 Sep 2018 15:31:22 +0000 (11:31 -0400)]
Bump versions for 7.1.24-dev

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Nikita Popov [Fri, 28 Sep 2018 11:41:06 +0000 (13:41 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

6 years agoFix test for release builds
Nikita Popov [Fri, 28 Sep 2018 11:39:43 +0000 (13:39 +0200)]
Fix test for release builds

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Nikita Popov [Fri, 28 Sep 2018 10:57:45 +0000 (12:57 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

6 years agoFixed bug #76846
Nikita Popov [Fri, 28 Sep 2018 10:56:47 +0000 (12:56 +0200)]
Fixed bug #76846

6 years agoBump version
Sara Golemon [Tue, 25 Sep 2018 20:37:41 +0000 (16:37 -0400)]
Bump version

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Sara Golemon [Tue, 25 Sep 2018 16:09:38 +0000 (12:09 -0400)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fixed bug #76918 Repeated parameter name in arg info

6 years agoFixed bug #76918 Repeated parameter name in arg info
Sara Golemon [Tue, 25 Sep 2018 15:18:24 +0000 (11:18 -0400)]
Fixed bug #76918 Repeated parameter name in arg info

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Christopher Jones [Mon, 24 Sep 2018 10:53:11 +0000 (20:53 +1000)]
Merge branch 'PHP-7.1' into PHP-7.2

6 years agoTerminate smart string correctly
Christopher Jones [Mon, 24 Sep 2018 10:52:58 +0000 (20:52 +1000)]
Terminate smart string correctly

This is related to Zend VM regression bug #75881.  The regression was fixed in the VM, so there is no user visible change from the termination correction.

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Christopher Jones [Mon, 24 Sep 2018 10:06:05 +0000 (20:06 +1000)]
Merge branch 'PHP-7.1' into PHP-7.2

6 years agoMake usable for PECL OCI8 release for PHP 7.x
Christopher Jones [Mon, 24 Sep 2018 10:05:54 +0000 (20:05 +1000)]
Make usable for PECL OCI8 release for PHP 7.x

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Christopher Jones [Mon, 24 Sep 2018 07:06:59 +0000 (17:06 +1000)]
Merge branch 'PHP-7.1' into PHP-7.2

6 years agoBackport master branch comment typo fix
Christopher Jones [Mon, 24 Sep 2018 07:06:29 +0000 (17:06 +1000)]
Backport master branch comment typo fix

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Christopher Jones [Mon, 24 Sep 2018 07:01:20 +0000 (17:01 +1000)]
Merge branch 'PHP-7.1' into PHP-7.2

6 years agoMake tests portable across PHP 7.x versions
Christopher Jones [Mon, 24 Sep 2018 07:01:13 +0000 (17:01 +1000)]
Make tests portable across PHP 7.x versions

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Christopher Jones [Mon, 24 Sep 2018 06:52:26 +0000 (16:52 +1000)]
Merge branch 'PHP-7.1' into PHP-7.2

6 years agoRemove $id from phpinfo as already done in PHP-7.3
Christopher Jones [Mon, 24 Sep 2018 06:52:17 +0000 (16:52 +1000)]
Remove $id from phpinfo as already done in PHP-7.3

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Christopher Jones [Mon, 24 Sep 2018 06:38:47 +0000 (16:38 +1000)]
Merge branch 'PHP-7.1' into PHP-7.2

6 years agoAnd strip trailing tabs too...
Christopher Jones [Mon, 24 Sep 2018 06:38:39 +0000 (16:38 +1000)]
And strip trailing tabs too...

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Christopher Jones [Mon, 24 Sep 2018 06:00:04 +0000 (16:00 +1000)]
Merge branch 'PHP-7.1' into PHP-7.2

6 years agoSync EXPECT usage with PHP-7.3
Christopher Jones [Mon, 24 Sep 2018 05:59:52 +0000 (15:59 +1000)]
Sync EXPECT usage with PHP-7.3

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Christopher Jones [Mon, 24 Sep 2018 03:27:35 +0000 (13:27 +1000)]
Merge branch 'PHP-7.1' into PHP-7.2

6 years agoRemove trailing whitespace to help keep branches in sync
Christopher Jones [Mon, 24 Sep 2018 03:27:27 +0000 (13:27 +1000)]
Remove trailing whitespace to help keep branches in sync

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Christopher Jones [Sun, 23 Sep 2018 23:56:53 +0000 (09:56 +1000)]
Merge branch 'PHP-7.1' into PHP-7.2

6 years agoRemove trailing whitespace to help keep branches in sycn
Christopher Jones [Sun, 23 Sep 2018 23:37:46 +0000 (09:37 +1000)]
Remove trailing whitespace to help keep branches in sycn

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Christoph M. Becker [Sat, 22 Sep 2018 13:30:08 +0000 (15:30 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix #66828: iconv_mime_encode Q-encoding longer than it should be

6 years agoFix #66828: iconv_mime_encode Q-encoding longer than it should be
Christoph M. Becker [Sat, 22 Sep 2018 13:20:20 +0000 (15:20 +0200)]
Fix #66828: iconv_mime_encode Q-encoding longer than it should be

Before the fix for bug 48289 has been applied, the algorithm to
construct a Q-encoded-word has been optimistic, i.e. try to encode as
many bytes that *may* fit in the remaining space, calculate the actual
length of the Q-encoded word, and if it's too long, try again with a
reduced size.  However, the fix for the mentioned bug replaced this by
a pessimistic algorithm, which always terminates[1] the for loop[2]
during the first iteration (which renders the following 3 lines as dead
code), and as such easily produces unnecessarily short encoded-words.
Instead the proper fix for the bug would have been to make sure that
`out_size` is always decremented, if the space isn't sufficient for the
encoded-word.

[1] <https://github.com/php/php-src/blob/php-7.3.0beta3/ext/iconv/iconv.c#L1421>
[2] <https://github.com/php/php-src/blob/php-7.3.0beta3/ext/iconv/iconv.c#L1360>

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Nikita Popov [Wed, 19 Sep 2018 10:31:46 +0000 (12:31 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

6 years agoFix getColumnMeta() test
Nikita Popov [Mon, 17 Sep 2018 14:36:05 +0000 (16:36 +0200)]
Fix getColumnMeta() test

Newer MySQL versions are stricter about invalid values. Three issues
are fixed:

* Don't use negative values with ZEROFILL. ZEROFILL implies UNSIGNED.
* Use a legal TIMESTAMP value. TIMESTAMP does not accept a Unix timestamp.
* Specify BIGINT values as strings, to avoid overflows.

This is a cherry-pick of d2dc0a32911c0e08986da799ce11e18c3fa5ca57 from master.

6 years agoFix intermittent failures in mysqli_stmt_bind_result_format.phpt
Nikita Popov [Wed, 19 Sep 2018 09:31:42 +0000 (11:31 +0200)]
Fix intermittent failures in mysqli_stmt_bind_result_format.phpt

There were two distinct issues here:
 * $trend was compared against 'NULL' using !=, which does not work
   as intended in the case where $trend==0.0.
 * current_targets was declared as double(17,0), which means that
   the fractional part was rounded, so that the same comparison in
   SQL (rounded) and in PHP (not rounded) did not necessarily
   match.

Please don't write mt_rand based tests, it takes ages to debug this
crap...

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Nikita Popov [Wed, 19 Sep 2018 07:38:17 +0000 (09:38 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

6 years agoFixed bug #76901
Nikita Popov [Wed, 19 Sep 2018 07:37:04 +0000 (09:37 +0200)]
Fixed bug #76901

get_method() may modify the object pointer passed to it if method
forwarding is used. In this case we do not want to modify the
passed zval, so make sure that we copy the object into a temporary
first.

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Nikita Popov [Tue, 18 Sep 2018 18:50:27 +0000 (20:50 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

6 years agoFix bug #75533: array_reduce is slow when $carry is large array
Manabu Matsui [Wed, 22 Nov 2017 02:07:15 +0000 (11:07 +0900)]
Fix bug #75533: array_reduce is slow when $carry is large array

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Anatol Belski [Tue, 18 Sep 2018 08:45:18 +0000 (10:45 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Add spectre switch for suitable vc14 versions

6 years agoAdd spectre switch for suitable vc14 versions
Anatol Belski [Tue, 18 Sep 2018 08:43:52 +0000 (10:43 +0200)]
Add spectre switch for suitable vc14 versions

6 years agoMerge branch 'PHP-7.1' into PHP-7.2
Pierrick Charron [Tue, 18 Sep 2018 00:30:18 +0000 (20:30 -0400)]
Merge branch 'PHP-7.1' into PHP-7.2

6 years agoFix 76480: Use curl_multi_wait() so that timeouts are respected
Pierrick Charron [Tue, 18 Sep 2018 00:28:44 +0000 (20:28 -0400)]
Fix 76480: Use curl_multi_wait() so that timeouts are respected