6cdeedb8de
Add tests from fix #78183 from PHP-7.2
2019-06-29 13:29:53 +02:00
0a31836bed
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix #78183 : finfo_file shows wrong mime-type for .tga file
2019-06-29 13:29:41 +02:00
855bbc88c9
Fix #78183 : finfo_file shows wrong mime-type for .tga file
...
Due to a bug in the underlying libmagic 5.31, .tga images returned mime type "image/x-tgaimage/x-tga".
2019-06-29 13:24:52 +02:00
19d0a51533
Merge branch 'PHP-7.2' into PHP-7.3
2019-06-28 16:09:09 +02:00
f7327b6244
Fix bugs in AST printer
...
Closes GH-4324.
2019-06-28 16:08:44 +02:00
646debaf38
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix bug #78192 PDO SQLite SegFault when reuse statement after schema has changed
2019-06-28 12:36:55 +02:00
05c00a832c
Fix bug #78192 PDO SQLite SegFault when reuse statement after schema has changed
...
Reset stmt->columns when column count changed on new execution of prepared statement
2019-06-28 12:36:02 +02:00
801ab18ea7
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Remove stream_socket_sendto.phpt
2019-06-26 17:01:29 +02:00
7d28a24c66
Remove stream_socket_sendto.phpt
...
Fails for me locally due to different number of warnings with
different messages. Rather than adding more wildcards I'm dropping
this test entirely, as it doesn't seem to test anything particularly
useful.
(cherry picked from commit 84333cad67
2019-06-26 16:58:37 +02:00
18bba63f39
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix #78202 : Opcache stats for cache hits are capped at 32bit NUM
2019-06-25 13:04:28 +02:00
4366f22dfc
Fix #78202 : Opcache stats for cache hits are capped at 32bit NUM
...
We use the proper format specifiers now.
2019-06-25 13:00:28 +02:00
8326f95fe3
Merge branch 'PHP-7.2' into PHP-7.3
2019-06-21 16:32:13 +03:00
102c64e827
Add explicit cast to uint32_t.
...
It works even without it but explicit stuff is better. The compiler probably converts the 16-bit
uint16_t to uint32_t before doing the shift.
2019-06-21 16:31:56 +03:00
66e4b78519
Merge branch 'PHP-7.2' into PHP-7.3
2019-06-21 15:07:59 +02:00
99f3e0f0ed
Fix PKCS12 leak in openssl
2019-06-21 15:07:37 +02:00
c939a67866
Fix d leak in ecc openssl_pkey_new
2019-06-21 15:07:32 +02:00
dfe6f0c1c6
Fix netscape spki leak in openssl
2019-06-21 15:07:26 +02:00
a0da2fb2b7
Fix X509 leak in openssl_pkcs7_verify()
2019-06-21 15:07:18 +02:00
e0bafc6da4
Fix CSR leaks in openssl
2019-06-21 15:07:10 +02:00
90cb3743be
Free cert in php_openssl_load_stream_cafile()
...
X509_STORE_add_cert() increments the refcount of the cert, so we
should free it here.
2019-06-21 15:07:00 +02:00
414db07bdb
Merge branch 'PHP-7.2' into PHP-7.3
2019-06-21 12:55:12 +02:00
fea9f93166
Fix memory leak in TLS matches_san_list
2019-06-21 12:54:30 +02:00
a85254b898
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix #78189 : file cache strips last character of uname hash
2019-06-20 17:59:59 +02:00
fcd6f2de60
Fix #78189 : file cache strips last character of uname hash
...
We must not forget to increase `len` by one to cater to the directory
separator.
2019-06-20 17:58:32 +02:00
a0f370e78a
Update NEWS
2019-06-20 16:59:39 +02:00
676b564f43
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
fix test for Windows and for parallel run
2019-06-20 11:58:49 +02:00
d8202bf917
fix test for Windows and for parallel run
2019-06-20 11:58:32 +02:00
d7597f73cc
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
improve test clean section
2019-06-20 11:51:51 +02:00
b3cfeda3c7
improve test clean section
2019-06-20 11:51:18 +02:00
27b5b46cb9
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
move NEWS entry
2019-06-20 10:41:21 +02:00
c2ee2e4c74
move NEWS entry
2019-06-20 10:40:52 +02:00
a197dc72c3
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
add test for #78185
2019-06-20 10:28:00 +02:00
63f2d88088
add test for #78185
2019-06-20 10:27:33 +02:00
35acda856a
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fixed bug #78185 (File cache no longer works)
2019-06-20 09:05:50 +03:00
cd6a6e4cf2
Fixed bug #78185 (File cache no longer works)
2019-06-20 09:04:14 +03:00
7ba1e6b34d
Merge branch 'PHP-7.2' into PHP-7.3
2019-06-19 16:43:06 +03:00
82021ad9df
Fix version comparison
2019-06-19 16:42:43 +03:00
a5db319463
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
fix setcookie Max-Age to use php_time
2019-06-19 12:42:25 +02:00
31a1c1e67c
fix setcookie Max-Age to use php_time
2019-06-19 12:42:00 +02:00
264536877d
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
export php_time
2019-06-19 12:40:23 +02:00
599b94ff14
export php_time
2019-06-19 12:39:51 +02:00
025899e3b5
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Resolve discrepencies between second value yielded by gettimeofday and time, fixes #69044
2019-06-19 08:59:04 +02:00
65067dff01
Resolve discrepencies between second value yielded by gettimeofday and time, fixes #69044
2019-06-19 08:56:20 +02:00
96663fd6ae
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix #78173 : XML-RPC mutates immutable objects during encoding
2019-06-18 17:08:58 +02:00
d54220bc79
Fix #78173 : XML-RPC mutates immutable objects during encoding
...
With opcache.protect_memory=1 enabled, the XML-RPC extension causes a
segfault on PHP 7.2 as it is modifying the recursion counter of objects
it touches, without first checking if they are immutable or not.
This doesn't affect 7.3+
2019-06-18 17:08:11 +02:00
740d9ecdee
Update NEWS
2019-06-18 09:33:35 +02:00
efa1388cd3
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
move NEWS entry
2019-06-18 07:51:05 +02:00
e59b986fa7
move NEWS entry
2019-06-18 07:50:44 +02:00
11b354dd54
Merge branch 'PHP-7.2' into PHP-7.3
2019-06-17 13:30:56 +02:00
03db04c3ab
Accept null for preg_quote delimiter argument
...
Related to bug #78163 .
2019-06-17 13:30:15 +02:00
Joshua Westerheide