]>
granicus.if.org Git - php/log
Anatol Belski [Fri, 29 Jan 2016 15:33:19 +0000 (16:33 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
fix tests
Anatol Belski [Fri, 29 Jan 2016 15:32:27 +0000 (16:32 +0100)]
fix tests
Anatol Belski [Fri, 29 Jan 2016 15:04:13 +0000 (16:04 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
fix yet another leak
Anatol Belski [Fri, 29 Jan 2016 15:03:01 +0000 (16:03 +0100)]
fix yet another leak
Derick Rethans [Fri, 29 Jan 2016 14:34:57 +0000 (15:34 +0100)]
Merge branch 'PHP-7.0'
Derick Rethans [Fri, 29 Jan 2016 14:34:47 +0000 (15:34 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
Derick Rethans [Fri, 29 Jan 2016 14:34:36 +0000 (15:34 +0100)]
Added entry to NEWS
Derick Rethans [Fri, 29 Jan 2016 14:30:53 +0000 (15:30 +0100)]
Merge branch 'PHP-7.0'
Derick Rethans [Fri, 29 Jan 2016 14:30:31 +0000 (15:30 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
Derick Rethans [Fri, 29 Jan 2016 14:28:11 +0000 (15:28 +0100)]
Use the new timelib function for comparing times
Willem-Jan [Mon, 30 Nov 2015 16:35:12 +0000 (17:35 +0100)]
Test + support for negative timestamps with microtime
Willem-Jan [Mon, 30 Nov 2015 14:35:16 +0000 (15:35 +0100)]
Also test against equality
Willem-Jan [Mon, 30 Nov 2015 13:58:02 +0000 (14:58 +0100)]
Compare agaist fraction when sse are equal
Willem-Jan [Mon, 30 Nov 2015 13:18:58 +0000 (14:18 +0100)]
Added test for comparing dates with microseconds
Derick Rethans [Fri, 29 Jan 2016 14:21:55 +0000 (15:21 +0100)]
Merge in changes in timelib 2016.01
Anatol Belski [Fri, 29 Jan 2016 14:19:40 +0000 (15:19 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
fix wrong gc sequence
Anatol Belski [Fri, 29 Jan 2016 14:18:59 +0000 (15:18 +0100)]
fix wrong gc sequence
Anatol Belski [Fri, 29 Jan 2016 13:48:36 +0000 (14:48 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
fix leak in 7.0
Anatol Belski [Fri, 29 Jan 2016 13:37:46 +0000 (14:37 +0100)]
fix leak in 7.0
Anatol Belski [Fri, 29 Jan 2016 12:59:45 +0000 (13:59 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
fix leak in 5.6
Anatol Belski [Fri, 29 Jan 2016 12:59:28 +0000 (13:59 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
fix leak in 5.6
Anatol Belski [Fri, 29 Jan 2016 12:56:11 +0000 (13:56 +0100)]
fix leak in 5.6
Anatol Belski [Fri, 29 Jan 2016 11:53:57 +0000 (12:53 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
revert the API string as well
update NEWS
Anatol Belski [Fri, 29 Jan 2016 11:52:41 +0000 (12:52 +0100)]
revert the API string as well
Anatol Belski [Fri, 29 Jan 2016 11:44:42 +0000 (12:44 +0100)]
update NEWS
Fix for #70720 is postphoned to 7.0.4
Anatol Belski [Fri, 29 Jan 2016 11:30:24 +0000 (12:30 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
adjust test for 7.0
add test for bug #69111
update NEWS
Anatol Belski [Fri, 29 Jan 2016 11:29:41 +0000 (12:29 +0100)]
adjust test for 7.0
Anatol Belski [Fri, 29 Jan 2016 11:29:05 +0000 (12:29 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
add test for bug #69111
Anatol Belski [Fri, 29 Jan 2016 11:27:35 +0000 (12:27 +0100)]
add test for bug #69111
Anatol Belski [Fri, 29 Jan 2016 10:29:09 +0000 (11:29 +0100)]
update NEWS
Anatol Belski [Fri, 29 Jan 2016 10:28:38 +0000 (11:28 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
update NEWS
Anatol Belski [Fri, 29 Jan 2016 10:27:44 +0000 (11:27 +0100)]
update NEWS
Anatol Belski [Fri, 29 Jan 2016 10:25:51 +0000 (11:25 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
refix bug #69111, crash in 5.6 only
Anatol Belski [Fri, 29 Jan 2016 10:25:32 +0000 (11:25 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
refix bug #69111, crash in 5.6 only
Anatol Belski [Fri, 29 Jan 2016 10:24:19 +0000 (11:24 +0100)]
refix bug #69111, crash in 5.6 only
Anatol Belski [Fri, 29 Jan 2016 10:11:53 +0000 (11:11 +0100)]
update NEWS
Remi Collet [Fri, 29 Jan 2016 09:24:58 +0000 (10:24 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
NEWS
NEWS
Fixed Bug #62172 FPM not working with Apache httpd 2.4 balancer/fcgi setup
Remi Collet [Fri, 29 Jan 2016 09:24:40 +0000 (10:24 +0100)]
NEWS
Remi Collet [Fri, 29 Jan 2016 09:24:15 +0000 (10:24 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
NEWS
Fixed Bug #62172 FPM not working with Apache httpd 2.4 balancer/fcgi setup
Remi Collet [Fri, 29 Jan 2016 09:23:42 +0000 (10:23 +0100)]
NEWS
Remi Collet [Fri, 29 Jan 2016 09:20:42 +0000 (10:20 +0100)]
Fixed Bug #62172 FPM not working with Apache httpd 2.4 balancer/fcgi setup
Only needed with Apache version < 2.4.12 (ex RHEL-7)
Anatol Belski [Fri, 29 Jan 2016 07:43:42 +0000 (08:43 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
update NEWS
update NEWS
Anatol Belski [Fri, 29 Jan 2016 07:43:13 +0000 (08:43 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
update NEWS
Anatol Belski [Fri, 29 Jan 2016 07:42:54 +0000 (08:42 +0100)]
update NEWS
Anatol Belski [Fri, 29 Jan 2016 07:41:25 +0000 (08:41 +0100)]
update NEWS
Anatol Belski [Fri, 29 Jan 2016 07:39:23 +0000 (08:39 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
reset ext/session to the state of 7.0.2
reset the ext/session to the state of 5.6.17
Anatol Belski [Fri, 29 Jan 2016 07:37:27 +0000 (08:37 +0100)]
reset ext/session to the state of 7.0.2
Anatol Belski [Fri, 29 Jan 2016 07:37:05 +0000 (08:37 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
reset the ext/session to the state of 5.6.17
Anatol Belski [Fri, 29 Jan 2016 07:33:09 +0000 (08:33 +0100)]
reset the ext/session to the state of 5.6.17
Andrea Faulds [Thu, 28 Jan 2016 18:07:45 +0000 (18:07 +0000)]
Test for void
Andrea Faulds [Thu, 28 Jan 2016 18:01:48 +0000 (18:01 +0000)]
Support void return type in reflection
Dmitry Stogov [Thu, 28 Jan 2016 15:00:06 +0000 (18:00 +0300)]
Use special type IS_ERROR instread of EG(error_zval). (we still need EG(error_zval) for SPL support).
Dmitry Stogov [Thu, 28 Jan 2016 08:54:48 +0000 (11:54 +0300)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed bug #71474 (Crash because of VM stack corruption on Magento2).
Dmitry Stogov [Thu, 28 Jan 2016 08:41:15 +0000 (11:41 +0300)]
Fixed bug #71474 (Crash because of VM stack corruption on Magento2).
Yasuo Ohgaki [Thu, 28 Jan 2016 06:05:21 +0000 (15:05 +0900)]
Update error message. Missed to include in previous commit
46d4a371054f43fe8aeca14b83ba722adc84ac10
Mikko [Tue, 26 Jan 2016 03:34:19 +0000 (03:34 +0000)]
Session regenerate id seems to malfunction with 3rd party session handlers
Fixed bug #71472 session_regenerate_id malfunctions with certain session handlers
Stanislav Malyshev [Wed, 27 Jan 2016 06:55:20 +0000 (22:55 -0800)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Use safe alloc functions when calculations are made on sizes.
Stanislav Malyshev [Wed, 27 Jan 2016 06:10:43 +0000 (22:10 -0800)]
Use safe alloc functions when calculations are made on sizes.
Fixes bug #71449, bug #71450
Anatol Belski [Tue, 26 Jan 2016 15:41:00 +0000 (16:41 +0100)]
fix typo
Xinchen Hui [Tue, 26 Jan 2016 08:22:55 +0000 (16:22 +0800)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed bug #71439 (OpenSSL-dependent test fails to skip when openssl not enabled)
Xinchen Hui [Tue, 26 Jan 2016 08:22:31 +0000 (16:22 +0800)]
Fixed bug #71439 (OpenSSL-dependent test fails to skip when openssl not enabled)
Xinchen Hui [Tue, 26 Jan 2016 07:59:32 +0000 (15:59 +0800)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Added test for bug #71443
Xinchen Hui [Tue, 26 Jan 2016 07:59:18 +0000 (15:59 +0800)]
Added test for bug #71443
Xinchen Hui [Tue, 26 Jan 2016 07:58:14 +0000 (15:58 +0800)]
Merge branch 'master' of git.php.net:/php-src
* 'master' of git.php.net:/php-src:
add note on readline support
check for NULL and avoid crashes
Xinchen Hui [Tue, 26 Jan 2016 07:57:49 +0000 (15:57 +0800)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed bug #71443 (Segfault using built-in webserver with intl using symfony)
Fix memory leak with not freeing OpenSSL errors
check for NULL and avoid crashes
Update libmagic.patch for PHP-5.6
Fixed bug #7143 (finfo throws notice for specific python file)
Xinchen Hui [Tue, 26 Jan 2016 07:57:39 +0000 (15:57 +0800)]
Fixed bug #71443 (Segfault using built-in webserver with intl using symfony)
Anatol Belski [Tue, 26 Jan 2016 07:55:49 +0000 (08:55 +0100)]
add note on readline support
Jakub Zelenka [Mon, 25 Jan 2016 17:20:05 +0000 (17:20 +0000)]
Merge branch 'PHP-7.0'
Jakub Zelenka [Mon, 25 Jan 2016 17:19:18 +0000 (17:19 +0000)]
Merge branch 'PHP-5.6' into PHP-7.0
Jakub Zelenka [Mon, 25 Jan 2016 16:50:16 +0000 (16:50 +0000)]
Fix memory leak with not freeing OpenSSL errors
Antony Dovgal [Mon, 25 Jan 2016 11:29:51 +0000 (14:29 +0300)]
check for NULL and avoid crashes
Antony Dovgal [Mon, 25 Jan 2016 11:29:51 +0000 (14:29 +0300)]
check for NULL and avoid crashes
Xinchen Hui [Mon, 25 Jan 2016 08:00:10 +0000 (16:00 +0800)]
Improve the names
Xinchen Hui [Mon, 25 Jan 2016 04:13:35 +0000 (12:13 +0800)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed bug #71442 (forward_static_call crash)
Xinchen Hui [Mon, 25 Jan 2016 04:13:22 +0000 (12:13 +0800)]
Fixed bug #71442 (forward_static_call crash)
Xinchen Hui [Mon, 25 Jan 2016 03:46:42 +0000 (11:46 +0800)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Update libmagic.patch for PHP-7.0
Fixed compiler warnings
Fixed bug #71434 (finfo throws notice for specific python file)
Xinchen Hui [Mon, 25 Jan 2016 03:45:20 +0000 (11:45 +0800)]
Update libmagic.patch for PHP-7.0
Xinchen Hui [Mon, 25 Jan 2016 03:42:36 +0000 (11:42 +0800)]
Fixed compiler warnings
Xinchen Hui [Mon, 25 Jan 2016 03:40:08 +0000 (11:40 +0800)]
Fixed bug #71434 (finfo throws notice for specific python file)
Xinchen Hui [Mon, 25 Jan 2016 03:25:04 +0000 (11:25 +0800)]
Update libmagic.patch for PHP-5.6
Xinchen Hui [Mon, 25 Jan 2016 03:20:48 +0000 (11:20 +0800)]
Fixed bug #7143 (finfo throws notice for specific python file)
There seems be a bug while it was changed from regexec to
preg_match_impl:
https://github.com/php/php-src/commit/
46906925 #diff-56e765972d18c84894ea061cfe58076aR1757
Nikita Popov [Sat, 23 Jan 2016 16:58:36 +0000 (17:58 +0100)]
Remove dead code
OP_DATA isn't used in that way anymore
Nikita Popov [Sat, 23 Jan 2016 15:56:27 +0000 (16:56 +0100)]
Respect RC_INFERENCE during DFG construction
To avoid inserting phis that are only relevant with rc inference
enabled. Suprisingly, this affects only 0.8% of phis.
Nikita Popov [Sat, 23 Jan 2016 15:27:19 +0000 (16:27 +0100)]
Don't insert duplicate predecessors
Otherwise we'll get corrupt phis
Nikita Popov [Fri, 22 Jan 2016 14:38:38 +0000 (15:38 +0100)]
Fix SSA for ZEND_YIELD
Yield-by-ref defs a ref var, yield-by-var only defs an rc1/rcn var
if rc inference is used.
Also move BIND_LEXICAL where it belongs in DFG construction.
Bob Weinand [Sun, 24 Jan 2016 18:55:31 +0000 (19:55 +0100)]
Merge branch 'PHP-7.0'
Bob Weinand [Sun, 24 Jan 2016 18:55:16 +0000 (19:55 +0100)]
Fixed bug #71441 (Typehinted Generator with return in try/finally crashes)
Xinchen Hui [Sun, 24 Jan 2016 11:57:17 +0000 (03:57 -0800)]
Merge branch 'PHP-7.0'
Xinchen Hui [Sun, 24 Jan 2016 11:56:47 +0000 (03:56 -0800)]
Fixed Bug #71435 (Reproducible crash using opcache.file_cache_only=1 and class constant)
Xinchen Hui [Sun, 24 Jan 2016 06:49:15 +0000 (22:49 -0800)]
Fixed warning of incompatible pointer
Bob Weinand [Sat, 23 Jan 2016 17:17:18 +0000 (18:17 +0100)]
Merge branch 'PHP-7.0'
Bob Weinand [Sat, 23 Jan 2016 17:16:57 +0000 (18:16 +0100)]
Use uint64_t for flags (warning)
Jakub Zelenka [Fri, 22 Jan 2016 19:39:16 +0000 (19:39 +0000)]
Update NEWS and UPGRADING for PR #1701
Eddie Kohler [Tue, 29 Dec 2015 00:05:09 +0000 (19:05 -0500)]
json_encode: Escape U+2028 and U+2029 more often.
These characters are illegal in Javascript, so leaving them unescaped
is risky. The default encoder ($flags = 0) is fine, but the encoder
with JSON_UNESCAPED_UNICODE flag is not.
In case anyone wants the ability to leave these characters unescaped,
provide JSON_UNESCAPED_LINE_TERMINATORS.
Dmitry Stogov [Fri, 22 Jan 2016 10:32:20 +0000 (13:32 +0300)]
More accurate handling of isset() and unset()
Dmitry Stogov [Fri, 22 Jan 2016 10:30:34 +0000 (13:30 +0300)]
Added optimization constraint (don't optimize result of NEW, because constructor may throw exception)
Xinchen Hui [Fri, 22 Jan 2016 07:34:56 +0000 (15:34 +0800)]
Return meaningful value
Xinchen Hui [Fri, 22 Jan 2016 03:22:37 +0000 (11:22 +0800)]
We don't need to dup zend_class_constant here.
quote why the internal class is still using duplication:
```
for internal classes, the zend_class_constant is malloc-ed. we need to
free it.
if (const->ce == ce) {
zval_ptr_dtor(&const->value);
free(const)
}
so, if two classes share one const, and it(parent class) was freed
before, this read(in child class, const->ce) is invalid..
and destroy_zend_class is called via zend_hash_destroy(class_table).
which is not in reverse order... so, parent classes are dtor first.
if we want this work, we should change that order.
```
Nikita Popov [Thu, 21 Jan 2016 20:28:02 +0000 (21:28 +0100)]
Make op1/op2 decoding in phpdbg more complete
Nikita Popov [Thu, 21 Jan 2016 20:52:50 +0000 (21:52 +0100)]
Don't print try-catch offset for FAST_RET w/o ev