Nikita Popov
37bba7a678
Merge branch 'PHP-7.2' into PHP-7.3
2019-06-03 15:15:07 +02:00
Nikita Popov
ac60007bec
Clear errors after SSL_CTX_load_verify_locations()
...
We report our own errors here. Make sure these don't clog up the
error queue.
2019-06-03 15:14:01 +02:00
Jakub Zelenka
8f69ca8dcd
Merge branch 'PHP-7.2' into PHP-7.3
2019-06-02 19:13:18 +01:00
Jakub Zelenka
2e02579474
Fix bug #78079 (openssl_encrypt_ccm.phpt fails with OpenSSL 1.1.1c)
...
It also fixes invalid setting of tag length
2019-06-02 19:10:56 +01:00
Anatol Belski
793fd6bce9
Fix expect section
2019-06-01 14:50:14 +02:00
Anatol Belski
547665c720
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Update SDK version for AppVeyor
2019-06-01 13:44:10 +02:00
Anatol Belski
59b0b38d3c
Update SDK version for AppVeyor
2019-06-01 13:43:31 +02:00
Anatol Belski
2205546edf
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Change ZPP only if compiled with ICU >= 64
Update tests for ICU 64
2019-06-01 02:26:07 +02:00
Anatol Belski
ee153deb1f
Change ZPP only if compiled with ICU >= 64
2019-06-01 02:18:56 +02:00
Nikita Popov
b01d9fdab1
Update tests for ICU 64
...
(cherry picked from commit 8a8bc5c452
)
2019-06-01 02:17:16 +02:00
Anatol Belski
06eef1f70f
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix var name
2019-05-31 20:50:17 +02:00
Anatol Belski
d293f6dcff
Fix var name
2019-05-31 20:49:42 +02:00
Craig Duncan
370997fb5d
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Add a test for bug #65672
Ensure the internal properties cannot be overwritten
2019-05-30 18:55:55 +01:00
Craig Duncan
8b53c7232e
Add a test for bug #65672
2019-05-30 18:55:42 +01:00
Craig Duncan
dc586bff36
Ensure the internal properties cannot be overwritten
2019-05-30 18:55:36 +01:00
Nikita Popov
61a38bb274
SCCP: Fix leak when determining TYPE_CHECK from type info
...
As TYPE_CHECK is the only opcode where we do something like this,
I'm adding this hack.
2019-05-29 16:47:19 +02:00
Nikita Popov
de7d0256a3
Merge branch 'PHP-7.2' into PHP-7.3
2019-05-29 09:47:43 +02:00
Craig Duncan
5d67271db0
Add tests for DatePeriod properties
2019-05-29 09:47:10 +02:00
Christoph M. Becker
f3cd6931ca
Update NEWS for 7.3.6
2019-05-29 09:27:23 +02:00
Remi Collet
582469eef2
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
add NEWS entries for sec fix
2019-05-29 08:53:42 +02:00
Remi Collet
3051147019
add NEWS entries for sec fix
2019-05-29 08:53:23 +02:00
Joe Watkins
6c73b2088a
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
disabled functions must not have return type
2019-05-29 08:30:41 +02:00
Joe Watkins
7821cc3b9f
disabled functions must not have return type
2019-05-29 08:30:08 +02:00
Craig Duncan
72c330f1e6
Restore the execute bit for run-tests.php
...
It looks like this was accidentally removed in 03f15f705a
2019-05-28 21:51:26 +01:00
Nikita Popov
817b50826e
Merge branch 'PHP-7.2' into PHP-7.3
2019-05-28 16:41:08 +02:00
Nikita Popov
59dfaa3f99
Fix type inference of SEND_UNPACK with empty array
...
An empty array will not be turned into an array of references.
This violated the invariant than an array has values iff it has
keys.
2019-05-28 16:40:56 +02:00
Joe Watkins
dee977b7a7
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
bump version after release
2019-05-28 09:54:15 +02:00
Joe Watkins
d661a75d54
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
bump version after release
2019-05-28 09:53:32 +02:00
Joe Watkins
5533f2490a
bump version after release
2019-05-28 09:52:52 +02:00
Stanislav Malyshev
9d473f1eac
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix bug #77967 - Bypassing open_basedir restrictions via file uris
2019-05-27 21:36:05 -07:00
Stanislav Malyshev
fbb6a27212
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Fix bug #77967 - Bypassing open_basedir restrictions via file uris
2019-05-27 21:36:00 -07:00
Stanislav Malyshev
c34895e837
Fix bug #77967 - Bypassing open_basedir restrictions via file uris
2019-05-27 18:48:48 -07:00
Stanislav Malyshev
13dffa9d32
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix bug #77988 - heap-buffer-overflow on php_jpg_get16
2019-05-27 17:28:25 -07:00
Stanislav Malyshev
dc1d99e772
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Fix bug #77988 - heap-buffer-overflow on php_jpg_get16
2019-05-27 17:28:20 -07:00
Stanislav Malyshev
73ff4193be
Fix bug #77988 - heap-buffer-overflow on php_jpg_get16
2019-05-27 17:28:09 -07:00
Stanislav Malyshev
e63b2ba310
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix function name
2019-05-27 17:21:23 -07:00
Stanislav Malyshev
9bca9ef6cf
Fix function name
2019-05-27 17:20:56 -07:00
Stanislav Malyshev
c7eb0feed8
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Update NEWS
Fix bug #78069 - Out-of-bounds read in iconv.c:_php_iconv_mime_decode() due to integer overflow
Fix #77973 : Uninitialized read in gdImageCreateFromXbm
2019-05-27 16:49:25 -07:00
Stanislav Malyshev
e77c8e45ba
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Update NEWS
Fix bug #78069 - Out-of-bounds read in iconv.c:_php_iconv_mime_decode() due to integer overflow
Fix #77973 : Uninitialized read in gdImageCreateFromXbm
2019-05-27 16:49:19 -07:00
Stanislav Malyshev
16e037bd46
Update NEWS
2019-05-27 16:48:32 -07:00
Stanislav Malyshev
7cf7148a8f
Fix bug #78069 - Out-of-bounds read in iconv.c:_php_iconv_mime_decode() due to integer overflow
2019-05-27 16:32:42 -07:00
Christoph M. Becker
ed6dee9a19
Fix #77973 : Uninitialized read in gdImageCreateFromXbm
...
We have to ensure that `sscanf()` does indeed read a hex value here,
and bail out otherwise.
2019-05-27 16:11:32 -07:00
Nikita Popov
0cb43ec51c
Merge branch 'PHP-7.2' into PHP-7.3
2019-05-27 17:43:13 +02:00
Michael Maroszek
a0c9d0849a
Fixed bug #76345
2019-05-27 17:42:20 +02:00
Nikita Popov
31ce1cbbb9
Func info: Fix calls to zero-arg varargs
...
The num_args does not include variadics, so a "zero-arg" function
may accept additional arguments through that. No functions seem
to be affected right now, but they will be after #4175 .
2019-05-27 16:14:51 +02:00
Jakub Zelenka
209b12e064
Merge branch 'PHP-7.2' into PHP-7.3
2019-05-26 18:49:52 +01:00
Jakub Zelenka
8baf3ffde6
Add fpmi to the opcache supported sapis
2019-05-26 18:47:22 +01:00
Nikita Popov
6f9dfd9473
Fix bug #77955
...
Free metadata before freeing the arena. I don't have a repro script,
but the added assertion fails for many existing tests prior to this
change.
2019-05-23 13:40:52 +02:00
Nikita Popov
b394654c1e
Merge branch 'PHP-7.2' into PHP-7.3
2019-05-23 11:12:59 +02:00
Nikita Popov
9a74b23297
Fixed bug #78038 socket_select with references
2019-05-23 11:12:15 +02:00