]>
granicus.if.org Git - php/log
Nikita Popov [Thu, 14 Jul 2016 20:29:04 +0000 (22:29 +0200)]
Fix leak if get_iterator throws but doesn't return NULL
Nikita Popov [Thu, 14 Jul 2016 20:18:06 +0000 (22:18 +0200)]
Fix leak in PDO row_get_ctor
The __construct function name was leaked. Avoid this by simply
throwing directly from row_get_ctor instead of indirecting through
an actual __construct function.
Nikita Popov [Thu, 14 Jul 2016 20:01:13 +0000 (22:01 +0200)]
Fix leak in intl collator compare function
Nikita Popov [Sat, 16 Jul 2016 21:03:01 +0000 (23:03 +0200)]
Merge branch 'PHP-7.0'
Nikita Popov [Sat, 16 Jul 2016 21:02:34 +0000 (23:02 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
Zend/zend_gc.c
Nikita Popov [Sat, 16 Jul 2016 21:00:47 +0000 (23:00 +0200)]
Revert "Fixed bug #72286 (Segmentation fault During Garbage Collection)"
This reverts commit
1c84b55adea936b065a20102202bea3d1d243225 .
Christoph M. Becker [Fri, 15 Jul 2016 19:05:59 +0000 (21:05 +0200)]
Un-XFAIL test case
libgd substitutes unallowed characters of XBM names (but not filenames),
depending on the locale. As we're interested in the filenames in this case
we simply ignore these differences.
Christoph M. Becker [Fri, 15 Jul 2016 18:04:43 +0000 (20:04 +0200)]
Merge branch 'PHP-7.0'
Christoph M. Becker [Fri, 15 Jul 2016 17:47:21 +0000 (19:47 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Fri, 15 Jul 2016 17:42:26 +0000 (19:42 +0200)]
Fix #72604: imagearc() ignores thickness for full arcs
We remove the special casing for full arcs, what conforms to external libgd.
Christoph M. Becker [Thu, 14 Jul 2016 23:16:18 +0000 (01:16 +0200)]
Merge branch 'PHP-7.0'
Christoph M. Becker [Thu, 14 Jul 2016 23:09:58 +0000 (01:09 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Thu, 14 Jul 2016 22:57:36 +0000 (00:57 +0200)]
Fix bug #66502: DOM document dangling reference
When we decrement the refcount of a node's document, we state that we
won't need it anymore. Therefore we can *always* set the pointer to the
document to NULL, what avoids invalid memory accesses for some edge cases
as demonstrated with the PHPT.
Original patch provided by Sean Heelan.
Nikita Popov [Thu, 14 Jul 2016 21:22:41 +0000 (23:22 +0200)]
Merge branch 'PHP-7.0'
Nikita Popov [Thu, 14 Jul 2016 21:22:09 +0000 (23:22 +0200)]
Fix test output
The error is now detected earlier, so the message ends up being
different.
Nikita Popov [Thu, 14 Jul 2016 19:41:49 +0000 (21:41 +0200)]
Merge branch 'PHP-7.0'
Nikita Popov [Thu, 14 Jul 2016 19:38:10 +0000 (21:38 +0200)]
Fix is_callable() on abstract method via object
Dmitry Stogov [Thu, 14 Jul 2016 19:39:15 +0000 (22:39 +0300)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed bug #72286 (Segmentation fault During Garbage Collection)
Dmitry Stogov [Thu, 14 Jul 2016 19:38:47 +0000 (22:38 +0300)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fixed bug #72286 (Segmentation fault During Garbage Collection)
Dmitry Stogov [Thu, 14 Jul 2016 19:37:25 +0000 (22:37 +0300)]
Fixed bug #72286 (Segmentation fault During Garbage Collection)
Anatol Belski [Thu, 14 Jul 2016 19:21:35 +0000 (21:21 +0200)]
Merge branch 'master' of git.php.net:php-src
Anatol Belski [Thu, 14 Jul 2016 19:21:01 +0000 (21:21 +0200)]
Merge branch 'PHP-7.0' of git.php.net:php-src into PHP-7.0
Anatol Belski [Thu, 14 Jul 2016 19:17:40 +0000 (21:17 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Extend libxml exports
Updated NEWS
Fix #69975: PHP segfaults when accessing nvarchar(max) defined columns
Updated NEWS
Fix bug #70480 (php_url_parse_ex() buffer overflow read)
Update PHP 5.5 NEWS entries with CVE info
Anatol Belski [Thu, 14 Jul 2016 19:16:07 +0000 (21:16 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Extend libxml exports
Updated NEWS
Fix #69975: PHP segfaults when accessing nvarchar(max) defined columns
Updated NEWS
Fix bug #70480 (php_url_parse_ex() buffer overflow read)
Update PHP 5.5 NEWS entries with CVE info
Anatol Belski [Thu, 14 Jul 2016 19:13:49 +0000 (21:13 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Extend libxml exports
Updated NEWS
Fix #69975: PHP segfaults when accessing nvarchar(max) defined columns
Updated NEWS
Fix bug #70480 (php_url_parse_ex() buffer overflow read)
Update PHP 5.5 NEWS entries with CVE info
Anatol Belski [Thu, 14 Jul 2016 19:08:54 +0000 (21:08 +0200)]
Extend libxml exports
These are needed to support libxslt 1.1.29 on Windows. This libxslt version
fixes CVE-2015-7995 and for this reason needs to be used.
Nikita Popov [Thu, 14 Jul 2016 18:46:01 +0000 (20:46 +0200)]
Merge branch 'PHP-7.0'
Conflicts:
Zend/zend_vm_execute.h
Nikita Popov [Thu, 14 Jul 2016 18:44:36 +0000 (20:44 +0200)]
Fix bad merge
In master the operand is fetched earlier, I didn't account for
that.
Nikita Popov [Wed, 13 Jul 2016 21:39:16 +0000 (23:39 +0200)]
Fix leak if get_constructor returns NULL
Nikita Popov [Wed, 13 Jul 2016 21:16:55 +0000 (23:16 +0200)]
Fix leaks if update_constant fails
Nikita Popov [Thu, 14 Jul 2016 16:39:48 +0000 (18:39 +0200)]
Merge branch 'PHP-7.0'
Conflicts:
Zend/zend_vm_execute.h
Nikita Popov [Thu, 14 Jul 2016 15:43:29 +0000 (17:43 +0200)]
Fix leak when creating timezone with null bytes
Nikita Popov [Thu, 14 Jul 2016 15:36:56 +0000 (17:36 +0200)]
Fix leak when dynamically calling abstract method
Nikita Popov [Thu, 14 Jul 2016 15:29:59 +0000 (17:29 +0200)]
Fix leak of class name when printing exception backtrace
Nikita Popov [Thu, 14 Jul 2016 13:55:30 +0000 (15:55 +0200)]
Fix leaks in yield from error conditions
Conflicts:
Zend/zend_vm_execute.h
Nikita Popov [Wed, 13 Jul 2016 22:08:29 +0000 (00:08 +0200)]
Fix leak for by-ref assign to overloaded object
Conflicts:
Zend/zend_vm_execute.h
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:26:32 +0000 (17:26 +0200)]
Merge branch 'PHP-7.0'
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().
Nikita Popov [Thu, 14 Jul 2016 13:44:04 +0000 (15:44 +0200)]
Fix return from by-ref generators
Anatol Belski [Thu, 14 Jul 2016 11:20:57 +0000 (13:20 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
update NEWS
Anatol Belski [Thu, 14 Jul 2016 11:20:13 +0000 (13:20 +0200)]
update NEWS
Dmitry Stogov [Thu, 14 Jul 2016 10:14:15 +0000 (13:14 +0300)]
Fixed memory leak
Dmitry Stogov [Thu, 14 Jul 2016 10:12:34 +0000 (13:12 +0300)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed memory leak
Dmitry Stogov [Thu, 14 Jul 2016 10:05:27 +0000 (13:05 +0300)]
Fixed memory leak
Dmitry Stogov [Thu, 14 Jul 2016 09:05:44 +0000 (12:05 +0300)]
Fixed bug #71818 (Memory leak when array altered in destructor)
Xinchen Hui [Thu, 14 Jul 2016 05:38:42 +0000 (13:38 +0800)]
Update NEWS
Xinchen Hui [Thu, 14 Jul 2016 05:38:27 +0000 (13:38 +0800)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed bug #72594 (Calling an earlier instance of an included anonymous class fatals)
Conflicts:
Zend/zend_compile.c
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:23 +0000 (21:57 +0200)]
Merge branch 'PHP-7.0'
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:48:22 +0000 (21:48 +0200)]
Merge branch 'PHP-7.0'
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
Dmitry Stogov [Wed, 13 Jul 2016 17:35:53 +0000 (20:35 +0300)]
Unified behavior of modification of returned by reference value in finnally code.
Dmitry Stogov [Wed, 13 Jul 2016 17:04:47 +0000 (20:04 +0300)]
Removed wrong warning
Dmitry Stogov [Wed, 13 Jul 2016 13:43:47 +0000 (16:43 +0300)]
Fixed bug #29368 (The destructor is called when an exception is thrown from the constructor).
Dmitry Stogov [Wed, 13 Jul 2016 12:08:28 +0000 (15:08 +0300)]
Fixed bug #72347 (VERIFY_RETURN type casts visible in finally)
Fixed bug #72216 (Return by reference with finally is not memory safe)
Fixed bug #72215 (Wrong return value if var modified in finally)
Dmitry Stogov [Wed, 13 Jul 2016 12:05:11 +0000 (15:05 +0300)]
Prevent wrong optimization
Anatol Belski [Wed, 13 Jul 2016 08:51:03 +0000 (10:51 +0200)]
fix contirbutor name
Bob Weinand [Wed, 13 Jul 2016 08:21:39 +0000 (10:21 +0200)]
Disable optimizer when it conflicts with phpdbg tests
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:10:02 +0000 (03:10 +0000)]
Merge branch 'master' of https://git.php.net/push/php-src
Keyur [Wed, 13 Jul 2016 03:07:41 +0000 (03:07 +0000)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Add to NEWS
Fixes #72590: Opcache restart with kill_all_lockers does not work
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:51:11 +0000 (10:51 +0800)]
Update NEWS
Xinchen Hui [Wed, 13 Jul 2016 02:50:15 +0000 (10:50 +0800)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed bug #72588 (Using global var doesn't work while accessing SimpleXML element)
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)
Bob Weinand [Tue, 12 Jul 2016 23:05:32 +0000 (01:05 +0200)]
Remove bogus zend_signal_shutdown symbol from header
Bob Weinand [Tue, 12 Jul 2016 22:37:25 +0000 (00:37 +0200)]
Cleanup zend_/signal usage in phpdbg.c
Bob Weinand [Tue, 12 Jul 2016 18:35:54 +0000 (20:35 +0200)]
Fix phpdbg ZTS watchpoint+shutdown sequences & opcache+watchpoints
Keyur [Wed, 29 Jun 2016 19:58:29 +0000 (19:58 +0000)]
Safer signal handler (no malloc() call)
Anatol Belski [Tue, 12 Jul 2016 15:05:24 +0000 (17:05 +0200)]
missed dot
Anatol Belski [Tue, 12 Jul 2016 15:05:07 +0000 (17:05 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
missed the dot
Anatol Belski [Tue, 12 Jul 2016 15:04:41 +0000 (17:04 +0200)]
missed the dot
Anatol Belski [Tue, 12 Jul 2016 15:02:39 +0000 (17:02 +0200)]
update NEWS
Anatol Belski [Tue, 12 Jul 2016 15:02:17 +0000 (17:02 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
update NEWS
Anatol Belski [Tue, 12 Jul 2016 15:01:51 +0000 (17:01 +0200)]
update NEWS
Julien Pauli [Tue, 12 Jul 2016 13:55:01 +0000 (15:55 +0200)]
Updated NEWS
Julien Pauli [Tue, 12 Jul 2016 13:54:39 +0000 (15:54 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Updated NEWS
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: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:28:13 +0000 (15:28 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fix test for #52384
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:59:30 +0000 (14:59 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed bug #72569 DOTNET/COM array parameters broke in PHP7
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:55:30 +0000 (14:55 +0200)]
Merge branch 'PHP-7.0'
# Resolved conflicts:
# ext/intl/idn/idn.c
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:04:04 +0000 (13:04 +0200)]
update NEWS
Anatol Belski [Tue, 12 Jul 2016 11:03:30 +0000 (13:03 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
update NEWS
Make phpize set a proper build type (windows)
Anatol Belski [Tue, 12 Jul 2016 11:01:54 +0000 (13:01 +0200)]
update NEWS