]>
granicus.if.org Git - php/log
Nikita Popov [Wed, 13 Jul 2016 21:55:19 +0000 (23:55 +0200)]
Add missing call opcodes in cleanup_unfinished_calls()
Otherwise we may leak if an exception is thrown from them.
Nikita Popov [Wed, 13 Jul 2016 21:35:53 +0000 (23:35 +0200)]
Fix leak if throw_exception_object() fails
Christoph M. Becker [Thu, 14 Jul 2016 15:20:19 +0000 (17:20 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Thu, 14 Jul 2016 14:43:13 +0000 (16:43 +0200)]
Fix bug #72596: imagetypes function won't advertise WEBP support
We add the constant IMG_WEBP and make sure that WebP support is properly
reported by imagetypes().
Anatol Belski [Thu, 14 Jul 2016 11:20:13 +0000 (13:20 +0200)]
update NEWS
Dmitry Stogov [Thu, 14 Jul 2016 10:05:27 +0000 (13:05 +0300)]
Fixed memory leak
Xinchen Hui [Thu, 14 Jul 2016 05:36:43 +0000 (13:36 +0800)]
Fixed bug #72594 (Calling an earlier instance of an included anonymous class fatals)
Nikita Popov [Wed, 13 Jul 2016 19:57:14 +0000 (21:57 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Nikita Popov [Wed, 13 Jul 2016 19:57:01 +0000 (21:57 +0200)]
Add NEWS entry
Nikita Popov [Wed, 13 Jul 2016 19:46:52 +0000 (21:46 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
ext/reflection/php_reflection.c
nikita2206 [Sun, 15 May 2016 23:58:21 +0000 (02:58 +0300)]
fix: bug72222 for PHP-5.6 reflection export of array consts
Keyur [Wed, 13 Jul 2016 03:15:03 +0000 (03:15 +0000)]
Merge branch 'PHP-7.0' of https://git.php.net/push/php-src into PHP-7.0
Keyur [Wed, 13 Jul 2016 03:03:26 +0000 (03:03 +0000)]
Add to 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.
Xinchen Hui [Wed, 13 Jul 2016 02:49:58 +0000 (10:49 +0800)]
Fixed bug #72588 (Using global var doesn't work while accessing SimpleXML element)
Anatol Belski [Tue, 12 Jul 2016 15:04:41 +0000 (17:04 +0200)]
missed the dot
Anatol Belski [Tue, 12 Jul 2016 15:01:51 +0000 (17:01 +0200)]
update NEWS
Julien Pauli [Tue, 12 Jul 2016 13:51:23 +0000 (15:51 +0200)]
Updated NEWS
Julien Pauli [Tue, 12 Jul 2016 13:50:58 +0000 (15:50 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Updated NEWS
Revert "Fixes #52384: Adds parameter value to dumped output. Also adds output flag indicating presence of PDO::PARAM_INPUT_OUTPUT."
Revert "Fix test for #52384"
Conflicts:
ext/pdo/pdo_stmt.c
Julien Pauli [Tue, 12 Jul 2016 13:47:05 +0000 (15:47 +0200)]
Updated NEWS
Julien Pauli [Tue, 12 Jul 2016 13:46:07 +0000 (15:46 +0200)]
Revert "Fixes #52384: Adds parameter value to dumped output. Also adds output flag indicating presence of PDO::PARAM_INPUT_OUTPUT."
This reverts commit
15336b44d95c41079438af8ac73f77ff893aeef7 .
Julien Pauli [Tue, 12 Jul 2016 13:45:49 +0000 (15:45 +0200)]
Revert "Fix test for #52384"
This reverts commit
642e44b98f18d867052aa7e02476aae9c8881201 .
Julien Pauli [Tue, 12 Jul 2016 13:27:57 +0000 (15:27 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fix test for #52384
Julien Pauli [Tue, 12 Jul 2016 13:27:37 +0000 (15:27 +0200)]
Fix test for #52384
Anatol Belski [Tue, 12 Jul 2016 12:58:13 +0000 (14:58 +0200)]
Fixed bug #72569 DOTNET/COM array parameters broke in PHP7
Christoph M. Becker [Tue, 12 Jul 2016 12:51:23 +0000 (14:51 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
# Resolved conflicts:
# ext/intl/idn/idn.c
Christoph M. Becker [Tue, 12 Jul 2016 12:42:38 +0000 (14:42 +0200)]
Partially fix #72506: idn_to_ascii for UTS #46 incorrect for long domain names
We don't actually fix this issue wrt. the empty $info array, because it is
not clear what this array should contain and we're concerned about the
potential BC break, but at least we fix the inconsistent handling of
resulting domains with 255 bytes (which raise an error), and longer domains
(which just return FALSE), what has to be considered a very minor BC break
if at all.
Anatol Belski [Tue, 12 Jul 2016 11:01:54 +0000 (13:01 +0200)]
update NEWS
y-uti [Tue, 12 Jul 2016 10:59:11 +0000 (12:59 +0200)]
Make phpize set a proper build type (windows)
Julien Pauli [Tue, 12 Jul 2016 09:17:58 +0000 (11:17 +0200)]
Updated NEWS
Julien Pauli [Tue, 12 Jul 2016 09:17:36 +0000 (11:17 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Updated NEWS
Fixes #52384: Adds parameter value to dumped output. Also adds output flag indicating presence of PDO::PARAM_INPUT_OUTPUT.
Conflicts:
ext/pdo/pdo_stmt.c
Julien Pauli [Tue, 12 Jul 2016 08:49:04 +0000 (10:49 +0200)]
Updated NEWS
Bishop Bettini [Tue, 21 Jun 2016 12:16:51 +0000 (08:16 -0400)]
Fixes #52384: Adds parameter value to dumped output. Also adds output flag indicating presence of PDO::PARAM_INPUT_OUTPUT.
Julien Pauli [Tue, 12 Jul 2016 08:38:40 +0000 (10:38 +0200)]
Updated NEWS
Julien Pauli [Tue, 12 Jul 2016 08:38:22 +0000 (10:38 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Updated NEWS
Fix #72575: using --allow-to-run-as-root should ignore missing user directive
Julien Pauli [Tue, 12 Jul 2016 08:37:59 +0000 (10:37 +0200)]
Updated NEWS
gooh [Mon, 11 Jul 2016 12:28:04 +0000 (14:28 +0200)]
Fix #72575: using --allow-to-run-as-root should ignore missing user
directive
Trying to start PHP-FPM with the --allow-to-run-as-root flag will not
work when the user directive is not given in the FPM worker pool
configuration. Parsing the config will fail. Consequently, FPM cannot
start.
The check is in place to prevent FPM from getting started with root
privileges by accident. Prior to #61295 the check would also prevent
any non-root user to start PHP-FPM without a user directive present.
This patch adds an additional check to the config parser, checking for
the --allow-to-run-as-root flag to be present. If so, parsing will no
longer abort for root users even if the user directive is missing.
I will also update the PHP docs since they still state the user
directive is a mandatory setting which it is not since #61295.
Julien Pauli [Tue, 12 Jul 2016 08:20:01 +0000 (10:20 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Updated NEWS
Fix 72122 - don't use EH_THROW for calls to getIterator
Julien Pauli [Tue, 12 Jul 2016 08:19:45 +0000 (10:19 +0200)]
Updated NEWS
Loz Calver [Fri, 6 May 2016 09:22:23 +0000 (10:22 +0100)]
Fix 72122 - don't use EH_THROW for calls to getIterator
Xinchen Hui [Tue, 12 Jul 2016 04:18:09 +0000 (12:18 +0800)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
backport to 5.6 (we should not unset the default value)
Conflicts:
Zend/zend_exceptions.c
ext/standard/tests/serialize/bug69152.phpt
Xinchen Hui [Tue, 12 Jul 2016 04:14:45 +0000 (12:14 +0800)]
backport to 5.6 (we should not unset the default value)
Xinchen Hui [Tue, 12 Jul 2016 03:51:20 +0000 (11:51 +0800)]
Fixed bug #72581 (previous property undefined in Exception after deserialization)
Christoph M. Becker [Mon, 11 Jul 2016 14:09:12 +0000 (16:09 +0200)]
Update NEWS
Christoph M. Becker [Mon, 11 Jul 2016 14:08:10 +0000 (16:08 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Mon, 11 Jul 2016 14:06:35 +0000 (16:06 +0200)]
Bug #66836 has been fixed
Julien Pauli [Mon, 11 Jul 2016 12:58:55 +0000 (14:58 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Remove needless zeroing of anonymously mmap'd memory
Remove needless zeroing of anonymously mmap'd memory
Julien Pauli [Mon, 11 Jul 2016 12:58:12 +0000 (14:58 +0200)]
Remove needless zeroing of anonymously mmap'd memory
Michael McConville [Tue, 26 Apr 2016 17:16:38 +0000 (13:16 -0400)]
Remove needless zeroing of anonymously mmap'd memory
All existing systems zero anonymously mmapped memory, and if I
understand correctly POSIX will be specifying this soon. Many projects
already rely on it, so no reasonable system would return memory of
unspecified value.
Derick Rethans [Mon, 11 Jul 2016 10:32:10 +0000 (11:32 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
Derick Rethans [Mon, 11 Jul 2016 10:31:43 +0000 (11:31 +0100)]
Generate new .c file from .re file, as that was missing on my previous commit
Xinchen Hui [Mon, 11 Jul 2016 03:51:19 +0000 (11:51 +0800)]
Fixed bug #72571 (SQLite3::bindValue, SQLite3::bindParam crash)
Matteo Beccati [Sun, 10 Jul 2016 12:36:07 +0000 (14:36 +0200)]
Fixed bug #72570 Segmentation fault when binding parameters on a query without placeholders
Matteo Beccati [Sun, 10 Jul 2016 12:34:59 +0000 (14:34 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fixed bug #70313 PDO statement fails to throw exception
Matteo Beccati [Sun, 10 Jul 2016 11:04:49 +0000 (13:04 +0200)]
Fixed bug #70313 PDO statement fails to throw exception
Julien Pauli [Fri, 8 Jul 2016 14:32:32 +0000 (16:32 +0200)]
Updated NEWS
Julien Pauli [Fri, 8 Jul 2016 14:31:53 +0000 (16:31 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Updated NEWS
update filter_var filters for ipv4 addresses to reflect rfc6890
Julien Pauli [Fri, 8 Jul 2016 14:31:42 +0000 (16:31 +0200)]
Updated NEWS
Jos Elstgeest [Fri, 24 Jun 2016 22:47:15 +0000 (00:47 +0200)]
update filter_var filters for ipv4 addresses to reflect rfc6890
Adam Baratz [Wed, 15 Jun 2016 21:42:34 +0000 (17:42 -0400)]
Correct for connection with PDO::ATTR_STRINGIFY_FETCHES set to false
Julien Pauli [Fri, 8 Jul 2016 13:06:21 +0000 (15:06 +0200)]
Updated NEWS
Julien Pauli [Fri, 8 Jul 2016 13:05:13 +0000 (15:05 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Updated NEWS
Backported bug #71144 (Segmentation fault when using cURL with ZTS)
fix bug #72024 (microtime() leaks memory)
Conflicts:
ext/curl/interface.c
Julien Pauli [Fri, 8 Jul 2016 12:59:16 +0000 (14:59 +0200)]
Updated NEWS
Julien Pauli [Fri, 8 Jul 2016 12:58:56 +0000 (14:58 +0200)]
Backported bug #71144 (Segmentation fault when using cURL with ZTS)
Michael Maroszek [Thu, 7 Jul 2016 12:24:05 +0000 (14:24 +0200)]
fix bug #72024 (microtime() leaks memory)
Remi Collet [Fri, 8 Jul 2016 08:47:40 +0000 (10:47 +0200)]
NEWS
Remi Collet [Fri, 8 Jul 2016 08:46:33 +0000 (10:46 +0200)]
Fixed Bug #72564 boolean always deserialized as "true"
Remi Collet [Fri, 8 Jul 2016 08:45:32 +0000 (10:45 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
add test for bug #72564 (7.x regression)
Remi Collet [Fri, 8 Jul 2016 08:45:13 +0000 (10:45 +0200)]
add test for bug #72564 (7.x regression)
Christopher Jones [Thu, 7 Jul 2016 01:52:39 +0000 (11:52 +1000)]
Merge branch 'PHP-5.6' into PHP-7.0
Christopher Jones [Thu, 7 Jul 2016 01:52:17 +0000 (11:52 +1000)]
Mask DB usernames from expected test output for test portability
Ferenc Kovacs [Wed, 6 Jul 2016 23:49:05 +0000 (01:49 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Ferenc Kovacs [Wed, 6 Jul 2016 23:46:02 +0000 (01:46 +0200)]
merge NEWS blocks
Nikita Popov [Wed, 6 Jul 2016 23:31:04 +0000 (01:31 +0200)]
Add NEWS entries
Lauri Kenttä [Wed, 25 May 2016 19:06:42 +0000 (22:06 +0300)]
base64_decode: fix bug #72264 ('VV= =' shouldn't fail in strict mode)
Lauri Kenttä [Wed, 25 May 2016 16:52:11 +0000 (19:52 +0300)]
base64_decode: remove redundant code
case 1 is already handled in the first lines of the for loop;
it would only be entered in the invalid case where the string
continues past the defined length (ch != 0 but length-- == 0).
case 2 and case 3 are redundant, since k >= j and later the
string is truncated to j characters anyway.
Lauri Kenttä [Wed, 25 May 2016 17:53:47 +0000 (20:53 +0300)]
base64_decode: fix bug #72263 (skips char after padding)
Lauri Kenttä [Wed, 25 May 2016 18:02:41 +0000 (21:02 +0300)]
base64_decode: fix bug #72152 (fail on NUL bytes in strict mode)
This added check is actually for NOT failing in NON-strict mode.
The ch == -2 check later causes the desired failure in strict mode.
Lauri Kenttä [Wed, 25 May 2016 18:15:52 +0000 (21:15 +0300)]
base64_decode: remove redundant check
If length == 0 || *current != '=' is false, the for loop will always
end up in this same point, until the if statement becomes true.
Thus, the if statement is not needed.
Lauri Kenttä [Wed, 25 May 2016 17:28:45 +0000 (20:28 +0300)]
base64_decode: reorder to fix out of bounds read
Ferenc Kovacs [Wed, 6 Jul 2016 23:16:58 +0000 (01:16 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
configure.in
main/php_version.h
Ferenc Kovacs [Wed, 6 Jul 2016 22:09:48 +0000 (00:09 +0200)]
5.6.25 is next
Derick Rethans [Wed, 6 Jul 2016 10:15:45 +0000 (11:15 +0100)]
Updated to version 2016.6 (2016f)
Derick Rethans [Wed, 6 Jul 2016 10:15:44 +0000 (11:15 +0100)]
Empty merge
Derick Rethans [Wed, 6 Jul 2016 10:15:42 +0000 (11:15 +0100)]
Updated to version 2016.6 (2016f)
Matteo Beccati [Wed, 6 Jul 2016 05:08:43 +0000 (07:08 +0200)]
Rewrite test to avoid sending emails
A properly configured email server was generating bounce emails when running
the test.
Christoph M. Becker [Tue, 5 Jul 2016 14:49:40 +0000 (16:49 +0200)]
Update NEWS
Christoph M. Becker [Tue, 5 Jul 2016 14:43:39 +0000 (16:43 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
# Resolved conflicts:
# ext/spl/spl_directory.c
Valentin VALCIU [Thu, 21 Apr 2016 16:02:52 +0000 (19:02 +0300)]
Fix bug #55701: GlobIterator throws LogicException
GlobIterator throws LogicException with message 'The parent constructor was
not called' on its first operation when the glob expression doesn't match
any file. It also throws on the first operation after the iteration
completes, when the glob expression matches some files.
# Resolved conflicts:
# ext/spl/spl_directory.c
Adam Baratz [Fri, 1 Jul 2016 19:39:02 +0000 (15:39 -0400)]
Use size_t instead of int for loop counter
Anatol Belski [Tue, 5 Jul 2016 12:57:16 +0000 (14:57 +0200)]
fix possible optimization bug
Nikita Popov [Tue, 5 Jul 2016 12:31:32 +0000 (14:31 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
Zend/zend_compile.c
Pedro Magalhães [Thu, 30 Jun 2016 07:00:33 +0000 (09:00 +0200)]
Don't enforce LSP if prototype method is private
Fixes bug #72496.
Anatol Belski [Tue, 5 Jul 2016 10:36:55 +0000 (12:36 +0200)]
fix typo
Anatol Belski [Tue, 5 Jul 2016 06:09:20 +0000 (08:09 +0200)]
prepare next version
Anatol Belski [Mon, 4 Jul 2016 09:05:49 +0000 (11:05 +0200)]
add missing NEWS entry
Christoph M. Becker [Mon, 4 Jul 2016 01:18:50 +0000 (03:18 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Mon, 4 Jul 2016 01:17:17 +0000 (03:17 +0200)]
Fix typo in comment
Ferenc Kovacs [Sun, 3 Jul 2016 21:35:00 +0000 (23:35 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Ferenc Kovacs [Sun, 3 Jul 2016 21:31:32 +0000 (23:31 +0200)]
this was actually fixed in 5.6.23