]>
granicus.if.org Git - php/log
Nikita Popov [Mon, 2 Jul 2018 16:57:14 +0000 (18:57 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
Nikita Popov [Mon, 2 Jul 2018 16:56:27 +0000 (18:56 +0200)]
Fixed bug #75231
The behavior is now consistent with ReflectionMethod.
Nikita Popov [Mon, 2 Jul 2018 15:58:53 +0000 (17:58 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
Nikita Popov [Mon, 2 Jul 2018 15:58:26 +0000 (17:58 +0200)]
Fix test after serialization change
And move it to a more appropriate location.
Nikita Popov [Mon, 2 Jul 2018 15:28:45 +0000 (17:28 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
Nikita Popov [Mon, 2 Jul 2018 15:24:35 +0000 (17:24 +0200)]
Fixed bug #74670
Validate that "C" serialization payload is followed by "}" prior to
calling the unserialize() handler. This mitigates issues caused by
unserialize() not correctly handling strings that are not NUL
terminated. Making sure that there is a "}" at the end avoids the
problem.
Anatol Belski [Mon, 2 Jul 2018 10:12:02 +0000 (12:12 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Update libs_version.txt
Anatol Belski [Mon, 2 Jul 2018 10:09:54 +0000 (12:09 +0200)]
Update libs_version.txt
Christoph M. Becker [Sat, 30 Jun 2018 22:21:34 +0000 (00:21 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Make newly introduced bug76556.phpt more resilient
Christoph M. Becker [Sat, 30 Jun 2018 22:16:09 +0000 (00:16 +0200)]
Make newly introduced bug76556.phpt more resilient
Obviously, different compilers mangle the C++ class name differently.
We should neither expect a prefix nor a suffix.
Christoph M. Becker [Sat, 30 Jun 2018 21:16:50 +0000 (23:16 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix #76556: get_debug_info handler for BreakIterator shows wrong type
Christoph M. Becker [Sat, 30 Jun 2018 17:41:55 +0000 (19:41 +0200)]
Fix #76556: get_debug_info handler for BreakIterator shows wrong type
We use the retrieved type for the "type" element instead of the text.
This has been confused during the PHP 7 upgrade[1].
[1] http://git.php.net/?p=php-src.git;a=commit;h=
1d793348067e5769144c0f7efd86428a4137baec
Nikita Popov [Sat, 30 Jun 2018 18:11:39 +0000 (20:11 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
Nikita Popov [Sat, 30 Jun 2018 18:10:57 +0000 (20:10 +0200)]
Fix handling of void return type on internal functions
Nikita Popov [Sat, 30 Jun 2018 17:50:40 +0000 (19:50 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
Nikita Popov [Sat, 30 Jun 2018 17:49:29 +0000 (19:49 +0200)]
Fix typo in compound dim assign op inference
Thankfully a harmless one, just makes inference results worse.
Christoph M. Becker [Sat, 30 Jun 2018 14:32:19 +0000 (16:32 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix #71848: getimagesize with $imageinfo returns false
Christoph M. Becker [Sat, 30 Jun 2018 14:29:29 +0000 (16:29 +0200)]
Fix #71848: getimagesize with $imageinfo returns false
Some JFIF images contain empty APP segments, i.e. those which consist
only of the marker bytes and the length, but without actual content.
It appears to be doubtful to have empty APP segments, but we should
apply the robustness principle, and accept these, instead of simply
failing in this case.
We choose to add empty APP segments to $imageinfo with an empty string
as value, instead of NULL, or even to omit these segments altogether.
This patch also fixes the potential issue that php_stream_read() might
not read the supposed number of bytes, which could result in garbage to
be added to the read value.
Nikita Popov [Fri, 29 Jun 2018 21:23:02 +0000 (23:23 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
Nikita Popov [Fri, 29 Jun 2018 21:22:41 +0000 (23:22 +0200)]
Fix nullable type pretty-printing
Anatol Belski [Fri, 29 Jun 2018 18:11:55 +0000 (20:11 +0200)]
[ci skip] Update NEWS
Anatol Belski [Fri, 29 Jun 2018 18:11:23 +0000 (20:11 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
[ci skip] Update NEWS
Anatol Belski [Fri, 29 Jun 2018 18:10:54 +0000 (20:10 +0200)]
[ci skip] Update NEWS
Anatol Belski [Fri, 29 Jun 2018 16:35:44 +0000 (18:35 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed bug #76548 pg_fetch_result did not fetch the next row
Anatol Belski [Fri, 29 Jun 2018 16:34:53 +0000 (18:34 +0200)]
Fixed bug #76548 pg_fetch_result did not fetch the next row
Nikita Popov [Thu, 28 Jun 2018 21:04:54 +0000 (23:04 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
Marcus Schwarz [Thu, 28 Jun 2018 12:10:41 +0000 (14:10 +0200)]
Fixed bug #76532 (excessive memory usage in mb_strimwidth)
Anatol Belski [Thu, 28 Jun 2018 13:58:20 +0000 (15:58 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Update SDK version for AppVeyor
Anatol Belski [Thu, 28 Jun 2018 13:56:27 +0000 (15:56 +0200)]
Update SDK version for AppVeyor
Anatol Belski [Thu, 28 Jun 2018 11:28:46 +0000 (13:28 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Sync versions for VC++ 15.8
Anatol Belski [Thu, 28 Jun 2018 11:23:19 +0000 (13:23 +0200)]
Sync versions for VC++ 15.8
Anatol Belski [Thu, 28 Jun 2018 08:54:59 +0000 (10:54 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Don't ignore commits on NEWS, etc. on AppVeyor
Anatol Belski [Thu, 28 Jun 2018 08:53:23 +0000 (10:53 +0200)]
Don't ignore commits on NEWS, etc. on AppVeyor
[ci skip] can be used explicitly, and otherwise it might ignore commits
with a code change.
Xinchen Hui [Thu, 28 Jun 2018 04:38:14 +0000 (12:38 +0800)]
Update NEWS
Xinchen Hui [Thu, 28 Jun 2018 04:37:58 +0000 (12:37 +0800)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed bug #76536 (PHP crashes with core dump when throwing exception in error handler). (Laruence)
Xinchen Hui [Thu, 28 Jun 2018 04:37:33 +0000 (12:37 +0800)]
Fixed bug #76536 (PHP crashes with core dump when throwing exception in error handler). (Laruence)
Xinchen Hui [Wed, 27 Jun 2018 05:07:53 +0000 (13:07 +0800)]
Update NEWS
Xinchen Hui [Wed, 27 Jun 2018 05:07:36 +0000 (13:07 +0800)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed bug #76534 (PHP hangs on 'illegal string offset on string references with an error handler)
Conflicts:
Zend/zend_execute.c
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
Xinchen Hui [Wed, 27 Jun 2018 05:05:11 +0000 (13:05 +0800)]
Fixed bug #76534 (PHP hangs on 'illegal string offset on string references with an error handler)
Christoph M. Becker [Mon, 25 Jun 2018 09:54:02 +0000 (11:54 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix arginfo wrt. optional/required parameters
Christoph M. Becker [Fri, 22 Jun 2018 13:45:31 +0000 (15:45 +0200)]
Fix arginfo wrt. optional/required parameters
All parameters of phpdbg_color(), phpdbg_exec() and phpdbg_prompt() are
required. We mark them as such.
Anatol Belski [Mon, 25 Jun 2018 09:31:21 +0000 (11:31 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Prepare tests for ICU 62.1
Anatol Belski [Mon, 25 Jun 2018 09:30:14 +0000 (11:30 +0200)]
Prepare tests for ICU 62.1
Nikita Popov [Sun, 24 Jun 2018 20:28:49 +0000 (22:28 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
Nikita Popov [Sun, 24 Jun 2018 20:26:45 +0000 (22:26 +0200)]
Fixed bug #76502
Nikita Popov [Fri, 22 Jun 2018 14:22:04 +0000 (16:22 +0200)]
Fixed bug #76520
Dmitry Stogov [Fri, 22 Jun 2018 09:04:39 +0000 (12:04 +0300)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Added parenthesis
Dmitry Stogov [Fri, 22 Jun 2018 09:04:23 +0000 (12:04 +0300)]
Added parenthesis
Jakub Zelenka [Thu, 21 Jun 2018 16:02:44 +0000 (17:02 +0100)]
Make new openssl ext tests in 7.2 consitent
Jakub Zelenka [Thu, 21 Jun 2018 15:47:08 +0000 (16:47 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
Jakub Zelenka [Thu, 21 Jun 2018 15:43:32 +0000 (16:43 +0100)]
Use unix NL in all openssl ext tests
Jakub Zelenka [Thu, 21 Jun 2018 15:38:19 +0000 (16:38 +0100)]
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.
Xinchen Hui [Thu, 21 Jun 2018 09:26:45 +0000 (17:26 +0800)]
Update NEWS
Xinchen Hui [Thu, 21 Jun 2018 09:26:27 +0000 (17:26 +0800)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed bug #76505 (array_merge_recursive() is duplicating sub-array keys)
Xinchen Hui [Thu, 21 Jun 2018 09:26:05 +0000 (17:26 +0800)]
Fixed bug #76505 (array_merge_recursive() is duplicating sub-array keys)
Stanislav Malyshev [Wed, 20 Jun 2018 17:41:59 +0000 (10:41 -0700)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Revert "ICU 59+ requires C++11 and errors out without the option"
Stanislav Malyshev [Wed, 20 Jun 2018 17:41:41 +0000 (10:41 -0700)]
Revert "ICU 59+ requires C++11 and errors out without the option"
This reverts commit
5dd1ef90caec3021e6ce55c8554e695edf641eaf .
Nikita Popov [Wed, 20 Jun 2018 10:30:19 +0000 (12:30 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
Nikita Popov [Tue, 12 Jun 2018 18:34:01 +0000 (20:34 +0200)]
Fixed bug #73342
Directly listen on socket, instead of duping it to STDIN and
listening on that.
Stanislav Malyshev [Sun, 17 Jun 2018 23:42:49 +0000 (16:42 -0700)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
ICU 59+ requires C++11 and errors out without the option
Stanislav Malyshev [Sun, 17 Jun 2018 23:00:06 +0000 (16:00 -0700)]
ICU 59+ requires C++11 and errors out without the option
Pedro Magalhães [Thu, 3 May 2018 20:25:12 +0000 (21:25 +0100)]
Fix #76300 - Dont attempt to change visibility of a parent private
Xinchen Hui [Fri, 15 Jun 2018 08:31:31 +0000 (16:31 +0800)]
Fixed bug #76477 (Opcache causes empty return value)
Dmitry Stogov [Wed, 13 Jun 2018 23:40:59 +0000 (02:40 +0300)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed invalid free introduced by
d6e81f0bfd0cb90586dd83d4fd47a4302605261a (avoid keeping "invalid" pointer)
Dmitry Stogov [Wed, 13 Jun 2018 23:38:39 +0000 (02:38 +0300)]
Fixed invalid free introduced by
d6e81f0bfd0cb90586dd83d4fd47a4302605261a (avoid keeping "invalid" pointer)
Nikita Popov [Wed, 13 Jun 2018 21:48:28 +0000 (23:48 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
Nikita Popov [Wed, 13 Jun 2018 21:47:20 +0000 (23:47 +0200)]
Make $locale parameter to BreakIterator ctors optional
It's documented as such and already accepts null.
Jakub Zelenka [Tue, 12 Jun 2018 17:09:27 +0000 (18:09 +0100)]
Port FPM test 023 and 024 to the new FPM testing
Jakub Zelenka [Tue, 12 Jun 2018 17:03:01 +0000 (18:03 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
Jakub Zelenka [Thu, 7 Jun 2018 16:21:54 +0000 (17:21 +0100)]
Rewrite FPM tests
Anatol Belski [Tue, 12 Jun 2018 16:07:35 +0000 (18:07 +0200)]
[ci skip] Update NEWS
Anatol Belski [Tue, 12 Jun 2018 16:07:11 +0000 (18:07 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
[ci skip] Update NEWS
Anatol Belski [Tue, 12 Jun 2018 16:06:41 +0000 (18:06 +0200)]
[ci skip] Update NEWS
Anatol Belski [Tue, 12 Jun 2018 13:31:01 +0000 (15:31 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed bug #76462 Undefined property: DateInterval::$f
Anatol Belski [Tue, 12 Jun 2018 13:30:14 +0000 (15:30 +0200)]
Fixed bug #76462 Undefined property: DateInterval::$f
Remi Collet [Tue, 12 Jun 2018 07:35:52 +0000 (09:35 +0200)]
NEWS
Remi Collet [Tue, 12 Jun 2018 07:31:41 +0000 (09:31 +0200)]
Add OPSYS_CPM constant as documented and to match libzip naming
Anatol Belski [Mon, 11 Jun 2018 11:49:42 +0000 (13:49 +0200)]
Remove inappropriate FreeLibrary call
Nikita Popov [Sun, 10 Jun 2018 19:21:11 +0000 (21:21 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
Nikita Popov [Sat, 9 Jun 2018 09:04:40 +0000 (11:04 +0200)]
Fix mysqlnd build without openssl
Cherry-pick of
968eb0b38cc9095d418beb8f0df08c4b9abdb079 , as these
changes were also introduced in lower branches.
Jakub Zelenka [Sun, 10 Jun 2018 13:33:28 +0000 (14:33 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
Anatol Belski [Sat, 9 Jun 2018 18:57:17 +0000 (20:57 +0200)]
Fix test portability
Christoph M. Becker [Sat, 9 Jun 2018 15:52:05 +0000 (17:52 +0200)]
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.
Nikita Popov [Fri, 8 Jun 2018 21:10:43 +0000 (23:10 +0200)]
Deduplicate code using php_timezone_to_string()
Looks like this usage was overlooked when the function was
introduced.
David Carlier [Sun, 18 Feb 2018 16:04:51 +0000 (16:04 +0000)]
cast to int to disable compilation warnings.
Keyur Govande [Mon, 4 Jun 2018 19:22:50 +0000 (15:22 -0400)]
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
Jakub Zelenka [Fri, 8 Jun 2018 19:09:33 +0000 (20:09 +0100)]
Enable IPv6 in Travis
Joe Watkins [Thu, 7 Jun 2018 06:19:43 +0000 (08:19 +0200)]
bump versions
Anatol Belski [Wed, 6 Jun 2018 09:14:15 +0000 (11:14 +0200)]
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
Anatol Belski [Wed, 6 Jun 2018 09:13:28 +0000 (11:13 +0200)]
Fix VC compilation as variable size array is not supported
Johannes Schlüter [Tue, 5 Jun 2018 22:24:41 +0000 (00:24 +0200)]
Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1
Johannes Schlüter [Tue, 5 Jun 2018 22:17:34 +0000 (00:17 +0200)]
Fix MySQL 8 auth
Sara Golemon [Tue, 5 Jun 2018 16:07:44 +0000 (12:07 -0400)]
NEWS for 7.2.8
Xinchen Hui [Tue, 5 Jun 2018 09:15:57 +0000 (17:15 +0800)]
Fixed bug #76410 (SIGV in zend_mm_alloc_small)
Stanislav Malyshev [Tue, 5 Jun 2018 05:51:38 +0000 (22:51 -0700)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix bug #76390 - do not allow invalid strings in range()
Stanislav Malyshev [Tue, 5 Jun 2018 05:44:05 +0000 (22:44 -0700)]
Fix bug #76390 - do not allow invalid strings in range()
Anatol Belski [Mon, 28 May 2018 15:13:55 +0000 (17:13 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Translate correct C++ version with suitable compiler
Fixed bug #76383 (array_map on $GLOBALS returns IS_INDIRECT)
Anatol Belski [Mon, 28 May 2018 15:12:06 +0000 (17:12 +0200)]
Translate correct C++ version with suitable compiler
Bob Weinand [Sun, 27 May 2018 22:48:35 +0000 (00:48 +0200)]
Fixed bug #76383 (array_map on $GLOBALS returns IS_INDIRECT)
Nikita Popov [Sat, 26 May 2018 20:06:44 +0000 (22:06 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2