]>
granicus.if.org Git - php/log
Xinchen Hui [Tue, 16 Feb 2016 03:03:09 +0000 (11:03 +0800)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed bug #71603 (compact() maintains references in php7)
Xinchen Hui [Tue, 16 Feb 2016 03:02:57 +0000 (11:02 +0800)]
Fixed bug #71603 (compact() maintains references in php7)
Bob Weinand [Mon, 15 Feb 2016 21:43:58 +0000 (22:43 +0100)]
Merge branch 'PHP-7.0'
Bob Weinand [Mon, 15 Feb 2016 21:37:21 +0000 (22:37 +0100)]
Fixed bug #71601 (finally block not executed after yield from)
Anatol Belski [Mon, 15 Feb 2016 15:53:57 +0000 (16:53 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fix timelib compat with PHP5
Anatol Belski [Mon, 15 Feb 2016 15:53:31 +0000 (16:53 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fix timelib compat with PHP5
Anatol Belski [Mon, 15 Feb 2016 15:50:42 +0000 (16:50 +0100)]
Fix timelib compat with PHP5
Windows builds in PHP5 are always using long which is 32-bit even
in 64-bit build. Thus in PHP5, timelib_long and the company have
to always evaluate to a 32-bit.
Anatol Belski [Mon, 15 Feb 2016 14:16:06 +0000 (15:16 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Backported fix for bug #71525
Anatol Belski [Mon, 15 Feb 2016 14:15:52 +0000 (15:15 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Backported fix for bug #71525
Anatol Belski [Mon, 15 Feb 2016 14:14:23 +0000 (15:14 +0100)]
Backported fix for bug #71525
Dmitry Stogov [Mon, 15 Feb 2016 13:40:21 +0000 (16:40 +0300)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed possible memory leak
Dmitry Stogov [Mon, 15 Feb 2016 13:40:05 +0000 (16:40 +0300)]
Fixed possible memory leak
Dmitry Stogov [Mon, 15 Feb 2016 13:37:48 +0000 (16:37 +0300)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Added missing semicolon
Dmitry Stogov [Mon, 15 Feb 2016 13:37:27 +0000 (16:37 +0300)]
Added missing semicolon
Stanislav Malyshev [Mon, 15 Feb 2016 09:53:24 +0000 (01:53 -0800)]
Merge branch 'PHP-7.0'
* PHP-7.0:
More fixing for bug #71540
Stanislav Malyshev [Mon, 15 Feb 2016 09:53:02 +0000 (01:53 -0800)]
More fixing for bug #71540
Stanislav Malyshev [Mon, 15 Feb 2016 08:10:27 +0000 (00:10 -0800)]
Merge branch 'PHp-7.0'
* PHp-7.0:
Fix bug #71540 - NULL pointer dereference in xsl_ext_function_php()
Fix bug #71540 - NULL pointer dereference in xsl_ext_function_php()
Stanislav Malyshev [Mon, 15 Feb 2016 07:35:29 +0000 (23:35 -0800)]
Fix bug #71540 - NULL pointer dereference in xsl_ext_function_php()
Stanislav Malyshev [Mon, 15 Feb 2016 08:09:30 +0000 (00:09 -0800)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fix bug #71540 - NULL pointer dereference in xsl_ext_function_php()
Conflicts:
ext/xsl/xsltprocessor.c
Stanislav Malyshev [Mon, 15 Feb 2016 07:35:29 +0000 (23:35 -0800)]
Fix bug #71540 - NULL pointer dereference in xsl_ext_function_php()
Stanislav Malyshev [Mon, 15 Feb 2016 07:35:29 +0000 (23:35 -0800)]
Fix bug #71540 - NULL pointer dereference in xsl_ext_function_php()
Anatol Belski [Mon, 15 Feb 2016 08:02:35 +0000 (09:02 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
fix dir separator in test
fix dir separator in test
Anatol Belski [Mon, 15 Feb 2016 08:01:59 +0000 (09:01 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
fix dir separator in test
Anatol Belski [Mon, 15 Feb 2016 08:00:07 +0000 (09:00 +0100)]
fix dir separator in test
Anatol Belski [Mon, 15 Feb 2016 07:58:20 +0000 (08:58 +0100)]
fix dir separator in test
Anatol Belski [Mon, 15 Feb 2016 07:39:19 +0000 (08:39 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
make sure the tests always uses same tz
Anatol Belski [Mon, 15 Feb 2016 07:38:17 +0000 (08:38 +0100)]
make sure the tests always uses same tz
Xinchen Hui [Mon, 15 Feb 2016 07:33:00 +0000 (15:33 +0800)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Xinchen Hui [Mon, 15 Feb 2016 07:32:52 +0000 (15:32 +0800)]
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
* 'PHP-7.0' of git.php.net:/php-src:
fixed news entry
fix NEWS entry
update NEWS
Fix bug #71525
Xinchen Hui [Mon, 15 Feb 2016 07:32:17 +0000 (15:32 +0800)]
Merge branch 'master' of git.php.net:/php-src
* 'master' of git.php.net:/php-src:
fixed news entry
fix NEWS entry
update NEWS
Fix bug #71525
Xinchen Hui [Mon, 15 Feb 2016 07:31:00 +0000 (15:31 +0800)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed typo (I think it should be a typo)
Anatol Belski [Mon, 15 Feb 2016 07:28:24 +0000 (08:28 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
fixed news entry
fix NEWS entry
Anatol Belski [Mon, 15 Feb 2016 07:27:41 +0000 (08:27 +0100)]
fixed news entry
Anatol Belski [Mon, 15 Feb 2016 07:27:17 +0000 (08:27 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
fix NEWS entry
Xinchen Hui [Mon, 15 Feb 2016 07:26:44 +0000 (15:26 +0800)]
Fixed typo (I think it should be a typo)
Anatol Belski [Mon, 15 Feb 2016 07:25:23 +0000 (08:25 +0100)]
fix NEWS entry
Anatol Belski [Mon, 15 Feb 2016 07:22:08 +0000 (08:22 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
update NEWS
Anatol Belski [Mon, 15 Feb 2016 07:21:46 +0000 (08:21 +0100)]
update NEWS
Anatol Belski [Mon, 15 Feb 2016 07:19:52 +0000 (08:19 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fix bug #71525
Sean DuBois [Thu, 4 Feb 2016 21:13:57 +0000 (15:13 -0600)]
Fix bug #71525
timelib_time->timelib_rel_time is mutated by date_modify, and because it is never zero'ed out
it latters causes other date operations to fail (like date_date_set)
Xinchen Hui [Mon, 15 Feb 2016 06:38:20 +0000 (14:38 +0800)]
Fixed another assertion fails due to live_range cleaned (ext/phar/tests/003a.phpt)
Xinchen Hui [Mon, 15 Feb 2016 05:55:33 +0000 (13:55 +0800)]
Merge branch 'bug_45876_missing_fields' of https://github.com/wayfair/php-src
* 'bug_45876_missing_fields' of https://github.com/wayfair/php-src:
Add missing fields to expected test output
Xinchen Hui [Mon, 15 Feb 2016 05:52:50 +0000 (13:52 +0800)]
Merge branch 'patch-32' of https://github.com/marcosptf/php-src
* 'patch-32' of https://github.com/marcosptf/php-src:
Update ReflectionClass_isArray.phpt
test to function ReflectionParameter::isArray
Xinchen Hui [Mon, 15 Feb 2016 05:50:54 +0000 (13:50 +0800)]
Merge branch 'updateTestCoverage' of https://github.com/mattflaschen/php-src
* 'updateTestCoverage' of https://github.com/mattflaschen/php-src:
Add additional test coverage for html_entity_decode
Xinchen Hui [Mon, 15 Feb 2016 05:46:27 +0000 (13:46 +0800)]
Restore to the first version fix(sorry, mis-read the codes)
Xinchen Hui [Mon, 15 Feb 2016 05:24:47 +0000 (13:24 +0800)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Update NEWS
fpm: call zend_signal_init() in child
Xinchen Hui [Mon, 15 Feb 2016 05:24:39 +0000 (13:24 +0800)]
Update NEWS
Mickaël [Sat, 9 Jan 2016 03:54:02 +0000 (04:54 +0100)]
fpm: call zend_signal_init() in child
This addresses bug #71269.
When an fpm child handles more than one request, zend_signal_startup() will
override the saved signal handlers with the internal zend handlers set from the
previous request, causing a SIGQUIT signal to result in a core dump rather than
gracefully exiting (the expected behaviour).
This is fixed by adding a call to zend_signal_init() after setting the
signal handlers in the child. The same technique is used in the apache SAPI
module in commit
fd5a756ad44124ffa7e9a5810a31ff49e91708cf which addresses
bug #61083.
Xinchen Hui [Mon, 15 Feb 2016 05:23:01 +0000 (13:23 +0800)]
Merge branch 'patch-1' of https://github.com/mickael9/php-src
* 'patch-1' of https://github.com/mickael9/php-src:
fpm: call zend_signal_init() in child
Xinchen Hui [Mon, 15 Feb 2016 04:09:52 +0000 (12:09 +0800)]
Reset op_array->live_range if it is removed all by optimization
Xinchen Hui [Mon, 15 Feb 2016 04:09:13 +0000 (12:09 +0800)]
Revert "Fixed segfault in file cache serialize if live range is empty after"
This reverts commit
2661a474793f7a599dba5353874a3d381e4b820b .
Xinchen Hui [Mon, 15 Feb 2016 04:07:43 +0000 (12:07 +0800)]
Fixed segfault in file cache serialize if live range is empty after
optimiaztion
Xinchen Hui [Mon, 15 Feb 2016 03:12:04 +0000 (11:12 +0800)]
Combine conditions (good for other VM kinds)
Xinchen Hui [Mon, 15 Feb 2016 03:05:01 +0000 (11:05 +0800)]
It's better to support 5.3 as well
Xinchen Hui [Mon, 15 Feb 2016 02:37:45 +0000 (10:37 +0800)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Update NEWS
Xinchen Hui [Mon, 15 Feb 2016 02:37:37 +0000 (10:37 +0800)]
Update NEWS
Xinchen Hui [Mon, 15 Feb 2016 02:33:18 +0000 (10:33 +0800)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Update NEWS: "Fixed bug #71584 (Possible use-after-free of ZCG(cwd) in Zend Opcache)"
Fix use-after-free of ZCG(cwd) in Zend Optimizer
Xinchen Hui [Mon, 15 Feb 2016 02:32:50 +0000 (10:32 +0800)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Update NEWS: "Fixed bug #71584 (Possible use-after-free of ZCG(cwd) in Zend Opcache)"
Fix use-after-free of ZCG(cwd) in Zend Optimizer
Conflicts:
ext/opcache/ZendAccelerator.c
Xinchen Hui [Mon, 15 Feb 2016 02:31:37 +0000 (10:31 +0800)]
Update NEWS: "Fixed bug #71584 (Possible use-after-free of ZCG(cwd) in Zend Opcache)"
Xinchen Hui [Mon, 15 Feb 2016 02:29:28 +0000 (10:29 +0800)]
Merge branch 'PHP-5.6' of git.php.net:/php-src into PHP-5.6
* 'PHP-5.6' of git.php.net:/php-src:
update NEWS
Fixed bug #71559 Built-in HTTP server, we can downlaod file in web by bug
Check length of string before comparing to :memory:
Fix bounds check in strip_tags()
Fix test description
FIx bug #71569
Anatol Belski [Sun, 14 Feb 2016 19:54:42 +0000 (20:54 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
updated NEWS
update NEWS
Anatol Belski [Sun, 14 Feb 2016 19:54:13 +0000 (20:54 +0100)]
updated NEWS
Anatol Belski [Sun, 14 Feb 2016 19:53:41 +0000 (20:53 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
update NEWS
Anatol Belski [Sun, 14 Feb 2016 19:52:47 +0000 (20:52 +0100)]
update NEWS
Anatol Belski [Sun, 14 Feb 2016 19:49:42 +0000 (20:49 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed bug #71559 Built-in HTTP server, we can downlaod file in web by bug
Anatol Belski [Sun, 14 Feb 2016 19:49:03 +0000 (20:49 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fixed bug #71559 Built-in HTTP server, we can downlaod file in web by bug
Anatol Belski [Sun, 14 Feb 2016 19:47:23 +0000 (20:47 +0100)]
Fixed bug #71559 Built-in HTTP server, we can downlaod file in web by bug
Anatol Belski [Sun, 14 Feb 2016 16:28:38 +0000 (17:28 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
cleanup duplicated var
fix file lists with subdirs passed to EXTENSION()
Anatol Belski [Sun, 14 Feb 2016 16:20:37 +0000 (17:20 +0100)]
cleanup duplicated var
Anatol Belski [Sun, 14 Feb 2016 16:02:28 +0000 (17:02 +0100)]
fix file lists with subdirs passed to EXTENSION()
The underlying place responsible is the ADD_SOURCES() function. With
this, the calls like
EXTENSION("hello", "sub0/file0.c sub1/file1.c", ...)
are working correctly. Same for
ADD_SOURCES("some/dir", "sub0/file0.c sub1/file1.c", ...)
Nikita Popov [Sun, 14 Feb 2016 13:48:26 +0000 (14:48 +0100)]
Fix zpp in pg_last_notice
Nikita Popov [Sun, 14 Feb 2016 13:47:42 +0000 (14:47 +0100)]
Merge branch 'PHP-7.0'
Nikita Popov [Sun, 14 Feb 2016 13:02:19 +0000 (14:02 +0100)]
Format string fixes
Conflicts:
ext/pgsql/pgsql.c
Nikita Popov [Sun, 14 Feb 2016 12:50:59 +0000 (13:50 +0100)]
Fix format attributes in ZTS
Francois Laupretre [Thu, 11 Feb 2016 23:01:59 +0000 (00:01 +0100)]
Fix bug #71572
Discussed on the internals list as part of
http://markmail.org/message/fa625yc2eegk2dio.
Nikita Popov [Sat, 13 Feb 2016 22:46:50 +0000 (23:46 +0100)]
Simplify previous fix
I didn't notice that there already is a var with the same value.
Nikita Popov [Sat, 13 Feb 2016 17:54:49 +0000 (18:54 +0100)]
Fix ZEND_NEW live ranges
While the def starts at DO_FCALL, the variable should still be the
result of NEW, not DO_FCALL.
I had to fix the test for #68652, because the code started to
(correctly) free the "new self()" object, which triggered an
infinite destructor loop.
Nikita Popov [Sat, 13 Feb 2016 17:03:45 +0000 (18:03 +0100)]
Merge branch 'PHP-7.0'
Nikita Popov [Sat, 13 Feb 2016 17:03:06 +0000 (18:03 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
ext/sqlite3/sqlite3.c
Nikita Popov [Sat, 13 Feb 2016 17:01:50 +0000 (18:01 +0100)]
Check length of string before comparing to :memory:
Nikita Popov [Sat, 13 Feb 2016 16:48:58 +0000 (17:48 +0100)]
Merge branch 'PHP-7.0'
Nikita Popov [Sat, 13 Feb 2016 16:48:17 +0000 (17:48 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
Nikita Popov [Sat, 13 Feb 2016 16:47:30 +0000 (17:47 +0100)]
Fix bounds check in strip_tags()
Nikita Popov [Sat, 13 Feb 2016 16:46:24 +0000 (17:46 +0100)]
Fix test description
Nikita Popov [Sat, 13 Feb 2016 16:39:26 +0000 (17:39 +0100)]
Fix extract() overwriting its own argument
Already covered by bug46873.phpt under valgrind.
Nikita Popov [Sat, 13 Feb 2016 14:21:38 +0000 (15:21 +0100)]
Merge branch 'PHP-7.0'
Nikita Popov [Sat, 13 Feb 2016 14:21:16 +0000 (15:21 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
ext/pdo_mysql/mysql_driver.c
Nikita Popov [Sat, 13 Feb 2016 14:17:51 +0000 (15:17 +0100)]
FIx bug #71569
convert_to_string() may result in an interned string.
Nikita Popov [Fri, 12 Feb 2016 17:50:19 +0000 (18:50 +0100)]
Fix bug #69989
This should cover all the basic cycles. Anything further would
require scanning the call stack and live temporaries.
Nikita Popov [Fri, 12 Feb 2016 16:58:12 +0000 (17:58 +0100)]
Merge branch 'PHP-7.0'
Nikita Popov [Fri, 12 Feb 2016 16:55:29 +0000 (17:55 +0100)]
Forbid yield from in by-reference generators
The current yield from implementation doesn't support by-ref
yields. It's likely not worthwhile to actually implement this,
but we should at least keep the door open for the future by
issuing a compile error.
Refs bug #71252.
Nikita Popov [Thu, 11 Feb 2016 19:42:49 +0000 (20:42 +0100)]
Remove ZEND_CALL_CTOR_RESULT_UNUSED
Instead emit a FREE on the result of NEW.
Dmitry Stogov [Thu, 11 Feb 2016 20:11:19 +0000 (23:11 +0300)]
Combine conditions
Nikita Popov [Fri, 5 Feb 2016 14:23:23 +0000 (15:23 +0100)]
Remove EXT_TYPE_UNUSED in favor of IS_UNUSED
This means we no longer allocate an unused VAR for the retval of
instructions that support unused results.
Nearly all instructions already used the result variable only if
it was used. The only exception to this was the return value
variable for internal function call results. I've adjusted the code
to use a stack zval for the unused return case now. As we have
retval specialization now, we know that it doesn't matter.
Nikita Popov [Thu, 11 Feb 2016 15:38:30 +0000 (16:38 +0100)]
Support partial GC for unfinished generators
This doesn't cover everything yet, but should be a good start for
cycled in unfinished generators.
Nikita Popov [Thu, 11 Feb 2016 15:33:23 +0000 (16:33 +0100)]
Merge branch 'PHP-7.0'
Nikita Popov [Thu, 11 Feb 2016 15:32:45 +0000 (16:32 +0100)]
Fix yield-by-ref of constant
Typo in the condition...
Nikita Popov [Thu, 11 Feb 2016 15:25:55 +0000 (16:25 +0100)]
Merge branch 'PHP-7.0'
Nikita Popov [Thu, 11 Feb 2016 15:22:42 +0000 (16:22 +0100)]
Fix dangling send target when using yield from
Also drop some unnecessary TRY_DELREFs -- leftovers from the days
when null was refcounted.
Anatol Belski [Thu, 11 Feb 2016 15:24:04 +0000 (16:24 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
fix version header