]>
granicus.if.org Git - php/log
Dmitry Stogov [Fri, 14 Sep 2018 07:32:31 +0000 (10:32 +0300)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fixed bug #76800 (foreach inconsistent if array modified during loop)
Dmitry Stogov [Fri, 14 Sep 2018 07:28:31 +0000 (10:28 +0300)]
Fixed bug #76800 (foreach inconsistent if array modified during loop)
Anatol Belski [Thu, 13 Sep 2018 17:27:29 +0000 (19:27 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Sync version for vc++ 15.9
Anatol Belski [Thu, 13 Sep 2018 17:26:49 +0000 (19:26 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Sync version for vc++ 15.9
Anatol Belski [Thu, 13 Sep 2018 17:25:23 +0000 (19:25 +0200)]
Sync version for vc++ 15.9
Anatol Belski [Thu, 13 Sep 2018 09:06:47 +0000 (11:06 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Backport changes for OpenSSL 1.1.1 CI integration
Anatol Belski [Wed, 12 Sep 2018 17:59:20 +0000 (19:59 +0200)]
Backport changes for OpenSSL 1.1.1 CI integration
Add debug message for failing test parts
(cherry picked from commit
a45169a6ba54b13484d70cb474679c96347f779b )
Show all unmatched errors when test failed
(cherry picked from commit
70159652541c62b5f3bbb26da76b7e56987b2544 )
More possibly colliding libs to remove from the test image
(cherry picked from commit
3008ad1a49210e4604522a987cbdd27a5a0a2c42 )
Remove colliding file from CI image
(cherry picked from commit
6220d21c3420ff0d7366d410920ba5279fba3893 )
Fix typo
(cherry picked from commit
24517d82cf8dc708d08bc77435ad418de4bdff4e )
Anatol Belski [Wed, 12 Sep 2018 14:25:39 +0000 (16:25 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Improve error code matching
Anatol Belski [Wed, 12 Sep 2018 14:24:38 +0000 (16:24 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Improve error code matching
Anatol Belski [Wed, 12 Sep 2018 14:22:22 +0000 (16:22 +0200)]
Improve error code matching
Anatol Belski [Wed, 12 Sep 2018 10:11:47 +0000 (12:11 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Update binary SDK version for AppVeyor
Anatol Belski [Wed, 12 Sep 2018 10:11:07 +0000 (12:11 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Update binary SDK version for AppVeyor
Anatol Belski [Wed, 12 Sep 2018 10:09:32 +0000 (12:09 +0200)]
Update binary SDK version for AppVeyor
Dmitry Stogov [Wed, 12 Sep 2018 09:16:50 +0000 (12:16 +0300)]
Fixed bug #76869 (Incorrect bypassing protected method accessibilty check).
Ferenc Kovacs [Tue, 11 Sep 2018 22:06:33 +0000 (00:06 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Ferenc Kovacs [Tue, 11 Sep 2018 22:04:40 +0000 (00:04 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
Ferenc Kovacs [Tue, 11 Sep 2018 22:02:18 +0000 (00:02 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Ferenc Kovacs [Tue, 11 Sep 2018 22:00:46 +0000 (00:00 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Ferenc Kovacs [Tue, 11 Sep 2018 21:58:17 +0000 (23:58 +0200)]
5.6.39 will be the next
Christoph M. Becker [Tue, 11 Sep 2018 14:28:36 +0000 (16:28 +0200)]
[ci skip] Update NEWS wrt. php-7.3.RC1 tagging
Christoph M. Becker [Tue, 11 Sep 2018 10:23:20 +0000 (12:23 +0200)]
Fix #76510: file_exists() stopped working for phar://
We work around a strlen() optimization bug in GCC 8[1] by checking
whether the used GCC exhibits the broken behavior, and if so by
disabling `optimize-strlen`.
[1] <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=86914>
Anatol Belski [Tue, 11 Sep 2018 05:01:44 +0000 (07:01 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
7.0.33 next
Anatol Belski [Tue, 11 Sep 2018 05:01:18 +0000 (07:01 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
7.0.33 next
Anatol Belski [Tue, 11 Sep 2018 05:00:48 +0000 (07:00 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
7.0.33 next
Anatol Belski [Tue, 11 Sep 2018 05:00:15 +0000 (07:00 +0200)]
7.0.33 next
Anatol Belski [Mon, 10 Sep 2018 14:58:33 +0000 (16:58 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Sync NEWS [ci skip]
Anatol Belski [Mon, 10 Sep 2018 14:58:02 +0000 (16:58 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Sync NEWS [ci skip]
Anatol Belski [Mon, 10 Sep 2018 14:57:24 +0000 (16:57 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Sync NEWS [ci skip]
Anatol Belski [Mon, 10 Sep 2018 14:56:37 +0000 (16:56 +0200)]
Sync NEWS [ci skip]
Remi Collet [Mon, 10 Sep 2018 13:31:08 +0000 (15:31 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
add NEWS for 76582
Remi Collet [Mon, 10 Sep 2018 13:30:51 +0000 (15:30 +0200)]
add NEWS for 76582
Sara Golemon [Sat, 11 Aug 2018 15:19:28 +0000 (11:19 -0400)]
Enforce ordering of property compare in object comparisons
Dmitry Stogov [Mon, 10 Sep 2018 12:26:38 +0000 (15:26 +0300)]
Fixed wrong assertion
Anatol Belski [Mon, 10 Sep 2018 07:48:18 +0000 (09:48 +0200)]
Skip test on unsuitable env
Stanislav Malyshev [Sun, 9 Sep 2018 19:29:34 +0000 (12:29 -0700)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Update NEWS
Fix for bug #76582
Stanislav Malyshev [Sun, 9 Sep 2018 19:29:29 +0000 (12:29 -0700)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Update NEWS
Fix for bug #76582
Stanislav Malyshev [Sun, 9 Sep 2018 19:29:23 +0000 (12:29 -0700)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Update NEWS
Fix for bug #76582
Stanislav Malyshev [Sun, 9 Sep 2018 19:27:44 +0000 (12:27 -0700)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Update NEWS
Fix for bug #76582
Stanislav Malyshev [Sun, 9 Sep 2018 19:19:38 +0000 (12:19 -0700)]
Update NEWS
Stanislav Malyshev [Sun, 29 Jul 2018 05:16:29 +0000 (22:16 -0700)]
Fix for bug #76582
The brigade seems to end up in a messed up state if something fails
in shutdown, so we clean it up.
Jakub Zelenka [Sun, 9 Sep 2018 17:59:47 +0000 (18:59 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
Jakub Zelenka [Sun, 9 Sep 2018 17:58:23 +0000 (18:58 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
Jakub Zelenka [Sun, 9 Sep 2018 17:53:37 +0000 (18:53 +0100)]
Fix ssl stream reneg limit test to print only after first renegotiation
It has been reported that in some setup the test does multiple
renegotiations which is allowed.
Anatol Belski [Sun, 9 Sep 2018 08:42:53 +0000 (10:42 +0200)]
Make a copy unconditionally
Anatol Belski [Sun, 9 Sep 2018 08:38:36 +0000 (10:38 +0200)]
Fix memory leak in pcre cache
Anatol Belski [Sat, 8 Sep 2018 19:39:54 +0000 (21:39 +0200)]
Add test for bug #76850
Anatol Belski [Sat, 8 Sep 2018 19:35:23 +0000 (21:35 +0200)]
Fixed bug #76850 Exit code mangled by set locale/preg_match
Christoph M. Becker [Sat, 8 Sep 2018 17:12:14 +0000 (19:12 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #75273: php_zlib_inflate_filter() may not update bytes_consumed
Christoph M. Becker [Sat, 8 Sep 2018 17:08:59 +0000 (19:08 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix #75273: php_zlib_inflate_filter() may not update bytes_consumed
Christoph M. Becker [Sat, 8 Sep 2018 16:27:57 +0000 (18:27 +0200)]
Fix #75273: php_zlib_inflate_filter() may not update bytes_consumed
Whenever we return with `PSFS_PASS_ON`, we need to update
`bytes_consumed` to not mislead the caller. Instead of fixing the
respective `if` clauses, we eschew the early bail-outs to simplify the
code a bit.
Nikita Popov [Fri, 7 Sep 2018 12:02:36 +0000 (14:02 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Fri, 7 Sep 2018 12:02:03 +0000 (14:02 +0200)]
Fixed bug #76796
David Carlier [Wed, 29 Aug 2018 20:04:32 +0000 (21:04 +0100)]
Support fixed address mmap without replacement
Reapply changes for Zend fixed mapping but only for FreeBSD.
Other BSD might expose some day a similar flag (private
for OpenBSD for the moment for example).
The Linux's part could be brought back but not before 7.4,
at this time, distributions with kernel > 4.17 will be
more widely available.
Anatol Belski [Wed, 5 Sep 2018 19:30:25 +0000 (21:30 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Sync with recent changes to default libcurl build
Anatol Belski [Wed, 5 Sep 2018 19:29:53 +0000 (21:29 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Sync with recent changes to default libcurl build
Anatol Belski [Wed, 5 Sep 2018 15:40:25 +0000 (17:40 +0200)]
Sync with recent changes to default libcurl build
(cherry picked from commit
a1ba3007a452fb2618526ed7159236362219a208 )
Dmitry Stogov [Wed, 5 Sep 2018 19:11:10 +0000 (22:11 +0300)]
Fixed support for commutative "user opcodes"
Christoph M. Becker [Wed, 5 Sep 2018 13:10:27 +0000 (15:10 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #74454: Wrong exception being thrown when using ReflectionMethod
Christoph M. Becker [Wed, 5 Sep 2018 13:07:59 +0000 (15:07 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix #74454: Wrong exception being thrown when using ReflectionMethod
Christoph M. Becker [Wed, 5 Sep 2018 13:05:19 +0000 (15:05 +0200)]
Fix #74454: Wrong exception being thrown when using ReflectionMethod
If zend_throw_exception_ex() already threw an exception, we should not
throw again.
Tyson Andre [Wed, 5 Sep 2018 00:35:51 +0000 (20:35 -0400)]
Fix typos in UPGRADING.INTERNALS
Anatol Belski [Tue, 4 Sep 2018 11:03:17 +0000 (13:03 +0200)]
Restore NEWS entry [skip ci]
Xinchen Hui [Tue, 4 Sep 2018 09:27:41 +0000 (17:27 +0800)]
Merge branch 'PHP-7.3' of git.php.net:/php-src into PHP-7.3
* 'PHP-7.3' of git.php.net:/php-src:
Fix bug #74764 and add a test case
[ci skip] Update NEWS
[ci skip] Update NEWS
[ci skip] Update NEWS
Xinchen Hui [Tue, 4 Sep 2018 09:26:46 +0000 (17:26 +0800)]
Fixed bug #76825 (Undefined symbols ___cpuid_count)
Joe Watkins [Tue, 4 Sep 2018 09:12:57 +0000 (11:12 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix bug #74764 and add a test case
Joe Watkins [Tue, 4 Sep 2018 09:12:26 +0000 (11:12 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix bug #74764 and add a test case
Ville Hukkamaki [Tue, 28 Aug 2018 21:26:13 +0000 (23:26 +0200)]
Fix bug #74764 and add a test case
Anatol Belski [Tue, 4 Sep 2018 09:03:33 +0000 (11:03 +0200)]
[ci skip] Update NEWS
Anatol Belski [Tue, 4 Sep 2018 09:03:01 +0000 (11:03 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
[ci skip] Update NEWS
[ci skip] Update NEWS
Anatol Belski [Tue, 4 Sep 2018 09:02:26 +0000 (11:02 +0200)]
[ci skip] Update NEWS
Anatol Belski [Tue, 4 Sep 2018 09:01:57 +0000 (11:01 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
[ci skip] Update NEWS
Anatol Belski [Tue, 4 Sep 2018 09:01:24 +0000 (11:01 +0200)]
[ci skip] Update NEWS
Anatol Belski [Tue, 4 Sep 2018 08:57:25 +0000 (10:57 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fixed bug #76833, backport change to stream_socket_enable_crypto-win32.phpt from 7.3
Anatol Belski [Tue, 4 Sep 2018 08:51:14 +0000 (10:51 +0200)]
Fixed bug #76833, backport change to stream_socket_enable_crypto-win32.phpt from 7.3
It would probably be better to remove this test as it's too much
maintanance for a little gain.
Nikita Popov [Tue, 4 Sep 2018 06:08:39 +0000 (08:08 +0200)]
Fix incorrect literal freeing if pass_two generates fatal error
Nikita Popov [Tue, 4 Sep 2018 03:57:07 +0000 (05:57 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Tue, 4 Sep 2018 03:49:02 +0000 (05:49 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
Nikita Popov [Tue, 4 Sep 2018 03:45:45 +0000 (05:45 +0200)]
Revert all MySQL auth related changes
Per bug #76651 these changes do not appear to work correctly in
some cases. As no immediate fix seems to be forthcoming, I'm
reverting these changes.
Revert "Fixed invalid free introduced by
d6e81f0bfd0cb90586dd83d4fd47a4302605261a (avoid keeping "invalid" pointer)"
This reverts commit
11507c0e1bfa17a96480f3648397f6975c31551e .
Revert "Fix mysqlnd build without openssl"
This reverts commit
6c9db02ff7812c298d1e7e292ba731d9d3a66790 .
Revert "Fix VC compilation as variable size array is not supported"
This reverts commit
f96df64cb2219fda42ca875483f874cf3052647c .
Revert "Fix MySQL 8 auth"
This reverts commit
d6e81f0bfd0cb90586dd83d4fd47a4302605261a .
Nikita Popov [Tue, 4 Sep 2018 03:32:52 +0000 (05:32 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Tue, 4 Sep 2018 03:32:42 +0000 (05:32 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
Nikita Popov [Tue, 4 Sep 2018 03:32:25 +0000 (05:32 +0200)]
Fix parenthesis warning
Peter Kokot [Wed, 13 Jun 2018 02:36:55 +0000 (04:36 +0200)]
Fix bug #75481: makedev warning
To use makedev the sys/sysmacros.h needs to be included on newer
systems.
Cherry-picked from PHP-7.3.
Nikita Popov [Tue, 4 Sep 2018 03:07:43 +0000 (05:07 +0200)]
Escape trigraph sequence
??= is a trigraph for #, so it needs to be escaped. To stay
consistent I'm escaping all question marks in this literal, even
though one of the latter two would suffice.
Nikita Popov [Tue, 4 Sep 2018 02:57:13 +0000 (04:57 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Nikita Popov [Tue, 4 Sep 2018 02:55:15 +0000 (04:55 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
Ville Hukkamaki [Fri, 24 Aug 2018 20:49:53 +0000 (22:49 +0200)]
Fixed bug #73457
Correctly report errors when opening FTP data connection.
Anatol Belski [Mon, 3 Sep 2018 13:11:10 +0000 (15:11 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fixed bug #76832 ZendOPcache.MemoryBase periodically deleted by the OS
Anatol Belski [Mon, 3 Sep 2018 13:10:25 +0000 (15:10 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed bug #76832 ZendOPcache.MemoryBase periodically deleted by the OS
Anatol Belski [Mon, 3 Sep 2018 13:09:23 +0000 (15:09 +0200)]
Fixed bug #76832 ZendOPcache.MemoryBase periodically deleted by the OS
Christoph M. Becker [Mon, 3 Sep 2018 10:09:20 +0000 (12:09 +0200)]
Update to Oniguruma 6.9.0
Dmitry Stogov [Mon, 3 Sep 2018 07:21:42 +0000 (10:21 +0300)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fixed reference-countingin ZTS build.
Dmitry Stogov [Mon, 3 Sep 2018 07:21:32 +0000 (10:21 +0300)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed reference-countingin ZTS build.
Dmitry Stogov [Mon, 3 Sep 2018 07:20:40 +0000 (10:20 +0300)]
Fixed reference-countingin ZTS build.
Jakub Zelenka [Sun, 2 Sep 2018 19:02:09 +0000 (20:02 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
Jakub Zelenka [Sun, 2 Sep 2018 19:00:08 +0000 (20:00 +0100)]
Fix stream_security_level.phpt with OpenSSL 1.1.1
Christoph M. Becker [Sat, 1 Sep 2018 12:29:26 +0000 (14:29 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #75696: posix_getgrnam fails to print details of group
Christoph M. Becker [Sat, 1 Sep 2018 12:27:31 +0000 (14:27 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix #75696: posix_getgrnam fails to print details of group
Christoph M. Becker [Fri, 24 Aug 2018 15:59:44 +0000 (17:59 +0200)]
Fix #75696: posix_getgrnam fails to print details of group
According to the POSIX specification of `getgrnam_r()` the result of
`sysconf(_SC_GETGR_R_SIZE_MAX)` is an initial value suggested for the
size of the buffer, and `ERANGE` signals that insufficient storage was
supplied. So if we get `ERANGE`, we try again with a buffer twice as
big, and so on, instead of failing.
Anatol Belski [Sat, 1 Sep 2018 09:33:39 +0000 (11:33 +0200)]
[ci skip] Update NEWS
Anatol Belski [Fri, 31 Aug 2018 23:12:06 +0000 (01:12 +0200)]
Improve fix for bug #76829