Anatol Belski
096fd88dcb
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Prepare tests for ICU 62.1
2018-06-25 11:31:21 +02:00
Anatol Belski
5af0db88fa
Prepare tests for ICU 62.1
2018-06-25 11:30:14 +02:00
Nikita Popov
14b22704c7
Merge branch 'PHP-7.1' into PHP-7.2
2018-06-24 22:28:57 +02:00
Nikita Popov
701460ba84
Fixed bug #76502
2018-06-24 22:26:45 +02:00
Nikita Popov
ed9d1b708b
Fixed bug #76520
2018-06-22 16:22:04 +02:00
Dmitry Stogov
4a4c72a82a
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Added parenthesis
2018-06-22 12:04:39 +03:00
Dmitry Stogov
1f726c9925
Added parenthesis
2018-06-22 12:04:23 +03:00
Jakub Zelenka
d95ee27551
Make new openssl ext tests in 7.2 consitent
2018-06-21 17:02:44 +01:00
Jakub Zelenka
77bd405959
Merge branch 'PHP-7.1' into PHP-7.2
2018-06-21 16:47:08 +01:00
Jakub Zelenka
b20bcbc363
Use unix NL in all openssl ext tests
2018-06-21 16:43:32 +01:00
Jakub Zelenka
3c42f64e6e
Make code in openssl ext tests more consistent
...
Mainly use spaces for indent and fix some other CS issues. Also
drop checks for unsupported OpenSSL library versions.
2018-06-21 16:38:19 +01:00
Xinchen Hui
e62c6e7dbe
Update NEWS
2018-06-21 17:26:45 +08:00
Xinchen Hui
939e1095f2
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Fixed bug #76505 (array_merge_recursive() is duplicating sub-array keys)
2018-06-21 17:26:27 +08:00
Xinchen Hui
6531719da5
Fixed bug #76505 (array_merge_recursive() is duplicating sub-array keys)
2018-06-21 17:26:05 +08:00
Stanislav Malyshev
011be49dda
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Revert "ICU 59+ requires C++11 and errors out without the option"
2018-06-20 10:41:59 -07:00
Stanislav Malyshev
bcf2e10ae7
Revert "ICU 59+ requires C++11 and errors out without the option"
...
This reverts commit 5dd1ef90ca .
2018-06-20 10:41:41 -07:00
Nikita Popov
44f4d2be01
Merge branch 'PHP-7.1' into PHP-7.2
2018-06-20 12:30:19 +02:00
Nikita Popov
69dee5c732
Fixed bug #73342
...
Directly listen on socket, instead of duping it to STDIN and
listening on that.
2018-06-20 12:28:15 +02:00
Stanislav Malyshev
61a4fc4e44
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
ICU 59+ requires C++11 and errors out without the option
2018-06-17 16:42:49 -07:00
Stanislav Malyshev
5dd1ef90ca
ICU 59+ requires C++11 and errors out without the option
2018-06-17 16:42:41 -07:00
Pedro Magalhães
13e9a471d7
Fix #76300 - Dont attempt to change visibility of a parent private
2018-06-17 15:53:55 -07:00
Xinchen Hui
f31ba7cb53
Fixed bug #76477 (Opcache causes empty return value)
2018-06-15 16:31:31 +08:00
Dmitry Stogov
dad8bd5851
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Fixed invalid free introduced by d6e81f0bfd (avoid keeping "invalid" pointer)
2018-06-14 02:40:59 +03:00
Dmitry Stogov
11507c0e1b
Fixed invalid free introduced by d6e81f0bfd (avoid keeping "invalid" pointer)
2018-06-14 02:38:39 +03:00
Nikita Popov
d04a1e8d70
Merge branch 'PHP-7.1' into PHP-7.2
2018-06-13 23:48:28 +02:00
Nikita Popov
e77077edeb
Make $locale parameter to BreakIterator ctors optional
...
It's documented as such and already accepts null.
2018-06-13 23:47:20 +02:00
Jakub Zelenka
dd622f9ca9
Port FPM test 023 and 024 to the new FPM testing
2018-06-12 18:09:27 +01:00
Jakub Zelenka
bc58ba750f
Merge branch 'PHP-7.1' into PHP-7.2
2018-06-12 18:03:01 +01:00
Jakub Zelenka
ea592e6b6c
Rewrite FPM tests
2018-06-12 17:59:28 +01:00
Anatol Belski
827cb0484e
[ci skip] Update NEWS
2018-06-12 18:07:35 +02:00
Anatol Belski
87cb883563
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
[ci skip] Update NEWS
2018-06-12 18:07:11 +02:00
Anatol Belski
62554efffe
[ci skip] Update NEWS
2018-06-12 18:06:41 +02:00
Anatol Belski
5f1190684f
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Fixed bug #76462 Undefined property: DateInterval::$f
2018-06-12 15:31:01 +02:00
Anatol Belski
7212829435
Fixed bug #76462 Undefined property: DateInterval::$f
2018-06-12 15:30:14 +02:00
Remi Collet
eb2a3c6c65
NEWS
2018-06-12 09:35:52 +02:00
Remi Collet
075e685439
Add OPSYS_CPM constant as documented and to match libzip naming
2018-06-12 09:31:41 +02:00
Anatol Belski
7dcfa839c9
Remove inappropriate FreeLibrary call
2018-06-11 13:49:42 +02:00
Nikita Popov
3d7284d09e
Merge branch 'PHP-7.1' into PHP-7.2
2018-06-10 21:21:11 +02:00
Nikita Popov
6c9db02ff7
Fix mysqlnd build without openssl
...
Cherry-pick of 968eb0b38c , as these
changes were also introduced in lower branches.
2018-06-10 21:20:28 +02:00
Jakub Zelenka
bca6d373fc
Merge branch 'PHP-7.1' into PHP-7.2
2018-06-10 14:33:28 +01:00
Anatol Belski
66badcdc0c
Fix test portability
2018-06-09 20:57:17 +02:00
Christoph M. Becker
3fdde65617
Fix #76409 : heap use after free in _php_stream_free
...
We must not close the stream in exif_read_from_impl(), since it is the
responsibility of the (caller's) caller to do so, if it actually opened
the stream.
We simplify the reproduce script, which is actually about supplying a
path to a directory (opposed to a regular file), and use `.` instead of
`/` to also make it work on Windows.
2018-06-09 17:52:05 +02:00
Nikita Popov
e029019275
Deduplicate code using php_timezone_to_string()
...
Looks like this usage was overlooked when the function was
introduced.
2018-06-08 23:10:43 +02:00
David Carlier
ad52ec3db8
cast to int to disable compilation warnings.
2018-06-08 23:08:42 +02:00
Keyur Govande
695b8192c7
Avoid leaking the urandom fd
...
When Apache is reloaded, it unloads the extension, but the open file descriptor to /dev/urandom is left hanging around and is leaked. This fixes the bug.
Duplicate of https://github.com/jedisct1/libsodium-php/pull/173
2018-06-08 23:01:57 +02:00
Jakub Zelenka
f9d1d1f36f
Enable IPv6 in Travis
2018-06-08 20:09:33 +01:00
Joe Watkins
e9b8193b24
bump versions
2018-06-07 08:19:43 +02:00
Anatol Belski
0bafb530d6
Merge branch 'PHP-7.1' into PHP-7.2
...
* PHP-7.1:
Fix VC compilation as variable size array is not supported
Fix MySQL 8 auth
2018-06-06 11:14:15 +02:00
Anatol Belski
f96df64cb2
Fix VC compilation as variable size array is not supported
2018-06-06 11:13:28 +02:00
Johannes Schlüter
04db3d0f7a
Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1
2018-06-06 00:24:41 +02:00