]>
granicus.if.org Git - php/log
Anatol Belski [Tue, 17 Jul 2018 09:59:17 +0000 (11:59 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
[ci skip] Update NEWS
Anatol Belski [Tue, 17 Jul 2018 09:58:43 +0000 (11:58 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
[ci skip] Update NEWS
Anatol Belski [Tue, 17 Jul 2018 08:21:21 +0000 (10:21 +0200)]
[ci skip] Update NEWS
Remi Collet [Tue, 17 Jul 2018 04:07:28 +0000 (06:07 +0200)]
NEWS
Stanislav Malyshev [Tue, 17 Jul 2018 01:52:01 +0000 (18:52 -0700)]
Fix test
Stanislav Malyshev [Mon, 16 Jul 2018 23:53:57 +0000 (16:53 -0700)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed bug #76459 windows linkinfo lacks openbasedir check
Add NEWS
Fixed bug #76459 windows linkinfo lacks openbasedir check
Fix bug #76557: heap-buffer-overflow (READ of size 48) while reading exif data
Fix bug #76423 - Int Overflow lead to Heap OverFlow in exif_thumbnail_extract of exif.c
Stanislav Malyshev [Mon, 16 Jul 2018 23:52:36 +0000 (16:52 -0700)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #76459 windows linkinfo lacks openbasedir check
Add NEWS
Fixed bug #76459 windows linkinfo lacks openbasedir check
Fix bug #76557: heap-buffer-overflow (READ of size 48) while reading exif data
Fix bug #76423 - Int Overflow lead to Heap OverFlow in exif_thumbnail_extract of exif.c
Stanislav Malyshev [Mon, 16 Jul 2018 22:13:13 +0000 (15:13 -0700)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Add NEWS
Fixed bug #76459 windows linkinfo lacks openbasedir check
Fix bug #76557: heap-buffer-overflow (READ of size 48) while reading exif data
Fix bug #76423 - Int Overflow lead to Heap OverFlow in exif_thumbnail_extract of exif.c
Anatol Belski [Tue, 3 Jul 2018 12:04:22 +0000 (14:04 +0200)]
Fixed bug #76459 windows linkinfo lacks openbasedir check
Stanislav Malyshev [Mon, 16 Jul 2018 21:26:31 +0000 (14:26 -0700)]
Add NEWS
Anatol Belski [Tue, 3 Jul 2018 11:51:31 +0000 (13:51 +0200)]
Fixed bug #76459 windows linkinfo lacks openbasedir check
Stanislav Malyshev [Mon, 2 Jul 2018 05:20:19 +0000 (22:20 -0700)]
Fix bug #76557: heap-buffer-overflow (READ of size 48) while reading exif data
Use MAKERNOTE length as data size.
Stanislav Malyshev [Tue, 19 Jun 2018 23:26:36 +0000 (16:26 -0700)]
Fix bug #76423 - Int Overflow lead to Heap OverFlow in exif_thumbnail_extract of exif.c
Christoph M. Becker [Sun, 15 Jul 2018 21:09:15 +0000 (23:09 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix #73817: Incorrect entries in get_html_translation_table
Christoph M. Becker [Sun, 15 Jul 2018 21:06:38 +0000 (23:06 +0200)]
Fix #73817: Incorrect entries in get_html_translation_table
Due to incorrect string termination and length handling, several HTML
entities missed the trailing semicolon.
We also fix the obviously wrong expectations in two already existing
tests.
Anatol Belski [Fri, 13 Jul 2018 18:14:44 +0000 (20:14 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Improve test
Anatol Belski [Fri, 13 Jul 2018 18:13:51 +0000 (20:13 +0200)]
Improve test
Ensure the filename is non existent indeed.
Anatol Belski [Thu, 12 Jul 2018 17:57:08 +0000 (19:57 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed RecursiveDirectoryIterator with long path or with edge case length
Anatol Belski [Thu, 12 Jul 2018 17:49:32 +0000 (19:49 +0200)]
Fixed RecursiveDirectoryIterator with long path or with edge case length
The search path needs to be appended with the wild card. Till now, an
edge case existed, so then if a path is 259 bytes long, which is smaller
_MAX_PATH, the suffix would cause the final search path to become longer
than _MAX_PATH. It is an edge case, when the starting path happens to
have a specific length. If the starting path was longer than _MAX_PATH
or the addition of "\\*" would not exceed _MAX_PATH, the function was
correct. Except for rewind, which was broken in the case of the long
path.
Christoph M. Becker [Thu, 12 Jul 2018 11:46:10 +0000 (13:46 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix Travis build
Christoph M. Becker [Thu, 12 Jul 2018 11:45:30 +0000 (13:45 +0200)]
Fix Travis build
As of commit
f9d1d1f [1] we require `sudo`, so we tell Travis about it.
[1] <http://git.php.net/?p=php-src.git;a=commit;h=
f9d1d1f >
Anatol Belski [Thu, 12 Jul 2018 09:37:13 +0000 (11:37 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix macro
Anatol Belski [Thu, 12 Jul 2018 09:35:00 +0000 (11:35 +0200)]
Fix macro
Anatol Belski [Wed, 11 Jul 2018 11:13:56 +0000 (13:13 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix condition
Anatol Belski [Wed, 11 Jul 2018 11:09:20 +0000 (13:09 +0200)]
Fix condition
It looks like the real length limit is 247 bytes, not 248 as documented.
Anatol Belski [Tue, 10 Jul 2018 09:51:49 +0000 (11:51 +0200)]
[ci skip] Update NEWS
Anatol Belski [Tue, 10 Jul 2018 09:51:11 +0000 (11:51 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
[ci skip] Update NEWS
Anatol Belski [Tue, 10 Jul 2018 09:50:33 +0000 (11:50 +0200)]
[ci skip] Update NEWS
Anatol Belski [Tue, 10 Jul 2018 09:19:54 +0000 (11:19 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix bug #76524 - ZipArchive memory leak
timurib [Mon, 25 Jun 2018 11:14:26 +0000 (14:14 +0300)]
Fix bug #76524 - ZipArchive memory leak
Bugfix #76524: Free up zip internal state and adjust the tests for Windows
Bugfix #76524: Fix possible use after free for libzip 1.3.1
Bugfix #76524: Make the test independent of platform
Anatol Belski [Mon, 9 Jul 2018 19:24:51 +0000 (21:24 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Sync callback signature with libxml2 2.9.8
Anatol Belski [Mon, 9 Jul 2018 19:21:41 +0000 (21:21 +0200)]
Sync callback signature with libxml2 2.9.8
Anatol Belski [Mon, 9 Jul 2018 13:14:30 +0000 (15:14 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Add missing flag
Anatol Belski [Mon, 9 Jul 2018 13:12:52 +0000 (15:12 +0200)]
Add missing flag
Anatol Belski [Sun, 8 Jul 2018 18:32:52 +0000 (20:32 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix C++11 and up compatibility for zend_finite and more
Anatol Belski [Sun, 8 Jul 2018 18:20:08 +0000 (20:20 +0200)]
Fix C++11 and up compatibility for zend_finite and more
C++11 puts isfinite, isinf, isnan and a lot of other stuff into the
std namespace. Thus, if a C++11 or newer source is compiled, these
symbols won't be available. A good solution would be to include cmath,
but depending on a particular compiler that might remove even more
stuff from the global namespace, so such a fix should only target master.
For now, just keep these defines same for C++11 and upper, as the actual
C++ code should use symbols from the std namespace anyway. This
especially concerns older GCC versions like at least 4 and 5, which are
used by default in the LTS Linux distros.
Dylan K. Taylor [Sat, 7 Jul 2018 09:14:31 +0000 (10:14 +0100)]
Fixed regex for checking libzip static lib
This bug caused linking issues in debug mode (see bug [#76564](https://bugs.php.net/bug.php?id=76564))
This issue affects PHP 7.2 and master.
Nikita Popov [Sat, 7 Jul 2018 10:07:52 +0000 (12:07 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
cdoco [Fri, 6 Jul 2018 14:13:46 +0000 (22:13 +0800)]
Fixed bug #76366 (references in sub-array for filtering breaks the filter)
Anatol Belski [Fri, 6 Jul 2018 15:45:01 +0000 (17:45 +0200)]
[ci skip] Update NEWS
Anatol Belski [Fri, 6 Jul 2018 15:44:37 +0000 (17:44 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
[ci skip] Update NEWS
Anatol Belski [Fri, 6 Jul 2018 15:43:48 +0000 (17:43 +0200)]
[ci skip] Update NEWS
Anatol Belski [Fri, 6 Jul 2018 14:08:17 +0000 (16:08 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix event log handling in startup phase
Fix bug #76488 Memory leak when fetching a BLOB field
Fix year
Bump version
Anatol Belski [Fri, 6 Jul 2018 11:59:14 +0000 (13:59 +0200)]
Fix event log handling in startup phase
The log header can be saved in the globals on startup. At the same
time, the log header can be changed per request. In case that
happened, wrong pointer will be free'd on shutdown. It can happen at
any point when zend_error() or similar is called at startup, like for
example in the case of the ini deprecation warnings. Thus, ZMM cannot
be used here.
sim1984 [Mon, 25 Jun 2018 18:35:51 +0000 (21:35 +0300)]
Fix bug #76488 Memory leak when fetching a BLOB field
Add a phpt test
Sara Golemon [Fri, 6 Jul 2018 14:02:20 +0000 (10:02 -0400)]
Fix year
Sara Golemon [Fri, 6 Jul 2018 14:01:54 +0000 (10:01 -0400)]
Bump version
Nikita Popov [Thu, 5 Jul 2018 17:11:25 +0000 (19:11 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
Nikita Popov [Thu, 5 Jul 2018 17:08:00 +0000 (19:08 +0200)]
Fix string.strip_tags filter
Was segfaulting if no allowed tags are specified and performing an
out of bounds read if they were.
Anatol Belski [Tue, 3 Jul 2018 13:45:01 +0000 (15:45 +0200)]
Fixed bug #76564 ext/zip link issues
Add zlib for linking directly, so then ext/zlib is not required.
Remi Collet [Tue, 3 Jul 2018 11:52:04 +0000 (13:52 +0200)]
bump to 7.2.9-dev
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