]>
granicus.if.org Git - php/log
Christoph M. Becker [Tue, 28 Aug 2018 12:02:11 +0000 (14:02 +0200)]
Fix SKIPIF conditions
The test calls `mb_convert_encoding()` and as such requires the
mbstring extension.
Christoph M. Becker [Tue, 28 Aug 2018 10:22:57 +0000 (12:22 +0200)]
[ci skip] Update NEWS wrt. php-7.3.0beta3 tagging
Remi Collet [Tue, 28 Aug 2018 08:19:08 +0000 (10:19 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
bump to 7.2.11-dev
Remi Collet [Tue, 28 Aug 2018 08:17:33 +0000 (10:17 +0200)]
bump to 7.2.11-dev
Jakub Zelenka [Mon, 27 Aug 2018 13:50:27 +0000 (14:50 +0100)]
Store zlog stream in each child so it can be reused
This change results in using the same buffer for multiple
stdio events which should fix inconsistencies of handling
messages that are not ended with a new line and possibly
very long messages that are split to multiple events.
Christoph M. Becker [Sun, 26 Aug 2018 11:23:06 +0000 (13:23 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #68180: iconv_mime_decode can return extra characters in a header
Christoph M. Becker [Sun, 26 Aug 2018 11:20:22 +0000 (13:20 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix #68180: iconv_mime_decode can return extra characters in a header
Christoph M. Becker [Sun, 26 Aug 2018 10:59:17 +0000 (12:59 +0200)]
Fix #68180: iconv_mime_decode can return extra characters in a header
Basically, the algorithm to append a converted string to an existing
`smart_str` works by increasing the `smart_str` buffer, to let `iconv`
convert characters until there is no more space, to set the new length
of the `smart_str` and to repeat until there is no more input.
Formerly, the new length calculation has been wrong, though, since we
would have to take the old `out_len` into account (`buf_growth -
old_out_len - out_len`). However, since there is no need to take the
old `out_len` into account when increasing the `smart_str` buffer, we
can simplify the fix, avoiding an additional variable.
Christoph M. Becker [Sat, 25 Aug 2018 15:49:39 +0000 (17:49 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #60494: iconv_mime_decode does ignore special characters
Christoph M. Becker [Sat, 25 Aug 2018 15:42:10 +0000 (17:42 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix #60494: iconv_mime_decode does ignore special characters
Christoph M. Becker [Sat, 25 Aug 2018 13:41:44 +0000 (15:41 +0200)]
Fix #60494: iconv_mime_decode does ignore special characters
We must not ignore erroneous characters in mime headers, but rather let
iconv_mime_decode() fail in this case, issuing the usual notice
regarding illegal characters.
Christoph M. Becker [Sat, 25 Aug 2018 12:53:56 +0000 (14:53 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #63839: iconv_mime_decode_headers function is skipping headers
Christoph M. Becker [Sat, 25 Aug 2018 12:51:47 +0000 (14:51 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix #63839: iconv_mime_decode_headers function is skipping headers
Christoph M. Becker [Sun, 12 Aug 2018 21:20:41 +0000 (23:20 +0200)]
Fix #63839: iconv_mime_decode_headers function is skipping headers
We have to cater to the possibility that `=?` is not the start of an
encoded-word, but rather a literal `=?`. If a line break is found
while we're still looking for the charset, we can safely assume that
it's a literal `=?`, and act accordingly.
Christoph M. Becker [Sat, 25 Aug 2018 12:42:35 +0000 (14:42 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #55146: iconv_mime_decode_headers() skips some headers
Christoph M. Becker [Sat, 25 Aug 2018 12:41:00 +0000 (14:41 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix #55146: iconv_mime_decode_headers() skips some headers
Christoph M. Becker [Sun, 12 Aug 2018 17:55:09 +0000 (19:55 +0200)]
Fix #55146: iconv_mime_decode_headers() skips some headers
If we're expecting the start of an encoded word (`=?`), but instead of
the question mark get a line break (CR or LF), we must not append it to
the `pretval`.
Christoph M. Becker [Sun, 12 Aug 2018 13:03:47 +0000 (15:03 +0200)]
Fix #53891: iconv_mime_encode() fails to Q-encode UTF-8 string
The minimum length of an encoded-word is actually the pure encoding
overhead plus the length of the `output-charset` plus the minimum unit
of encoded text, which is 4 for B-encoding and (for simplicity) 3 for
Q-encoding. We also cater to the possibility that we need further
encoded words, which would be split by the `line-break-chars` followed
by a space character. Obviously, the former `out_charset_len + 12` is
too simplistic and wrong in the given case (where the magic number
would be 13).
These simplifications are somewhat wasteful, but iconv_mime_encode()
with Q-encoding is wasteful anyway (see bug 66828[1]), and the proper
solution to convert the whole input to the desired output charset
upfront, and applying the encoding afterwards appears too much a change
for the stable releases.
[1] <https://bugs.php.net/66828>
Christoph M. Becker [Tue, 7 Aug 2018 09:37:58 +0000 (11:37 +0200)]
Fix #76712: Assignment of empty string creates extraneous text node
We work around this peculiarity of libxml by using xmlNodeSetContent(),
which does not exhibit this behavior. This also saves us from manually
calculating the string length.
Peter Kokot [Fri, 24 Aug 2018 18:07:43 +0000 (20:07 +0200)]
Remove some old parts of the php
Since
ba138a3746b3077ebe5b7356b5b49f21cfc30438 the generate-phpt library
has been unbundled from the php-src. This patch cleans two remaining
parts.
Anatol Belski [Thu, 23 Aug 2018 19:27:43 +0000 (21:27 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
mkdist.php: recursively check dll dependencies
Anatol Belski [Thu, 23 Aug 2018 19:26:40 +0000 (21:26 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
mkdist.php: recursively check dll dependencies
Dylan K. Taylor [Tue, 21 Aug 2018 14:23:02 +0000 (15:23 +0100)]
mkdist.php: recursively check dll dependencies
Fix duplication of recursively checked deps
Christoph M. Becker [Thu, 23 Aug 2018 10:51:11 +0000 (12:51 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Simplify regression test
Christoph M. Becker [Thu, 23 Aug 2018 10:49:26 +0000 (12:49 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Simplify regression test
Christoph M. Becker [Thu, 23 Aug 2018 10:44:06 +0000 (12:44 +0200)]
Simplify regression test
There's no need to actually try to trigger an out-of-memory condition
to proof the leak; instead we can simply rely on the Zend MM to report
the memory leaks in debug mode (at least on Linux). Therefore we
simplify the regression test, which also makes it run much faster.
Christoph M. Becker [Wed, 22 Aug 2018 13:39:34 +0000 (15:39 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #68825: Exception in DirectoryIterator::getLinkTarget()
Christoph M. Becker [Wed, 22 Aug 2018 13:38:02 +0000 (15:38 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix #68825: Exception in DirectoryIterator::getLinkTarget()
Christoph M. Becker [Sun, 19 Aug 2018 12:03:47 +0000 (14:03 +0200)]
Fix #68825: Exception in DirectoryIterator::getLinkTarget()
intern->file_name may not have been properly set when
DirectoryIterator::getLinkTarget() is called, so we make sure it is
before using it.
Christoph M. Becker [Wed, 22 Aug 2018 12:31:36 +0000 (14:31 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Increase memory_limit to prevent test failures
Christoph M. Becker [Wed, 22 Aug 2018 12:30:23 +0000 (14:30 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Increase memory_limit to prevent test failures
Christoph M. Becker [Wed, 22 Aug 2018 12:29:28 +0000 (14:29 +0200)]
Increase memory_limit to prevent test failures
Chris Wright [Tue, 21 Aug 2018 16:40:06 +0000 (17:40 +0100)]
Fix #76773 - Methods with a concrete scope need to be added again
Ondřej Surý [Mon, 20 Aug 2018 08:06:53 +0000 (08:06 +0000)]
Fix #76767: ‘asm’ operand has impossible constraints in zend_operators.h
We disable assembly code with gcc 4.8 on i386.
Christoph M. Becker [Wed, 22 Aug 2018 11:50:46 +0000 (13:50 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix #76778: array_reduce leaks memory if callback throws exception
Christoph M. Becker [Wed, 22 Aug 2018 11:48:32 +0000 (13:48 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix #76778: array_reduce leaks memory if callback throws exception
Nikita Popov [Wed, 22 Aug 2018 11:39:33 +0000 (13:39 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
Christoph M. Becker [Wed, 22 Aug 2018 11:32:55 +0000 (13:32 +0200)]
Fix #76778: array_reduce leaks memory if callback throws exception
We have to release the result variable in the error case, too.
Massimiliano Braglia [Tue, 21 Aug 2018 15:44:02 +0000 (17:44 +0200)]
Fixed bug #75797
Fix zend_register_class_alias_ex() to use non-persistent strings
for (non-persistent) userland classes.
Christoph M. Becker [Wed, 22 Aug 2018 10:53:57 +0000 (12:53 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fixed bug #76777 and added test
Christoph M. Becker [Wed, 22 Aug 2018 10:52:11 +0000 (12:52 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed bug #76777 and added test
Ville Hukkamaki [Wed, 22 Aug 2018 04:19:14 +0000 (06:19 +0200)]
Fixed bug #76777 and added test
Set undefined values to null rather than undefined.
David Carlier [Tue, 21 Aug 2018 22:51:54 +0000 (23:51 +0100)]
Don't report mmap failure if it is expected
When using mmap with MAP_FIXED_NOREPLACE or MAP_FIXED|MAP_EXCL
an mmap failure is not an error condition, so do not print an
error message in this case.
Dmitry Stogov [Wed, 22 Aug 2018 07:43:51 +0000 (10:43 +0300)]
Stop using zend_function->reserved[] space.
David Carlier [Sun, 19 Aug 2018 19:32:28 +0000 (20:32 +0100)]
Support fixed address mmap without replacement
We did not use MAP_FIXED here, because it may replace an existing
mapping. This commit adds support for MAP_FIXED_NOREPLACE (available
on newer Linux kernels) and MAP_FIXED|MAP_EXCL (available on FreeBSD),
which avoid this issue.
Dmitry Stogov [Tue, 21 Aug 2018 06:01:54 +0000 (09:01 +0300)]
Removed dead code
David Carlier [Mon, 13 Aug 2018 16:45:36 +0000 (17:45 +0100)]
Avoid directly adding to string literal
This fixes a Clang warning.
Dmitry Stogov [Mon, 20 Aug 2018 13:10:09 +0000 (16:10 +0300)]
Avoid hash lookups in BIND_STATIC and BIND_LEXICAL opcode handlers.
Encode static variable offset into opline->extended_value.
Aaron Stone [Sun, 19 Aug 2018 16:48:52 +0000 (09:48 -0700)]
[ci skip] Correct minor typo (GC_GLAGS to GC_FLAGS)
Gabriel Caruso [Sun, 5 Aug 2018 00:42:03 +0000 (21:42 -0300)]
Make array parsing parameters error messages consistency with ZPP failure
Jakub Zelenka [Sun, 19 Aug 2018 19:19:48 +0000 (20:19 +0100)]
Merge branch 'PHP-7.2' into PHP-7.3
Jakub Zelenka [Sun, 19 Aug 2018 19:19:01 +0000 (20:19 +0100)]
Merge branch 'PHP-7.1' into PHP-7.2
Jakub Zelenka [Sun, 19 Aug 2018 19:14:26 +0000 (20:14 +0100)]
Fix bug #76705 (unusable ssl => peer_fingerprint in stream_context_create())
Anatol Belski [Sat, 18 Aug 2018 18:05:51 +0000 (20:05 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Use stable deps on AppVeyor for now
Anatol Belski [Sat, 18 Aug 2018 18:04:19 +0000 (20:04 +0200)]
Use stable deps on AppVeyor for now
as long as the latest image is not synced with VC++ 15.8
Christoph M. Becker [Sat, 18 Aug 2018 12:38:44 +0000 (14:38 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Add regression test for bug #68175
Fix #68175: RegexIterator pregFlags are NULL instead of 0
Christoph M. Becker [Sat, 18 Aug 2018 12:37:04 +0000 (14:37 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Add regression test for bug #68175
Fix #68175: RegexIterator pregFlags are NULL instead of 0
Christoph M. Becker [Sat, 18 Aug 2018 12:26:02 +0000 (14:26 +0200)]
Add regression test for bug #68175
Tim Siebels [Tue, 7 Oct 2014 11:02:12 +0000 (13:02 +0200)]
Fix #68175: RegexIterator pregFlags are NULL instead of 0
Anatol Belski [Fri, 17 Aug 2018 16:10:39 +0000 (18:10 +0200)]
Add test for bug #76738
Original repro. It's unwieldy, but it's otherwise hard to trigger
the wrong buffer handling behavior.
Anatol Belski [Fri, 17 Aug 2018 14:22:35 +0000 (16:22 +0200)]
Fix memory leak
Anatol Belski [Fri, 17 Aug 2018 13:46:28 +0000 (15:46 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Update binary SDK version for AppVeyor
Anatol Belski [Fri, 17 Aug 2018 13:45:31 +0000 (15:45 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Update binary SDK version for AppVeyor
Anatol Belski [Fri, 17 Aug 2018 13:44:10 +0000 (15:44 +0200)]
Update binary SDK version for AppVeyor
Christoph M. Becker [Fri, 17 Aug 2018 11:06:27 +0000 (13:06 +0200)]
[ci skip] Update NEWS
Bug #76285 was supposed to have been fixed for 7.3.0alpha3, but that
has been reverted for 7.3.0beta2 due to bug #76738. Now that we have a
working fix in master, we backport the respective commits.
Anatol Belski [Tue, 14 Aug 2018 12:33:19 +0000 (14:33 +0200)]
Anatol Belski [Tue, 14 Aug 2018 12:14:05 +0000 (14:14 +0200)]
Followup fix for
ef9ed19e , see also bug #76738
(cherry picked from commit
083285f22a74989689f97d1d53476e7eaec35acc )
Xinchen Hui [Wed, 4 Jul 2018 03:15:32 +0000 (11:15 +0800)]
Fixed build
(cherry picked from commit
36f05a80d7cf11fffb827c7f0b6c8e73d3846e8e )
Andrew Nester [Tue, 1 May 2018 12:04:46 +0000 (12:04 +0000)]
DOMDocument::formatOutput attribute sometimes ignored
(cherry picked from commit
ef9ed19ec7f141311feea1d42467f5773cfc09bc )
Xinchen Hui [Fri, 17 Aug 2018 08:19:26 +0000 (16:19 +0800)]
Fixed same bug #76755 in setrawcookie
Xinchen Hui [Fri, 17 Aug 2018 07:21:48 +0000 (15:21 +0800)]
Cheaper checking
Xinchen Hui [Fri, 17 Aug 2018 06:56:24 +0000 (14:56 +0800)]
Micro optimization & fixed invalid key handling
Xinchen Hui [Fri, 17 Aug 2018 05:45:43 +0000 (13:45 +0800)]
Fixed bug #76755 (setcookie does not accept "double" type for expire time)
Xinchen Hui [Fri, 17 Aug 2018 05:36:12 +0000 (13:36 +0800)]
Update NEWS
Xinchen Hui [Fri, 17 Aug 2018 05:36:03 +0000 (13:36 +0800)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Update NEWS
Fixed bug #76754 (parent private constant in extends class memory leak)
Xinchen Hui [Fri, 17 Aug 2018 05:35:46 +0000 (13:35 +0800)]
Update NEWS
Xinchen Hui [Fri, 17 Aug 2018 05:35:31 +0000 (13:35 +0800)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed bug #76754 (parent private constant in extends class memory leak)
Xinchen Hui [Fri, 17 Aug 2018 05:35:15 +0000 (13:35 +0800)]
Fixed bug #76754 (parent private constant in extends class memory leak)
Xinchen Hui [Fri, 17 Aug 2018 04:19:31 +0000 (12:19 +0800)]
Fixed bug #76752 (Crash in ZEND_COALESCE_SPEC_TMP_HANDLER - assertion in _get_zval_ptr_tmp failed).
Xinchen Hui [Thu, 16 Aug 2018 06:02:03 +0000 (14:02 +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 man page installation
Xinchen Hui [Thu, 16 Aug 2018 06:01:17 +0000 (14:01 +0800)]
Merge branch 'PHP-7.2' of git.php.net:/php-src into PHP-7.2
* 'PHP-7.2' of git.php.net:/php-src:
fix man page installation
Xinchen Hui [Thu, 16 Aug 2018 06:00:30 +0000 (14:00 +0800)]
Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1
* 'PHP-7.1' of git.php.net:/php-src:
fix man page installation
Xinchen Hui [Thu, 16 Aug 2018 05:57:15 +0000 (13:57 +0800)]
Update NEWS
Xinchen Hui [Thu, 16 Aug 2018 05:57:05 +0000 (13:57 +0800)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Update NEWS
Fixed bug #76747 (Opcache treats path containing "test.pharma.tld" as a phar file)
Xinchen Hui [Thu, 16 Aug 2018 05:56:52 +0000 (13:56 +0800)]
Update NEWS
Xinchen Hui [Thu, 16 Aug 2018 05:56:37 +0000 (13:56 +0800)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fixed bug #76747 (Opcache treats path containing "test.pharma.tld" as a phar file)
Xinchen Hui [Thu, 16 Aug 2018 05:56:20 +0000 (13:56 +0800)]
Fixed bug #76747 (Opcache treats path containing "test.pharma.tld" as a phar file)
Remi Collet [Thu, 16 Aug 2018 04:55:14 +0000 (06:55 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
fix man page installation
Remi Collet [Thu, 16 Aug 2018 04:54:57 +0000 (06:54 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
fix man page installation
Remi Collet [Thu, 16 Aug 2018 04:53:56 +0000 (06:53 +0200)]
fix man page installation
Since
91996e7ee504311ff4eca9dbd5840114f75acbad
phpdbg.1 is in buildir, not in srcdir
Xinchen Hui [Wed, 15 Aug 2018 03:02:59 +0000 (11:02 +0800)]
Added NEWs
Christoph M. Becker [Tue, 14 Aug 2018 11:36:15 +0000 (13:36 +0200)]
[ci skip] Update NEWS wrt. php-7.3.0beta2 tagging
Christoph M. Becker [Tue, 14 Aug 2018 10:14:33 +0000 (12:14 +0200)]
Revert "DOMDocument::formatOutput attribute sometimes ignored"
This reverts commit
ef9ed19ec7f141311feea1d42467f5773cfc09bc and its
follow-up
36f05a80d7cf11fffb827c7f0b6c8e73d3846e8e , since these caused
a serious regression (see bug #76738).
Xinchen Hui [Tue, 14 Aug 2018 05:01:50 +0000 (13:01 +0800)]
Fixed zend_read_static_property
Tyson Andre [Mon, 13 Aug 2018 12:44:33 +0000 (08:44 -0400)]
Fix arginfo for tidy::__construct()
This was split out of PR #3439
Previously, the arginfo was wrong for these methods.
getNumberOfRequiredParameters() was 4 for that method.
Compare with http://php.net/manual/en/tidy.construct.php)
This fixes the arginfo added to PHP 7.3 in
97353cda99
Christoph M. Becker [Mon, 13 Aug 2018 14:01:23 +0000 (16:01 +0200)]
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
Fix arginfo for bzcompress
Christoph M. Becker [Mon, 13 Aug 2018 13:59:48 +0000 (15:59 +0200)]
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix arginfo for bzcompress
Tyson Andre [Sun, 12 Aug 2018 21:51:13 +0000 (17:51 -0400)]
Fix arginfo for bzcompress
bzcompress() has 1 required parameter, not 2.
See http://php.net/manual/en/function.bzcompress.php or invoke
bzcompress with 1 parameter.
Anatol Belski [Mon, 13 Aug 2018 07:18:38 +0000 (09:18 +0200)]
Anatol Belski [Mon, 13 Aug 2018 07:14:26 +0000 (09:14 +0200)]
Update NEWS [ci skip]