]>
granicus.if.org Git - php/log
Michael Orlitzky [Sat, 10 Sep 2016 15:20:50 +0000 (11:20 -0400)]
Use AX_CHECK_COMPILE_FLAG macro to check for -fvisibility=hidden support.
The existing check for -fvisibility=hidden support came from a time
when only GCC had it. The test for it used a regular expression to
parse the GCC major version from the output of `$CC --version`, and
would look for version 4 or greater.
The regular expression used to accomplish this is doomed, however,
since GCC can be built with a custom version string
(--with-pkgversion). Moreover, the $CC variable can be set to
something that confuses it but is otherwise valid. For example, it
would fail with CC=x86_64-pc-linux-gnu-gcc.
This commit fixes two aspects of the feature test. First, it no longer
limits the test to GCC. At least clang now supports the flag, and can
make use of it when GCC is its backend. Second, support for the flag
is tested directly, by attempting to pass it to the compiler, rather
than by parsing its version string. The latter is accomplished with a
new macro, AX_CHECK_COMPILE_FLAG, taken from the autoconf archive.
The new macro has been added to acinclude.m4, and the test stanza in
configure.in has been replaced with a single call to the new macro.
Note that the new macro calls AC_PREREQ(2.64) -- a more stringent
requirement than the existing AC_PREREQ(2.59) in configure.in. The
difference represents about six years of autoconf releases, from v2.59
in December of 2003 to v2.64 in July of 2009.
This problem was noticed by Brian Evans, who also suggested the fix.
PHP-Bug: 73062
Nikita Popov [Fri, 9 Sep 2016 14:03:21 +0000 (16:03 +0200)]
Merge branch 'PHP-7.1'
Nikita Popov [Fri, 9 Sep 2016 14:02:48 +0000 (16:02 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Fri, 9 Sep 2016 13:58:36 +0000 (15:58 +0200)]
Fix some block_pass bugs
Nikita Popov [Fri, 9 Sep 2016 13:47:04 +0000 (15:47 +0200)]
Merge branch 'PHP-7.1'
Nikita Popov [Fri, 9 Sep 2016 13:45:46 +0000 (15:45 +0200)]
Compile intval() etc to casts
Nikita Popov [Fri, 9 Sep 2016 13:31:54 +0000 (15:31 +0200)]
Merge branch 'PHP-7.1'
Nikita Popov [Thu, 8 Sep 2016 21:08:57 +0000 (23:08 +0200)]
Add fast paths for bitwise operators
Christoph M. Becker [Fri, 9 Sep 2016 12:48:27 +0000 (14:48 +0200)]
Merge branch 'PHP-7.1'
Christoph M. Becker [Fri, 9 Sep 2016 12:42:30 +0000 (14:42 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Fri, 9 Sep 2016 12:33:01 +0000 (14:33 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Fri, 9 Sep 2016 12:30:24 +0000 (14:30 +0200)]
Fix #73054: default option ignored when object passed to int filter
If an object that can't be converted to string is validated, we must not
bail out early, but rather check for a requested default value.
Christoph M. Becker [Fri, 9 Sep 2016 10:58:14 +0000 (12:58 +0200)]
Merge branch 'PHP-7.1'
Christoph M. Becker [Fri, 9 Sep 2016 10:53:35 +0000 (12:53 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Fri, 9 Sep 2016 10:47:23 +0000 (12:47 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Levi Morrison [Thu, 3 Sep 2015 00:23:26 +0000 (18:23 -0600)]
Partially fix bug #67167 - Wrong return value...
...from FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE
The remainer of the fix would require the filter functions to only
convert to string when it makes sense for that particular filter.
(cherry picked from commit
432dc527adcbc3bf4809f6315350300d42c16c52 )
Yasuo Ohgaki [Fri, 9 Sep 2016 02:40:25 +0000 (11:40 +0900)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Update NEWS
Fixed Bug #68015 Session does not report invalid uid for files save handler
Yasuo Ohgaki [Fri, 9 Sep 2016 02:39:40 +0000 (11:39 +0900)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Update NEWS
Fixed Bug #68015 Session does not report invalid uid for files save handler
Yasuo Ohgaki [Fri, 9 Sep 2016 02:34:34 +0000 (11:34 +0900)]
Update NEWS
Yasuo Ohgaki [Fri, 9 Sep 2016 02:32:20 +0000 (11:32 +0900)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fixed Bug #68015 Session does not report invalid uid for files save handler
Yasuo Ohgaki [Fri, 9 Sep 2016 02:30:33 +0000 (11:30 +0900)]
Fixed Bug #68015 Session does not report invalid uid for files save handler
Christoph M. Becker [Thu, 8 Sep 2016 18:04:10 +0000 (20:04 +0200)]
Fix broken test case
Patch provided by Charles R. Portwood II.
Christoph M. Becker [Thu, 8 Sep 2016 17:59:21 +0000 (19:59 +0200)]
Update UPGRADING wrt. [RFC]: Add Argon2 to password_*
Christoph M. Becker [Thu, 8 Sep 2016 16:55:40 +0000 (18:55 +0200)]
Fix skip messages
Anatol Belski [Thu, 8 Sep 2016 15:53:21 +0000 (17:53 +0200)]
Merge branch 'master' of git.php.net:php-src
Anatol Belski [Thu, 8 Sep 2016 15:51:24 +0000 (17:51 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
backport
59444347 and
3d7343f6
Anatol Belski [Thu, 8 Sep 2016 15:50:46 +0000 (17:50 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
backport
59444347 and
3d7343f6
Anatol Belski [Thu, 8 Sep 2016 15:49:47 +0000 (17:49 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
backport
59444347 and
3d7343f6
Anatol Belski [Thu, 8 Sep 2016 15:46:53 +0000 (17:46 +0200)]
Christoph M. Becker [Thu, 8 Sep 2016 15:00:07 +0000 (17:00 +0200)]
Merge branch 'pull-request/1997'
Yasuo Ohgaki [Thu, 8 Sep 2016 05:11:37 +0000 (14:11 +0900)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fix bug26639.phpt
Yasuo Ohgaki [Thu, 8 Sep 2016 05:10:55 +0000 (14:10 +0900)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix bug26639.phpt
Yasuo Ohgaki [Thu, 8 Sep 2016 05:10:21 +0000 (14:10 +0900)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fix bug26639.phpt
Yasuo Ohgaki [Thu, 8 Sep 2016 05:07:57 +0000 (14:07 +0900)]
Fix bug26639.phpt
Yasuo Ohgaki [Thu, 8 Sep 2016 04:35:38 +0000 (13:35 +0900)]
Update NEWS
Yasuo Ohgaki [Thu, 8 Sep 2016 04:35:35 +0000 (13:35 +0900)]
Update NEWS
Yasuo Ohgaki [Thu, 8 Sep 2016 04:35:30 +0000 (13:35 +0900)]
Update NEWS
Yasuo Ohgaki [Thu, 8 Sep 2016 04:33:07 +0000 (13:33 +0900)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fix Bug #72992 mbstring.internal_encoding doesn't inherit default_charset
Yasuo Ohgaki [Thu, 8 Sep 2016 04:32:47 +0000 (13:32 +0900)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix Bug #72992 mbstring.internal_encoding doesn't inherit default_charset
Yasuo Ohgaki [Thu, 8 Sep 2016 04:32:31 +0000 (13:32 +0900)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fix Bug #72992 mbstring.internal_encoding doesn't inherit default_charset
Yasuo Ohgaki [Thu, 8 Sep 2016 04:16:50 +0000 (13:16 +0900)]
Fix Bug #72992 mbstring.internal_encoding doesn't inherit default_charset
Dmitry Stogov [Wed, 7 Sep 2016 08:36:44 +0000 (11:36 +0300)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed type inference bug
Dmitry Stogov [Wed, 7 Sep 2016 08:36:14 +0000 (11:36 +0300)]
Fixed type inference bug
Nikita Popov [Tue, 6 Sep 2016 20:20:25 +0000 (22:20 +0200)]
Merge branch 'PHP-7.1'
Nikita Popov [Tue, 6 Sep 2016 20:19:34 +0000 (22:19 +0200)]
Add ISSET_ISEMPTY_STATIC_PROP to smart branch list
Christoph M. Becker [Tue, 6 Sep 2016 12:15:05 +0000 (14:15 +0200)]
Merge branch 'PHP-7.1'
Christoph M. Becker [Tue, 6 Sep 2016 12:09:59 +0000 (14:09 +0200)]
Merge branch 'pull-request/2115' into PHP-7.1
Nikita Popov [Tue, 6 Sep 2016 11:00:39 +0000 (13:00 +0200)]
Merge branch 'PHP-7.1'
Nikita Popov [Tue, 6 Sep 2016 10:59:35 +0000 (12:59 +0200)]
Followup for bug #72785
Fix incorrect handling of nesting ... need to reset to the old
value afterwards.
Christoph M. Becker [Tue, 6 Sep 2016 10:20:20 +0000 (12:20 +0200)]
Merge branch 'PHP-7.1'
Christoph M. Becker [Tue, 6 Sep 2016 10:15:41 +0000 (12:15 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Tue, 6 Sep 2016 10:10:38 +0000 (12:10 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Tue, 6 Sep 2016 10:05:22 +0000 (12:05 +0200)]
Fix #73025: Heap Buffer Overflow in virtual_popen of zend_virtual_cwd.c
`command_length` is retrieved via strlen() and later passed to emalloc()
and memcpy(), so the appropriate type is `size_t`.
We don't add a regression test, because that would need to allocate a string
of at least 2 GiB.
Yasuo Ohgaki [Tue, 6 Sep 2016 09:34:52 +0000 (18:34 +0900)]
Fix memleak.
Yasuo Ohgaki [Tue, 6 Sep 2016 09:29:20 +0000 (18:29 +0900)]
Update NEWS
Yasuo Ohgaki [Tue, 6 Sep 2016 09:29:00 +0000 (18:29 +0900)]
Update NEWS
Yasuo Ohgaki [Tue, 6 Sep 2016 09:28:45 +0000 (18:28 +0900)]
Update NEWS
Yasuo Ohgaki [Tue, 6 Sep 2016 09:22:04 +0000 (18:22 +0900)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed Bug #66964 mb_convert_variables() cannot detect recursion
Yasuo Ohgaki [Tue, 6 Sep 2016 09:20:24 +0000 (18:20 +0900)]
Added array parameter support to mb_convert_encoding()
Yasuo Ohgaki [Tue, 6 Sep 2016 07:42:07 +0000 (16:42 +0900)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed Bug #66964 mb_convert_variables() cannot detect recursion
Yasuo Ohgaki [Tue, 6 Sep 2016 07:41:52 +0000 (16:41 +0900)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fixed Bug #66964 mb_convert_variables() cannot detect recursion
Yasuo Ohgaki [Tue, 6 Sep 2016 07:41:09 +0000 (16:41 +0900)]
Merge branch 'PHP-7.1' of git.php.net:php-src into PHP-7.1
* 'PHP-7.1' of git.php.net:php-src: (53 commits)
Fix bug #72785 - allowed_classes only applies to outermost unserialize()
Fix #70752: Depacking with wrong password leaves 0 length files
Unbreak FAST_ZPP dead code
Updated NEWS
Fixes #72590: Opcache restart with kill_all_lockers does not work
Limit editorconfig to C code
Updated NEWS
Updated NEWS
Updated NEWS
Fix #72972, Bad filter for the flags FILTER_FLAG_NO_RES_RANGE and FILTER_FLAG_NO_PRIV_RANGE
Change the name of the second parameter of image writer functions
Added editorconfig file
Implement #47456: Missing PCRE option 'J'
Use integer placeholders, since values can vary with the TDS version
phpdbg: couple of network function return checks. Possible overflow when copy the socket_path configuration.
Same issue as #72926 in another place.
Sync fix for bug #72910 with current upstream
Fix #72994: mbc_to_code() out of bounds read
Bump PHP_API_VERSION
Fix bug #72996
...
Yasuo Ohgaki [Tue, 6 Sep 2016 07:05:34 +0000 (16:05 +0900)]
Fixed Bug #66964 mb_convert_variables() cannot detect recursion
Stanislav Malyshev [Tue, 6 Sep 2016 02:57:49 +0000 (19:57 -0700)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fix bug #72785 - allowed_classes only applies to outermost unserialize()
Stanislav Malyshev [Tue, 6 Sep 2016 02:56:36 +0000 (19:56 -0700)]
Fix bug #72785 - allowed_classes only applies to outermost unserialize()
Christoph M. Becker [Mon, 5 Sep 2016 23:28:59 +0000 (01:28 +0200)]
Merge branch 'PHP-7.1'
Christoph M. Becker [Mon, 5 Sep 2016 23:18:22 +0000 (01:18 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Mon, 5 Sep 2016 23:07:15 +0000 (01:07 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Mon, 5 Sep 2016 22:28:28 +0000 (00:28 +0200)]
Fix #70752: Depacking with wrong password leaves 0 length files
We should not open the output stream before we have tried to open the
archive entry, as failing the latter could leave an empty file behind.
Andrea Faulds [Mon, 5 Sep 2016 21:13:42 +0000 (22:13 +0100)]
Merge branch 'PHP-7.1'
Andrea Faulds [Mon, 5 Sep 2016 21:13:20 +0000 (22:13 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Andrea Faulds [Mon, 5 Sep 2016 21:12:26 +0000 (22:12 +0100)]
Unbreak FAST_ZPP dead code
Julien Pauli [Mon, 5 Sep 2016 15:04:31 +0000 (17:04 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Updated NEWS
Fixes #72590: Opcache restart with kill_all_lockers does not work
Julien Pauli [Mon, 5 Sep 2016 15:04:15 +0000 (17:04 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Updated NEWS
Fixes #72590: Opcache restart with kill_all_lockers does not work
Julien Pauli [Mon, 5 Sep 2016 15:03:51 +0000 (17:03 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Updated NEWS
Fixes #72590: Opcache restart with kill_all_lockers does not work
Julien Pauli [Mon, 5 Sep 2016 15:03:29 +0000 (17:03 +0200)]
Updated NEWS
Keyur [Wed, 13 Jul 2016 02:47:46 +0000 (02:47 +0000)]
Fixes #72590: Opcache restart with kill_all_lockers does not work
ACCEL_LOG_ERROR is special and causes a zend_bailout() and the code
never gets to call kill() in the next line after the logging. Change
the log level to WARNING.
Nikita Popov [Sun, 4 Sep 2016 21:33:32 +0000 (23:33 +0200)]
Fix some sizeof(zend_long) > sizeof(size_t) issues
Fix a couple of mistakes that are only relevant if
sizeof(zend_long) > sizeof(size_t).
* Fix cast order in string offset check: Negation should happen
after the (zend_long) cast, otherwise sign extension does not
occur.
* Use Z_UL in zend_inference.
* Use aligned size for HT_USED_SIZE in zend_persist: The issue is
that on x86-32 uint64_t is considered to be 4-aligned, so the
alignment assumption does not hold.
David Walker [Sat, 3 Sep 2016 18:32:31 +0000 (12:32 -0600)]
Improve getaddrinfo implementation
* Fix some leaks
* Improve some comparisons and casts
* Raise a notice when an unknown hint is provided
Nikita Popov [Mon, 5 Sep 2016 12:23:54 +0000 (14:23 +0200)]
Merge branch 'PHP-7.1'
[ci skip]
Nikita Popov [Mon, 5 Sep 2016 12:22:45 +0000 (14:22 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
[ci skip]
Nikita Popov [Mon, 5 Sep 2016 12:22:29 +0000 (14:22 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
[ci skip]
Nikita Popov [Mon, 5 Sep 2016 12:21:43 +0000 (14:21 +0200)]
Limit editorconfig to C code
PHPT files do not follow this.
[ci skip]
Christoph M. Becker [Mon, 5 Sep 2016 09:27:46 +0000 (11:27 +0200)]
Update UPGRADING wrt. commit
c4fe264b
Julien Pauli [Mon, 5 Sep 2016 08:19:29 +0000 (10:19 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Updated NEWS
Updated NEWS
Updated NEWS
Julien Pauli [Mon, 5 Sep 2016 08:19:21 +0000 (10:19 +0200)]
Updated NEWS
Julien Pauli [Mon, 5 Sep 2016 08:18:57 +0000 (10:18 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Updated NEWS
Updated NEWS
Julien Pauli [Mon, 5 Sep 2016 08:18:39 +0000 (10:18 +0200)]
Updated NEWS
Julien Pauli [Mon, 5 Sep 2016 08:18:08 +0000 (10:18 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Updated NEWS
Julien Pauli [Mon, 5 Sep 2016 08:17:56 +0000 (10:17 +0200)]
Updated NEWS
Julien Pauli [Mon, 5 Sep 2016 08:13:31 +0000 (10:13 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fix #72972, Bad filter for the flags FILTER_FLAG_NO_RES_RANGE and FILTER_FLAG_NO_PRIV_RANGE
Julien Pauli [Mon, 5 Sep 2016 08:13:19 +0000 (10:13 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix #72972, Bad filter for the flags FILTER_FLAG_NO_RES_RANGE and FILTER_FLAG_NO_PRIV_RANGE
Julien Pauli [Mon, 5 Sep 2016 08:12:49 +0000 (10:12 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fix #72972, Bad filter for the flags FILTER_FLAG_NO_RES_RANGE and FILTER_FLAG_NO_PRIV_RANGE
Julien Pauli [Thu, 1 Sep 2016 08:36:58 +0000 (10:36 +0200)]
Fix #72972, Bad filter for the flags FILTER_FLAG_NO_RES_RANGE and FILTER_FLAG_NO_PRIV_RANGE
Stanislav Malyshev [Mon, 5 Sep 2016 07:51:01 +0000 (00:51 -0700)]
Merge branch 'pull-request/1864'
* pull-request/1864:
Tiny tweak for `$header` initialization, it should always be an array
Minor tweaks
Stanislav Malyshev [Mon, 5 Sep 2016 07:44:01 +0000 (00:44 -0700)]
Merge branch 'pull-request/2025'
* pull-request/2025:
Change the name of the second parameter of image writer functions
Stanislav Malyshev [Mon, 5 Sep 2016 07:43:52 +0000 (00:43 -0700)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Change the name of the second parameter of image writer functions
Christoph M. Becker [Sat, 23 Jul 2016 13:36:49 +0000 (15:36 +0200)]
Change the name of the second parameter of image writer functions
As of PHP 5.4.0 the second parameter of all image writer functions (except
imagexbm) accepts also a stream resource. Therefore the parameter name
`filename` is inappropriate. We change it to `to` according to what it's
already called in _php_image_output_ctx().
We consider the reflection only related BC break acceptable for a minor version.
Stanislav Malyshev [Mon, 5 Sep 2016 07:41:57 +0000 (00:41 -0700)]
Merge branch 'pull-request/1958'
* pull-request/1958:
Added editorconfig file
Stanislav Malyshev [Mon, 5 Sep 2016 07:41:29 +0000 (00:41 -0700)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Added editorconfig file