07d6dfbfe4
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 >.
2018-11-26 15:33:58 +01:00
070f6838db
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix #77200 : imagecropauto(…, GD_CROP_SIDES) crops left but not right
2018-11-25 19:03:38 +01:00
a1aaec08b5
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 >
2018-11-25 19:00:50 +01:00
d2a1839d82
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix #77198 : auto cropping has insufficient precision
2018-11-25 15:56:35 +01:00
b47b8886dd
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 >
2018-11-25 15:41:27 +01:00
8e5381915b
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
2018-11-24 17:56:33 +01:00
ff02d50909
ext/sodium: remove redundant code
2018-11-24 17:55:36 +01:00
542d0bce50
ext/sodium: Correct base64 decoding with unpadded variants
...
Backports 0eee0b957a3b75f8175cdd30b306c15e372685e8 from the PECL extension
2018-11-24 17:53:08 +01:00
aab9aa7661
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix test case
2018-11-24 13:38:09 +01:00
5af5f56fc9
Fix test case
2018-11-24 13:36:42 +01:00
caabf3a1bb
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix #77195 : Incorrect error handling of imagecreatefromjpeg()
2018-11-24 12:57:44 +01:00
60a9f7a3a3
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.
2018-11-24 12:52:08 +01:00
b0a86566dc
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix #77177 : Serializing or unserializing COM objects crashes
2018-11-23 16:36:00 +01:00
115ee49b0b
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.
2018-11-23 16:32:33 +01:00
aaafd793e6
Fixed bug #77088 (Segfault when using SoapClient with null options)
...
SoapClient constructor has its own error handler
2018-11-21 11:30:32 +08:00
efeb810a3d
Fixed proto & folder mark
2018-11-21 11:18:48 +08:00
7a0d3406f6
Merge branch 'PHP-7.2' into PHP-7.3
2018-11-20 21:16:28 +01:00
e672cd4385
Define __APPLE_USE_RFC_3542 for new ipv6 constants
2018-11-20 21:16:03 +01:00
44b08a9802
Disable rsh/ssh functionality in imap by default (bug #77153 )
2018-11-20 11:19:45 -08:00
336d2086a9
Disable rsh/ssh functionality in imap by default (bug #77153 )
2018-11-20 11:18:53 -08:00
928d7fc8df
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
NEWS
NEWS
Fix #77151 ftp_close(): SSL_read on shutdown
2018-11-20 11:20:26 +01:00
6ce4be1762
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
NEWS
Fix #77151 ftp_close(): SSL_read on shutdown
2018-11-20 11:19:52 +01:00
d9afc2f662
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)
2018-11-20 11:18:34 +01:00
fb06cca6cb
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
2018-11-18 12:32:47 +01:00
0434141ce9
Fixed bug #77047 pg_convert has a broken regex for the 'TIME WITHOUT TIMEZONE' data type
...
Backport 369c991d282a63dacloses #3634
2018-11-18 12:29:34 +01:00
282a63dace
Add test for bug #77047
2018-11-18 11:52:00 +01:00
369c991d5c
FIX #77047 : fixes regex for "time" data type
2018-11-18 11:50:32 +01:00
dee5a450d9
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.
2018-11-15 17:16:39 +01:00
2a062f3c02
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.
2018-11-14 22:23:24 +01:00
9a2bd2f453
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix #77147 : Fix for 60494 ignores ICONV_MIME_DECODE_CONTINUE_ON_ERROR
2018-11-14 14:59:30 +01:00
211c6189f6
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Fix #77147 : Fix for 60494 ignores ICONV_MIME_DECODE_CONTINUE_ON_ERROR
2018-11-14 14:57:40 +01:00
a56cdd0a82
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.
2018-11-14 14:55:38 +01:00
8a11c9ee76
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Validate length on socket_write
2018-11-13 13:00:08 +01:00
ce4eb89976
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Validate length on socket_write
2018-11-13 12:58:23 +01:00
ec2e7a2d48
Validate length on socket_write
2018-11-13 12:56:37 +01:00
f76be1a0d6
Fix compilation on x32
...
Signed-off-by: Elan Ruusamäe <glen@pld-linux.org >
2018-11-13 12:31:00 +01:00
512b93e9d6
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix #77141 : Signedness issue in SOAP when precision=-1
2018-11-12 23:24:48 +01:00
77646d2fd9
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Fix #77141 : Signedness issue in SOAP when precision=-1
2018-11-12 23:22:16 +01:00
f6079e3c56
Fix #77141 : Signedness issue in SOAP when precision=-1
...
According to php_gcvt(), we assume at most 17 fractional digits for
negative precision.
2018-11-12 23:19:30 +01:00
ee50461e4b
Update libmagic.patch [ci skip]
2018-11-10 22:02:44 +01:00
1550451020
Update libmagic.patch [ci skip]
2018-11-10 22:01:49 +01:00
b50d93bc11
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fork test with pcre.jit=0
2018-11-10 20:07:25 +01:00
3fd46e19ac
Fork test with pcre.jit=0
2018-11-10 20:06:47 +01:00
0e38909170
Rework magic data
...
Still upstream contains some slower patterns. Those might need to
be patched, if regressions arise.
2018-11-10 18:22:44 +01:00
992e4fbc65
Fix regex
2018-11-10 12:13:03 +01:00
9d77bf0978
Fix regex
2018-11-10 12:11:02 +01:00
60adea5496
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.
2018-11-10 01:28:23 +01:00
22f71a66ec
Sync one more upstream libmagic piece
2018-11-10 00:19:42 +01:00
a957af6c06
Update libmagic.patch [ci skip]
2018-11-05 22:25:31 +01:00
dbb2cce968
Update libmagic.patch [ci skip]
2018-11-05 22:24:27 +01:00
Christoph M. Becker