d91b643c87
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Update NEWS wrt. sec fixes
2019-04-30 09:36:09 +02:00
1210c3b960
Update NEWS wrt. sec fixes
2019-04-30 09:34:53 +02:00
66b32f25d5
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix bug #77950 - Heap-buffer-overflow in _estrndup via exif_process_IFD_TAG
2019-04-30 00:05:43 -07:00
cb5af4e8a0
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Fix bug #77950 - Heap-buffer-overflow in _estrndup via exif_process_IFD_TAG
2019-04-30 00:05:32 -07:00
f80ad18afa
Fix bug #77950 - Heap-buffer-overflow in _estrndup via exif_process_IFD_TAG
...
I do not completely understand what is going on there, but I am pretty
sure dir_entry <= offset_base if not a normal situation, so we better not
to rely on such dir_entry.
2019-04-30 00:05:23 -07:00
506a764089
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix #77821 : Potential heap corruption in TSendMail()
2019-04-29 22:09:10 -07:00
2c3933821f
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Fix #77821 : Potential heap corruption in TSendMail()
2019-04-29 22:09:04 -07:00
6c631ccfef
Fix #77821 : Potential heap corruption in TSendMail()
...
`zend_string_tolower()` returns a copy (not a duplicate) of the given
string, if it is already in lower case. In this case we must not not
`zend_string_free()` both strings. The cleanest solution is to call
` zend_string_release()` on both strings, which properly handles the
refcount.
2019-04-29 22:08:19 -07:00
a30b919872
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix #77943 : imageantialias($image, false); does not work
2019-04-29 17:23:45 +02:00
18a9ae412f
Fix #77943 : imageantialias($image, false); does not work
...
Firstly, we must not call `gdImageSetAntiAliased()` (which sets the
color to anti-alias), but rather modify the `gdImage.AA` flag.
Furthermore, we have to actually use the supplied boolean value.
We also make sure that we don't attempt to enable anti-aliasing for
palette images.
2019-04-29 17:23:16 +02:00
44494c09bc
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Add tests for bug77943
2019-04-29 16:29:29 +02:00
3891e0d13a
Add tests for bug77943
2019-04-29 16:29:08 +02:00
3fc1bdc81c
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix #77943 : imageantialias($image, false); does not work
2019-04-29 16:18:27 +02:00
cd94cf60a2
Fix #77943 : imageantialias($image, false); does not work
...
Firstly, we must not call `gdImageSetAntiAliased()` (which sets the
color to anti-alias), but rather modify the `gdImage.AA` flag.
Furthermore, we have to actually use the supplied boolean value.
We also make sure that we don't attempt to enable anti-aliasing for
palette images.
2019-04-29 16:16:46 +02:00
ff2b5bda59
Merge branch 'PHP-7.2' into PHP-7.3
2019-04-29 13:53:45 +02:00
5da0579259
Fixed bug #77945
...
Make sure that we proper distinguish between empty string key and
no key during SDL serialization.
2019-04-29 13:52:18 +02:00
7faaf5a89a
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix tests
2019-04-29 09:05:04 +02:00
9bf11045db
Fix tests
...
These tests are obviously meant to test successful and failing uri:
DSNs, but did not pass proper file:// URIs, so actually ended up
testing for invalid data source URIs twice. We fix this, and adjust
the expectations accordingly.
We also unfork the -win32 variant, since both test cases are almost
identical, and the expected error message may be either one.
2019-04-29 09:04:33 +02:00
06b130579e
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Make MySQLPDOTest::extractVersion() more liberal
2019-04-28 23:49:19 +02:00
fc9cdb723b
Make MySQLPDOTest::extractVersion() more liberal
...
MySQL/MariaDB version strings may have suffixes which may contain dots;
for instance, Debian stretch has 5.5.5-10.1.37-MariaDB-0+deb9u1 or
such. Therefore, we make the version extraction more liberal, and only
require that there are at least three parts separated by dot, and
ignore additional parts.
We also fix an erroneous test expectation, which would be triggered on
CI now, right away. This patch has been provided by petk@.
2019-04-28 23:48:27 +02:00
f83c207d60
Update NEWS
2019-04-28 00:51:18 +02:00
1bdd97a601
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Update NEWS
Fix #77024 : SplFileObject::__toString() may return array
2019-04-28 00:50:54 +02:00
6d8892aacd
Update NEWS
2019-04-28 00:50:40 +02:00
91c6fb881e
Fix #77024 : SplFileObject::__toString() may return array
...
- Correct the behaviour of casting spl files to strings
- Add a test for Bug 77024
2019-04-28 00:44:48 +02:00
3309f2fbb9
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
PHP, meet MySQL
2019-04-27 19:22:10 +02:00
57d5dc5688
PHP, meet MySQL
...
All pdo_mysql tests are skipped on AppVeyor because "No such host is
known". We change the DSN to use semicolons instead of spaces to fix
that.
2019-04-27 19:21:51 +02:00
e561d4100b
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix #77944 : Wrong meta pdo_type for bigint on LLP64
2019-04-27 18:47:32 +02:00
16609880f8
Fix #77944 : Wrong meta pdo_type for bigint on LLP64
...
When actually fetching the data, bigint (unsigned) column values are
returned as integers on LLP64 architectures, so their pdo_type has to
be PDO::PARAM_INT accordingly.
2019-04-27 18:46:27 +02:00
70239ea1d3
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix #77940 : test using outdated mon_thousands_sep for Swedish
2019-04-25 23:29:03 +02:00
7ddfe73e69
Fix #77940 : test using outdated mon_thousands_sep for Swedish
...
Of course, we should expect a comma, not a period.
2019-04-25 23:28:41 +02:00
3e31ae5d70
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix #77940 : test using outdated mon_thousands_sep for Swedish
2019-04-25 19:40:05 +02:00
bfbfb9dabd
Fix #77940 : test using outdated mon_thousands_sep for Swedish
...
This time so that it works for all Windows 10 versions (hopefully).
2019-04-25 19:39:42 +02:00
dcba479848
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix #77940 : test using outdated mon_thousands_sep for Swedish
2019-04-25 08:59:09 +02:00
37ca6a7a2a
Fix #77940 : test using outdated mon_thousands_sep for Swedish
2019-04-25 08:58:13 +02:00
ad0acc0aa9
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Fix #77938 : socket_get_option error
2019-04-25 00:04:37 +02:00
fe202d99c8
Fix #77938 : socket_get_option error
...
Since tcp_socket/ssl streams are not representable, we suppress the
redirect to fix the test case.
2019-04-25 00:03:45 +02:00
191e15309f
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
news entry for litespeed
2019-04-24 09:46:06 +02:00
5d21a15cc3
news entry for litespeed
2019-04-24 09:45:48 +02:00
68892410f7
Merge branch 'PHP-7.2' into PHP-7.3
2019-04-23 12:43:32 +02:00
4831e150c5
Fixed bug #77843
2019-04-23 12:43:07 +02:00
cedee4408b
Fixed bug #77931
2019-04-23 11:40:13 +02:00
fb4c811835
Merge branch 'PHP-7.2' into PHP-7.3
2019-04-21 15:59:07 -04:00
ce73841cdc
Improved LSAPI_End_Response_r() .
2019-04-21 15:04:54 -04:00
ccf051c317
Fixed bug in litespeed_finish_request(), disable fastcgi_finish_request() alias for now.
2019-04-21 14:59:51 -04:00
0b8414832e
Update changelog
2019-04-20 19:13:06 +02:00
2549f7d220
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Update changelog
Fix #77921 : static.php.net doesn't work anymore
2019-04-20 19:12:31 +02:00
295c66911f
Update changelog
2019-04-20 19:12:17 +02:00
4450288344
Fix #77921 : static.php.net doesn't work anymore
...
This embeds the PHP logo image in the FPM status HTML page instead of
using remote location. The phpinfo() output also uses such approach
and browser compatibility looks decent [1].
1: https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/Data_URIs
2019-04-20 19:00:51 +02:00
d1bce98597
Merge branch 'PHP-7.2' into PHP-7.3
...
* PHP-7.2:
Update Git repository for Windows build tool kit
2019-04-19 21:11:01 +02:00
06fa35568e
Update Git repository for Windows build tool kit
2019-04-19 21:09:46 +02:00
Christoph M. Becker