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
29dcf19f8b
Declare function proto in header
2018-11-05 21:29:35 +01:00
0e33c2822c
Declare function proto in header
2018-11-05 21:28:04 +01:00
68ad401b34
Implement handling for JIT recognition when cross compiling
2018-11-05 01:15:09 +01:00
c621182c42
Backport 7f5f4601 for 7.2
2018-11-04 16:57:55 +01:00
579d76d87b
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix #76348 : WSDL_CACHE_MEMORY causes Segmentation fault
2018-11-04 16:47:13 +01:00
0afc818976
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Fix #76348 : WSDL_CACHE_MEMORY causes Segmentation fault
2018-11-04 16:44:45 +01:00
625f614cb1
Fix #76348 : WSDL_CACHE_MEMORY causes Segmentation fault
...
“Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end.”
2018-11-04 16:40:27 +01:00
7f5f46013b
Rework places in libmagic regarding previous CVE-2014-3538 fixes
...
CVE-2014-3538 was fixed upstream, but the old patch was still kept in
the PHP port. This patch causes performance regressions when PCRE JIT is
not enabled. This is fixed by applying the relevant original code from
the newer libmagic, which makes the old patch obsolete as the
CVE-2014-3538 tests still pass.
2018-11-04 13:11:28 +01:00
aea411657e
Change the way JIT availability is checked
...
The pcre2_jit_compile_8 sysmbol is always available, even JIT might be
not. If JIT is not enabled explicitly and is enabled in the PHP runtime,
this will lead to a malfunction. This approach ensures JIT is indeed
available on the given platform. For cross compilation this might get
complicated, as it would require an explicit processor architecture and
PCRE2 version check.
Another solution for this case is to run pcre2_config at runtime. That
however would require more condition checks that would impact
architectures where JIT is available.
2018-11-03 20:50:05 +01:00
d92f7630f7
Merge branch 'PHP-7.2' into PHP-7.3
2018-11-02 14:30:50 +01:00
4daa413898
Fixed bug #77092
...
Weird that this worked for so long, probably because nearly all
ext/standard functions use fast ZPP rather than ordinary ZPP.
2018-11-02 14:29:03 +01:00
9afce019e0
Future-proof email addresses
2018-11-01 18:35:32 +02:00
4e8195769d
Fix session tests that fail if error_log is set
2018-10-31 10:58:45 -07:00
8827cc34cf
Fixed bug #77081 ftruncate() changes seek pointer in c mode
2018-10-30 20:42:00 +01:00
2816a3fdfa
Fix and improve test case
...
We fix the erroneous doctype declaration, clarify the expectation, and
add a comment to clarify the purpose of the tag mismatch in the XML.
2018-10-30 18:53:03 +01:00
10255a0cd9
Updated to version 2018.7 (2018g)
2018-10-30 11:25:48 +00:00
e58388ea6d
Updated to version 2018.7 (2018g)
2018-10-30 11:25:45 +00:00
82115849b3
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
[ci skip] Update NEWS
[ci skip] Update NEWS
fix bug #77079
2018-10-30 00:23:38 +01:00
b1de24e68c
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
[ci skip] Update NEWS
fix bug #77079
2018-10-30 00:22:26 +01:00
8775bead3a
fix bug #77079
2018-10-30 00:19:07 +01:00
Remi Collet