]>
granicus.if.org Git - php/log
Tyson Andre [Sun, 9 Sep 2018 00:45:10 +0000 (20:45 -0400)]
Fix a typo in a class catch in Phar
Dmitry Stogov [Thu, 13 Sep 2018 09:24:59 +0000 (12:24 +0300)]
Make visibilty check in is_callable() to be consistent with zend_std_get_method()
Anatol Belski [Thu, 13 Sep 2018 09:07:09 +0000 (11:07 +0200)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Backport changes for OpenSSL 1.1.1 CI integration
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 [Thu, 13 Sep 2018 08:06:49 +0000 (10:06 +0200)]
Fix typo
Anatol Belski [Thu, 13 Sep 2018 08:05:27 +0000 (10:05 +0200)]
Remove colliding file from CI image
Dmitry Stogov [Thu, 13 Sep 2018 07:31:49 +0000 (10:31 +0300)]
Split error code into "cold" functions and cleanup.
Dmitry Stogov [Thu, 13 Sep 2018 06:31:38 +0000 (09:31 +0300)]
Micro-optimization (condition reordering)
Dmitry Stogov [Thu, 13 Sep 2018 05:49:21 +0000 (08:49 +0300)]
typo
Anatol Belski [Wed, 12 Sep 2018 22:49:54 +0000 (00:49 +0200)]
More possibly colliding libs to remove from the test image
Dmitry Stogov [Wed, 12 Sep 2018 22:41:19 +0000 (01:41 +0300)]
Micro-optimization
Dmitry Stogov [Wed, 12 Sep 2018 20:47:52 +0000 (23:47 +0300)]
Avoid unnecesury iterations over parent classes, in case of no overriden private properties.
Anatol Belski [Wed, 12 Sep 2018 20:27:30 +0000 (22:27 +0200)]
Show all unmatched errors when test failed
Anatol Belski [Wed, 12 Sep 2018 17:59:20 +0000 (19:59 +0200)]
Add debug message for failing test parts
Dmitry Stogov [Wed, 12 Sep 2018 15:59:12 +0000 (18:59 +0300)]
Optimize method/property visibility checks
Anatol Belski [Wed, 12 Sep 2018 14:26:26 +0000 (16:26 +0200)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Improve error code matching
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:12:38 +0000 (12:12 +0200)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Update binary SDK version for AppVeyor
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:27:48 +0000 (12:27 +0300)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Fixed bug #76869 (Incorrect bypassing protected method accessibilty check).
Dmitry Stogov [Wed, 12 Sep 2018 09:16:50 +0000 (12:16 +0300)]
Fixed bug #76869 (Incorrect bypassing protected method accessibilty check).
Dmitry Stogov [Wed, 12 Sep 2018 08:43:15 +0000 (11:43 +0300)]
Better ZEND_ACC_CHANGED handling
Dmitry Stogov [Wed, 12 Sep 2018 06:57:36 +0000 (09:57 +0300)]
Optimisation: Check for private property in parent class makes sense only if we already found a property info. Check for property started with "\\0" makes sense only if we didn't find property info.
Dmitry Stogov [Wed, 12 Sep 2018 05:31:01 +0000 (08:31 +0300)]
Simplify method visibility checks
Ferenc Kovacs [Tue, 11 Sep 2018 22:08:34 +0000 (00:08 +0200)]
Merge branch 'PHP-7.3'
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
Dmitry Stogov [Tue, 11 Sep 2018 20:50:43 +0000 (23:50 +0300)]
Use Zend API helper functions
Dmitry Stogov [Tue, 11 Sep 2018 19:56:31 +0000 (22:56 +0300)]
This increment is not necessary anymore.
Dmitry Stogov [Tue, 11 Sep 2018 15:29:27 +0000 (18:29 +0300)]
Additional fix for bug #76860.
Christoph M. Becker [Tue, 11 Sep 2018 14:30:52 +0000 (16:30 +0200)]
Merge branch 'PHP-7.3'
* PHP-7.3:
[ci skip] Update NEWS wrt. php-7.3.RC1 tagging
Christoph M. Becker [Tue, 11 Sep 2018 14:28:36 +0000 (16:28 +0200)]
[ci skip] Update NEWS wrt. php-7.3.RC1 tagging
Dmitry Stogov [Tue, 11 Sep 2018 14:21:17 +0000 (17:21 +0300)]
Renumber ZEND_ACC_... flags
Dmitry Stogov [Tue, 11 Sep 2018 14:07:06 +0000 (17:07 +0300)]
Removed weird test, trait can't be "static" or "final".
Nikita Popov [Tue, 11 Sep 2018 13:16:11 +0000 (15:16 +0200)]
Drop unused variable
Dmitry Stogov [Tue, 11 Sep 2018 11:54:11 +0000 (14:54 +0300)]
Use mnemonic names
Christoph M. Becker [Tue, 11 Sep 2018 10:23:50 +0000 (12:23 +0200)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Fix #76510: file_exists() stopped working for phar://
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>
Dmitry Stogov [Tue, 11 Sep 2018 09:26:26 +0000 (12:26 +0300)]
Get rid of ZEND_ACC_IMPLICIT_PUBLIC
Dmitry Stogov [Tue, 11 Sep 2018 09:10:14 +0000 (12:10 +0300)]
Added test for bug #76860 (Missed "Accessing static property as non static" warning).
It's already fixed by previous commit.
Dmitry Stogov [Tue, 11 Sep 2018 08:56:45 +0000 (11:56 +0300)]
Squashed commit of the following:
commit
2d3cac9e005d6bef9aa73ab57cc674aa53125954
Author: Dmitry Stogov <dmitry@zend.com>
Date: Tue Sep 11 11:54:47 2018 +0300
Fixed static property access
commit
31786ee27282f319f3ef2a07635b1f325cbd67c6
Author: Dmitry Stogov <dmitry@zend.com>
Date: Tue Sep 11 11:05:29 2018 +0300
Avoid duplicate checks
commit
5ae502b979ea33d058d01a9421eec5afd0084e8d
Author: Dmitry Stogov <dmitry@zend.com>
Date: Tue Sep 11 10:39:17 2018 +0300
Optimization
commit
82c17f0e8af02c9cf7d1bbdae4e3158330148203
Author: Dmitry Stogov <dmitry@zend.com>
Date: Tue Sep 11 09:26:50 2018 +0300
Removed unused zend_duplicate_property_info()
commit
ba53d1d0dd91d5530328a11cac93ff9e75c462b5
Merge:
eacc11b8fd c4b14370cf
Author: Dmitry Stogov <dmitry@zend.com>
Date: Tue Sep 11 09:24:13 2018 +0300
Merge branch 'master' into shadow
* master:
7.0.33 next
Sync NEWS [ci skip]
add NEWS for 76582
Enforce ordering of property compare in object comparisons
Fixed wrong assertion
Skip test on unsuitable env
commit
eacc11b8fdeb002ee6a149defd8b5a8c3412896a
Author: Dmitry Stogov <dmitry@zend.com>
Date: Mon Sep 10 13:12:39 2018 +0300
Fixed failure of ext/spl/tests/array_017.phpt
commit
62d1871430a1b81c84b790460afff0682648689a
Author: Dmitry Stogov <dmitry@zend.com>
Date: Mon Sep 10 11:55:07 2018 +0300
Fixed issues
commit
1d37e3a40e4d07c4b933ed6f9d2e649dd01180f0
Merge:
d6c3f098b6 1e550e6f7e
Author: Dmitry Stogov <dmitry@zend.com>
Date: Mon Sep 10 10:21:20 2018 +0300
Merge branch 'master' into shadow
* master:
Update NEWS
Fix for bug #76582
Fix ssl stream reneg limit test to print only after first renegotiation
Make a copy unconditionally
Fix memory leak in pcre cache
Remove not needed checking for <errno.h>
Remove HAVE_ASSERT_H
Add test for bug #76850
Fixed bug #76850 Exit code mangled by set locale/preg_match
Remove empty PHP tags from test
Fix #75273: php_zlib_inflate_filter() may not update bytes_consumed
Fix PCRE2 exclusion and remove dead libs in Makefile.gcov
Report mem leaks to stderr if no Win debugger is present
Use combined assignment contanation operator
Fixed bug #76796
Support fixed address mmap without replacement
commit
d6c3f098b6015e76d042691de0af2e1426c66829
Author: Dmitry Stogov <dmitry@zend.com>
Date: Fri Sep 7 13:56:30 2018 +0300
Get rid of ZEND_ACC_SHADOW
Anatol Belski [Tue, 11 Sep 2018 05:02:03 +0000 (07:02 +0200)]
Merge branch 'PHP-7.3'
* PHP-7.3:
7.0.33 next
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:42 +0000 (16:58 +0200)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Sync NEWS [ci skip]
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:22 +0000 (15:31 +0200)]
Merge branch 'PHP-7.3'
* PHP-7.3:
add NEWS for 76582
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 [Mon, 10 Sep 2018 12:56:19 +0000 (08:56 -0400)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Enforce ordering of property compare in object comparisons
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:27:48 +0000 (15:27 +0300)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Fixed wrong assertion
Dmitry Stogov [Mon, 10 Sep 2018 12:26:38 +0000 (15:26 +0300)]
Fixed wrong assertion
Anatol Belski [Mon, 10 Sep 2018 07:51:58 +0000 (09:51 +0200)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Skip test on unsuitable env
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:41 +0000 (12:29 -0700)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Update NEWS
Fix for bug #76582
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 18:00:37 +0000 (19:00 +0100)]
Merge branch 'PHP-7.3'
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:43:34 +0000 (10:43 +0200)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Make a copy unconditionally
Anatol Belski [Sun, 9 Sep 2018 08:42:53 +0000 (10:42 +0200)]
Make a copy unconditionally
Anatol Belski [Sun, 9 Sep 2018 08:39:15 +0000 (10:39 +0200)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Fix memory leak in pcre cache
Anatol Belski [Sun, 9 Sep 2018 08:38:36 +0000 (10:38 +0200)]
Fix memory leak in pcre cache
Peter Kokot [Wed, 5 Sep 2018 19:34:40 +0000 (21:34 +0200)]
Remove not needed checking for <errno.h>
Header `<errno.h>` is part of the standard C89 headers [1] and on
current systems checking is not need anymore since PHP requires at
least C89. This is noted also by Autoconf itself in the docs and
code [2].
The Autoconf check defined the `HAVE_ERRNO_H` symbol when building PHP
with sockets extension or fpm sapi. This symbol is not utilized across
the PHP source code except in the current version of bundled GD library
which has worked ok so far also with sockets extension or fpm sapi
disabled anyway.
Refs:
[1] https://port70.net/~nsz/c/c89/c89-draft.html#4.1.2
[2] https://git.savannah.gnu.org/cgit/autoconf.git/tree/lib/autoconf/headers.m4
Peter Kokot [Tue, 4 Sep 2018 22:09:56 +0000 (00:09 +0200)]
Remove HAVE_ASSERT_H
The `<assert.h>` header file is part of the standard C89 headers [1] and
on older systems there needed to be also a manual check if header is
present.
Since PHP requires at least C89 manual check and the `HAVE_ASSERT_H`
symbol defined by Autoconf in configure.ac can be both removed [2].
This patch also removes unused <assert.h> includes where c files don't
use the `assert()` macro.
Refs:
[1] https://port70.net/~nsz/c/c89/c89-draft.html#4.2
[2] https://git.savannah.gnu.org/cgit/autoconf.git/tree/lib/autoconf/headers.m4
Anatol Belski [Sat, 8 Sep 2018 19:40:14 +0000 (21:40 +0200)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Add test for bug #76850
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:38:05 +0000 (21:38 +0200)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Fixed bug #76850 Exit code mangled by set locale/preg_match
Anatol Belski [Sat, 8 Sep 2018 19:35:23 +0000 (21:35 +0200)]
Fixed bug #76850 Exit code mangled by set locale/preg_match
Gabriel Caruso [Sat, 8 Sep 2018 19:28:48 +0000 (16:28 -0300)]
Remove empty PHP tags from test
Christoph M. Becker [Sat, 8 Sep 2018 17:14:22 +0000 (19:14 +0200)]
Merge branch 'PHP-7.3'
* PHP-7.3:
Fix #75273: php_zlib_inflate_filter() may not update bytes_consumed
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.
Gabriel Caruso [Fri, 7 Sep 2018 19:30:28 +0000 (16:30 -0300)]
Fix PCRE2 exclusion and remove dead libs in Makefile.gcov
Christoph M. Becker [Sat, 8 Sep 2018 11:57:01 +0000 (13:57 +0200)]
Report mem leaks to stderr if no Win debugger is present
Formerly, we sent output regarding memory leaks always to the debugger
on Windows, but this appears to be not useful especially for the PHPTs,
which usually are not run under a debugger, and so important info will
not be available there.
Gabriel Caruso [Sat, 8 Sep 2018 02:33:17 +0000 (23:33 -0300)]
Use combined assignment contanation operator
Nikita Popov [Fri, 7 Sep 2018 12:03:04 +0000 (14:03 +0200)]
Merge branch 'PHP-7.3'
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