]>
granicus.if.org Git - php/log
Nikita Popov [Wed, 28 Nov 2018 19:10:06 +0000 (20:10 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Wed, 28 Nov 2018 19:08:39 +0000 (20:08 +0100)]
Fixed bug #77215
Remove invalid assertion: A block can have multiple switch frees,
so if we don't do live range block splitting, it is not necessarily
true that the free is located at the start of a block.
Nikita Popov [Tue, 27 Nov 2018 18:44:45 +0000 (19:44 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Tue, 27 Nov 2018 18:43:25 +0000 (19:43 +0100)]
Improve fix for #76046
Also locate the JMP at the start of the foreach.
Patch suggested by Derick.
Nikita Popov [Tue, 27 Nov 2018 15:39:07 +0000 (16:39 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Tue, 27 Nov 2018 15:37:55 +0000 (16:37 +0100)]
Fixed bug #76046
Place FE_FREE on start line of foreach, instead of whatever random
line number might be in CG(zend_lineno) at the time.
Nikita Popov [Mon, 26 Nov 2018 21:49:09 +0000 (22:49 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
Colin Basnett [Wed, 21 Nov 2018 21:40:43 +0000 (13:40 -0800)]
Fixed bug #77184
The U in URATIONAL is for unsigned, so the values should be printed
as unsigned.
Adam Baratz [Mon, 26 Nov 2018 15:39:24 +0000 (10:39 -0500)]
update NEWS
Adam Baratz [Mon, 26 Nov 2018 15:36:18 +0000 (10:36 -0500)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Check column number before trying to fetch the value
Sergei Morozov [Wed, 7 Nov 2018 20:34:50 +0000 (12:34 -0800)]
Check column number before trying to fetch the value
Christoph M. Becker [Mon, 26 Nov 2018 14:26:48 +0000 (15:26 +0100)]
Use zend_empty_array
No need to define our own `com_dotnet_object_properties` as empty hash,
since we can use `zend_empty_array` instead as of PHP 7.3.0.
Cf. <https://github.com/php/php-src/pull/3672#issuecomment-
440467704 >.
Christoph M. Becker [Sun, 25 Nov 2018 18:02:33 +0000 (19:02 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #77200: imagecropauto(…, GD_CROP_SIDES) crops left but not right
Christoph M. Becker [Sun, 25 Nov 2018 18:00:50 +0000 (19:00 +0100)]
Fix #77200: imagecropauto(…, GD_CROP_SIDES) crops left but not right
We apply the upstream patch[1].
[1] <https://github.com/libgd/libgd/commit/
6613094e5d218dc4d4372757aef5e58c6462a9f7 >
Christoph M. Becker [Sun, 25 Nov 2018 14:53:10 +0000 (15:53 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #77198: auto cropping has insufficient precision
Christoph M. Becker [Sun, 25 Nov 2018 14:41:27 +0000 (15:41 +0100)]
Fix #77198: auto cropping has insufficient precision
We apply the upstream patch[1], and also fix the erroneous bailout at
the end of `gdImageAutoCrop()`, since `crop.x` and `crop.y` may very
well be zero.
[1] <https://github.com/libgd/libgd/commit/
bda85aaeeb1d7467d92c892ba4c30eaa53d7a6d4 >
Frank Denis [Sat, 24 Nov 2018 16:56:33 +0000 (17:56 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
ext/sodium: remove redundant code
ext/sodium: Correct base64 decoding with unpadded variants
Frank Denis [Sat, 24 Nov 2018 16:55:36 +0000 (17:55 +0100)]
ext/sodium: remove redundant code
Frank Denis [Sat, 24 Nov 2018 16:53:08 +0000 (17:53 +0100)]
ext/sodium: Correct base64 decoding with unpadded variants
Backports
0eee0b957a3b75f8175cdd30b306c15e372685e8 from the PECL extension
Christoph M. Becker [Sat, 24 Nov 2018 12:38:09 +0000 (13:38 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix test case
Christoph M. Becker [Sat, 24 Nov 2018 12:36:42 +0000 (13:36 +0100)]
Fix test case
Christoph M. Becker [Sat, 24 Nov 2018 11:56:43 +0000 (12:56 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #77195: Incorrect error handling of imagecreatefromjpeg()
Christoph M. Becker [Sat, 24 Nov 2018 11:52:08 +0000 (12:52 +0100)]
Fix #77195: Incorrect error handling of imagecreatefromjpeg()
The broken JPEG image triggers a notice, two warnings and outputs a
message to stderr directly. The additional notice is pretty useless,
and the direct output to stderr is bad. Therefore, we port the
relevant differences from upstream to our bundled libgd. This leaves
us with two warnings; the first one is triggered by libjpeg and shows
the actual problem, the second one is triggered by our libgd wrapper
whenever an image can't be read, what may not have necessarily
triggered a warning before.
Christoph M. Becker [Fri, 23 Nov 2018 17:37:12 +0000 (18:37 +0100)]
[ci skip] Preliminary fix for NEWS
No more regular bug fixes for PHP 7.3.0.
We'll clean up the rest later.
Christoph M. Becker [Fri, 23 Nov 2018 15:34:11 +0000 (16:34 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #77177: Serializing or unserializing COM objects crashes
Christoph M. Becker [Fri, 23 Nov 2018 15:32:33 +0000 (16:32 +0100)]
Fix #77177: Serializing or unserializing COM objects crashes
Firstly, we avoid returning NULL from the get_property handler, but
instead return an empty HashTable, which already prevents the crashes.
Secondly, since (de-)serialization obviously makes no sense for COM,
DOTNET and VARIANT objects (at least with the current implementation),
we prohibit it right away.
Sara Golemon [Wed, 21 Nov 2018 19:39:40 +0000 (14:39 -0500)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Prep for 7.1.26
Sara Golemon [Wed, 21 Nov 2018 19:39:25 +0000 (14:39 -0500)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Prep for 7.1.26
Sara Golemon [Wed, 21 Nov 2018 19:37:37 +0000 (14:37 -0500)]
Prep for 7.1.26
Xinchen Hui [Wed, 21 Nov 2018 03:23:47 +0000 (11:23 +0800)]
Fixed bug #77088 (Segfault when using SoapClient with null options)
SoapClient constructor has its own error handler
Xinchen Hui [Wed, 21 Nov 2018 03:18:48 +0000 (11:18 +0800)]
Fixed proto & folder mark
Nikita Popov [Tue, 20 Nov 2018 20:30:44 +0000 (21:30 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Tue, 20 Nov 2018 20:30:27 +0000 (21:30 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
Valentin V. Bartenev [Tue, 20 Nov 2018 15:48:06 +0000 (18:48 +0300)]
Fix bug #71041 dynamic embed SAPI load error
If the library is built with ZEND_SIGNALS defined, it's unusable with an
external SAPI module because the zend_signal_startup() call is mandatory
in this case.
This bug is similar to #74149, but related to dynamic loading of PHP library.
Nikita Popov [Tue, 20 Nov 2018 20:16:19 +0000 (21:16 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
Mizunashi Mana [Sat, 10 Nov 2018 18:17:11 +0000 (03:17 +0900)]
Define __APPLE_USE_RFC_3542 for new ipv6 constants
Sara Golemon [Tue, 20 Nov 2018 19:41:31 +0000 (14:41 -0500)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Bump for 7.2.14
Sara Golemon [Tue, 20 Nov 2018 19:40:21 +0000 (14:40 -0500)]
Bump for 7.2.14
Stanislav Malyshev [Tue, 20 Nov 2018 19:19:51 +0000 (11:19 -0800)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Disable rsh/ssh functionality in imap by default (bug #77153)
Stanislav Malyshev [Mon, 19 Nov 2018 01:10:43 +0000 (17:10 -0800)]
Disable rsh/ssh functionality in imap by default (bug #77153)
Stanislav Malyshev [Mon, 19 Nov 2018 01:10:43 +0000 (17:10 -0800)]
Disable rsh/ssh functionality in imap by default (bug #77153)
Stanislav Malyshev [Mon, 19 Nov 2018 01:10:43 +0000 (17:10 -0800)]
Disable rsh/ssh functionality in imap by default (bug #77153)
Christoph M. Becker [Tue, 20 Nov 2018 12:36:10 +0000 (13:36 +0100)]
[ci skip] Update NEWS wrt. php-7.3.0RC6 tagging
Remi Collet [Tue, 20 Nov 2018 10:20:40 +0000 (11:20 +0100)]
NEWS
Remi Collet [Tue, 20 Nov 2018 10:20:26 +0000 (11:20 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
NEWS
NEWS
Fix #77151 ftp_close(): SSL_read on shutdown
Remi Collet [Tue, 20 Nov 2018 10:20:05 +0000 (11:20 +0100)]
NEWS
Remi Collet [Tue, 20 Nov 2018 10:19:52 +0000 (11:19 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
NEWS
Fix #77151 ftp_close(): SSL_read on shutdown
Remi Collet [Tue, 20 Nov 2018 10:19:29 +0000 (11:19 +0100)]
NEWS
Remi Collet [Thu, 15 Nov 2018 07:58:08 +0000 (08:58 +0100)]
Fix #77151 ftp_close(): SSL_read on shutdown
Regression introduced in fix for #76972
only display the error message when sslerror
or if errno is set (for SSL_ERROR_SYSCALL case)
Anatol Belski [Sun, 18 Nov 2018 13:41:14 +0000 (14:41 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
[ci skip] Update NEWS
[ci skip] Update NEWS
Anatol Belski [Sun, 18 Nov 2018 13:40:00 +0000 (14:40 +0100)]
[ci skip] Update NEWS
Anatol Belski [Sun, 18 Nov 2018 13:38:35 +0000 (14:38 +0100)]
[ci skip] Update NEWS
Anatol Belski [Sun, 18 Nov 2018 13:37:56 +0000 (14:37 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
[ci skip] Update NEWS
Anatol Belski [Sun, 18 Nov 2018 13:37:04 +0000 (14:37 +0100)]
[ci skip] Update NEWS
Anatol Belski [Sun, 18 Nov 2018 11:33:35 +0000 (12:33 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fixed bug #77047 pg_convert has a broken regex for the 'TIME WITHOUT TIMEZONE' data type
Anatol Belski [Sun, 18 Nov 2018 11:32:47 +0000 (12:32 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed bug #77047 pg_convert has a broken regex for the 'TIME WITHOUT TIMEZONE' data type
Anatol Belski [Sun, 18 Nov 2018 11:29:34 +0000 (12:29 +0100)]
Fixed bug #77047 pg_convert has a broken regex for the 'TIME WITHOUT TIMEZONE' data type
Backport
369c991d and
282a63da to 7.1, closes #3634
Anatol Belski [Sun, 18 Nov 2018 10:52:00 +0000 (11:52 +0100)]
Add test for bug #77047
andy [Mon, 22 Oct 2018 14:57:28 +0000 (08:57 -0600)]
FIX #77047: fixes regex for "time" data type
Anatol Belski [Sat, 17 Nov 2018 22:01:17 +0000 (23:01 +0100)]
[ci skip] Update NEWS
Anatol Belski [Sat, 17 Nov 2018 22:00:50 +0000 (23:00 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
[ci skip] Update NEWS
Anatol Belski [Sat, 17 Nov 2018 22:00:12 +0000 (23:00 +0100)]
[ci skip] Update NEWS
Anatol Belski [Sat, 17 Nov 2018 21:56:39 +0000 (22:56 +0100)]
Simplify assignment on 64-bit
Anatol Belski [Fri, 16 Nov 2018 22:22:19 +0000 (23:22 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fixed bug #77111 php-win.exe corrupts unicode symbols from cli parameters
Anatol Belski [Fri, 16 Nov 2018 22:19:33 +0000 (23:19 +0100)]
Fixed bug #77111 php-win.exe corrupts unicode symbols from cli parameters
The binary can be of course used on console, for whatever reasons, so
UNICODE API should be used in that case. That might however not work as
expected, if the binary is used for a service.
Nikita Popov [Thu, 15 Nov 2018 16:13:12 +0000 (17:13 +0100)]
Fixed bug #77165
Also add some helper macros for PROTECT/UNPROTECT that check for
IMMUTABLE. These checks are needed for nearly any use of
PROTECT/UNPROTECT.
Anatol Belski [Wed, 14 Nov 2018 21:23:24 +0000 (22:23 +0100)]
Rework magic data once more
The change reduces the input size on patterns using posix character
classes. It is still better than reverting to the patterns from the
older version, as the upstream data uses posix classes also in the later
versions. The input reduction speeds up the pattern matching in some
cases.
This patch is functionally almost same as upstream, but might show some diff
when the input is very long. While the magic data in the newer versions is
functionally an improvement, with jit=0 it might show a performance regression.
The slowdown is negligible in the normal usage and is still acceptable for the
malicious input. If some functional regressions show up, this patch should be
reverted and the tests timing should be adapted instead.
Christoph M. Becker [Wed, 14 Nov 2018 13:58:45 +0000 (14:58 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #77147: Fix for 60494 ignores ICONV_MIME_DECODE_CONTINUE_ON_ERROR
Christoph M. Becker [Wed, 14 Nov 2018 13:56:41 +0000 (14:56 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix #77147: Fix for 60494 ignores ICONV_MIME_DECODE_CONTINUE_ON_ERROR
Christoph M. Becker [Wed, 14 Nov 2018 13:55:38 +0000 (14:55 +0100)]
Fix #77147: Fix for 60494 ignores ICONV_MIME_DECODE_CONTINUE_ON_ERROR
If the `ICONV_MIME_DECODE_CONTINUE_ON_ERROR` flag is set, parsing
should not fail, if there are illegal characters in the headers;
instead we silently ignore these like before.
Joe Watkins [Tue, 13 Nov 2018 11:59:50 +0000 (12:59 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Validate length on socket_write
Joe Watkins [Tue, 13 Nov 2018 11:57:38 +0000 (12:57 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Validate length on socket_write
Thiago Carvalho [Sun, 21 Oct 2018 19:42:29 +0000 (21:42 +0200)]
Validate length on socket_write
Jan Rękorajski [Wed, 24 Oct 2018 21:02:33 +0000 (23:02 +0200)]
Fix compilation on x32
Signed-off-by: Elan Ruusamäe <glen@pld-linux.org>
Christoph M. Becker [Mon, 12 Nov 2018 22:24:17 +0000 (23:24 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #77141: Signedness issue in SOAP when precision=-1
Christoph M. Becker [Mon, 12 Nov 2018 22:21:04 +0000 (23:21 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix #77141: Signedness issue in SOAP when precision=-1
Christoph M. Becker [Mon, 12 Nov 2018 22:00:25 +0000 (23:00 +0100)]
Fix #77141: Signedness issue in SOAP when precision=-1
According to php_gcvt(), we assume at most 17 fractional digits for
negative precision.
Anatol Belski [Sat, 10 Nov 2018 21:02:44 +0000 (22:02 +0100)]
Update libmagic.patch [ci skip]
Anatol Belski [Sat, 10 Nov 2018 21:02:24 +0000 (22:02 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Update libmagic.patch [ci skip]
Anatol Belski [Sat, 10 Nov 2018 21:01:49 +0000 (22:01 +0100)]
Update libmagic.patch [ci skip]
Anatol Belski [Sat, 10 Nov 2018 19:07:25 +0000 (20:07 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fork test with pcre.jit=0
Anatol Belski [Sat, 10 Nov 2018 19:05:56 +0000 (20:05 +0100)]
Fork test with pcre.jit=0
Anatol Belski [Sat, 10 Nov 2018 17:22:44 +0000 (18:22 +0100)]
Rework magic data
Still upstream contains some slower patterns. Those might need to
be patched, if regressions arise.
Anatol Belski [Sat, 10 Nov 2018 11:13:03 +0000 (12:13 +0100)]
Fix regex
Anatol Belski [Sat, 10 Nov 2018 11:12:25 +0000 (12:12 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix regex
Anatol Belski [Sat, 10 Nov 2018 11:11:02 +0000 (12:11 +0100)]
Fix regex
Anatol Belski [Sat, 10 Nov 2018 00:32:35 +0000 (01:32 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Rework magic data
Anatol Belski [Sat, 10 Nov 2018 00:28:23 +0000 (01:28 +0100)]
Rework magic data
Avoid patching where vanilla data suffices. More precisely, avoid data
using [:space:] posix class in regex, as it is likely to cause performance
regressions.
Anatol Belski [Fri, 9 Nov 2018 23:20:39 +0000 (00:20 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Sync one more upstream libmagic piece
Anatol Belski [Fri, 9 Nov 2018 23:18:30 +0000 (00:18 +0100)]
Sync one more upstream libmagic piece
Christoph M. Becker [Tue, 6 Nov 2018 10:45:18 +0000 (11:45 +0100)]
[ci skip] Update NEWS wrt. php-7.3.0RC5 tagging
Anatol Belski [Mon, 5 Nov 2018 21:53:45 +0000 (22:53 +0100)]
Update NEWS [ci skip]
Anatol Belski [Mon, 5 Nov 2018 21:53:19 +0000 (22:53 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Update NEWS [ci skip]
Anatol Belski [Mon, 5 Nov 2018 21:53:01 +0000 (22:53 +0100)]
Update NEWS [ci skip]
Anatol Belski [Mon, 5 Nov 2018 21:25:31 +0000 (22:25 +0100)]
Update libmagic.patch [ci skip]
Anatol Belski [Mon, 5 Nov 2018 21:25:04 +0000 (22:25 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Update libmagic.patch [ci skip]
Anatol Belski [Mon, 5 Nov 2018 21:22:49 +0000 (22:22 +0100)]
Update libmagic.patch [ci skip]
Anatol Belski [Mon, 5 Nov 2018 20:29:35 +0000 (21:29 +0100)]
Declare function proto in header
Anatol Belski [Mon, 5 Nov 2018 20:29:06 +0000 (21:29 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Declare function proto in header
Anatol Belski [Mon, 5 Nov 2018 20:28:04 +0000 (21:28 +0100)]
Declare function proto in header