]>
granicus.if.org Git - php/log
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
Anatol Belski [Thu, 11 Feb 2016 15:23:19 +0000 (16:23 +0100)]
fix version header
Bob Weinand [Thu, 11 Feb 2016 05:43:55 +0000 (06:43 +0100)]
Merge branch 'PHP-7.0'
Bob Weinand [Thu, 11 Feb 2016 05:42:51 +0000 (06:42 +0100)]
Fixed inherited functions from unspecified files being included in phpdbg_get_executable()
See also https://github.com/krakjoe/phpdbg/issues/152
Nikita Popov [Wed, 10 Feb 2016 18:04:33 +0000 (19:04 +0100)]
Merge branch 'PHP-7.0'
Nikita Popov [Wed, 10 Feb 2016 18:03:02 +0000 (19:03 +0100)]
Crude generator GC for value/key/retval
These values remain live after the generator has been closed, so
they are particularly susceptible to leaking cycles.
Joe Watkins [Wed, 10 Feb 2016 12:59:52 +0000 (12:59 +0000)]
Merge branch 'master' of https://github.com/php/php-src
Joe Watkins [Wed, 10 Feb 2016 12:57:48 +0000 (12:57 +0000)]
be more precise about the meaning of -n
Joe Watkins [Wed, 10 Feb 2016 12:58:19 +0000 (12:58 +0000)]
Merge branch 'PHP-7.0' of https://github.com/php/php-src into PHP-7.0
Joe Watkins [Wed, 10 Feb 2016 12:57:48 +0000 (12:57 +0000)]
be more precise about the meaning of -n
Xinchen Hui [Tue, 9 Feb 2016 15:37:11 +0000 (23:37 +0800)]
Merge branch 'master' of git.php.net:/php-src
Xinchen Hui [Tue, 9 Feb 2016 15:36:24 +0000 (23:36 +0800)]
Merge branch 'PHP-7.0'
Xinchen Hui [Tue, 9 Feb 2016 15:36:15 +0000 (23:36 +0800)]
Update NEWS
Xinchen Hui [Tue, 9 Feb 2016 15:35:55 +0000 (23:35 +0800)]
Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
ext/zip/php_zip.c
Xinchen Hui [Tue, 9 Feb 2016 15:33:30 +0000 (23:33 +0800)]
Merge branch 'PHP-5.6' of git.php.net:/php-src into PHP-5.6
Xinchen Hui [Tue, 9 Feb 2016 15:32:20 +0000 (23:32 +0800)]
Fixed bug #71561 (NULL pointer dereference in Zip::ExtractTo)
Nikita Popov [Tue, 9 Feb 2016 11:40:02 +0000 (12:40 +0100)]
Support CFG construction without live range splitting
We must not split at live range boundaries for SSA constructions,
otherwise an OP_DATA instruction may be separated into new block
and not picked up during renaming.
It's also unnecessary for this use case and only blows up the CFG.
Dmitry Stogov [Tue, 9 Feb 2016 10:12:57 +0000 (13:12 +0300)]
Cleanup OP_DATA usage. Now only first operand of OP_DATA is used for ASSIGN_DIM, ASSIGN_OBJ and ASSIGN_OP (DIM/OBJ) instructions.
Dmitry Stogov [Tue, 9 Feb 2016 09:16:17 +0000 (12:16 +0300)]
After DFA pass result of FE_FETCH may be CV
Xinchen Hui [Tue, 9 Feb 2016 04:20:33 +0000 (12:20 +0800)]
Merge branch 'PHP-7.0'
Xinchen Hui [Tue, 9 Feb 2016 04:20:11 +0000 (12:20 +0800)]
Fixed bug (Low probability segfault in zend_arena)
Lior Kaplan [Mon, 8 Feb 2016 18:33:17 +0000 (20:33 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Align spacing in make install messages
Lior Kaplan [Mon, 8 Feb 2016 18:31:08 +0000 (20:31 +0200)]
Add entry for re-fix of #70976 in commit
14e4d393
Lior Kaplan [Mon, 8 Feb 2016 18:29:24 +0000 (20:29 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Align spacing in make install messages
Add entry for re-fix of #70976 in commit
14e4d393
Lior Kaplan [Mon, 8 Feb 2016 18:27:19 +0000 (20:27 +0200)]
Align spacing in make install messages
Leigh [Mon, 8 Feb 2016 11:43:28 +0000 (11:43 +0000)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed memory leak in curl_getinfo()
Leigh [Mon, 8 Feb 2016 11:36:14 +0000 (11:36 +0000)]
Fixed memory leak in curl_getinfo()
The "v ? v" in the CAASTR macro caused zend_string_copy to be
called twice
Dmitry Stogov [Mon, 8 Feb 2016 09:20:37 +0000 (12:20 +0300)]
Removed wrong (old) code
Xinchen Hui [Mon, 8 Feb 2016 02:22:51 +0000 (10:22 +0800)]
Merge branch 'PHP-7.0'
Xinchen Hui [Mon, 8 Feb 2016 02:22:16 +0000 (10:22 +0800)]
Happy Year of Monkey (Forgot test of #71537)
Lior Kaplan [Sun, 7 Feb 2016 18:19:31 +0000 (20:19 +0200)]
Add entry for re-fix of #70976 in commit
14e4d393
Xinchen Hui [Sun, 7 Feb 2016 15:19:37 +0000 (23:19 +0800)]
Merge branch 'PHP-7.0'
Xinchen Hui [Sun, 7 Feb 2016 15:19:24 +0000 (23:19 +0800)]
Fixed bug #71537 (PCRE segfault from Opcache)
Nikita Popov [Sat, 6 Feb 2016 15:43:54 +0000 (16:43 +0100)]
Merge branch 'PHP-7.0'
Conflicts:
Zend/zend_compile.c
Nikita Popov [Sat, 6 Feb 2016 15:38:59 +0000 (16:38 +0100)]
Fix bug #71529
Dmitry Stogov [Fri, 5 Feb 2016 12:46:52 +0000 (15:46 +0300)]
Specialize DO_FCALL (and variations) according to used/unused return value
Dmitry Stogov [Fri, 5 Feb 2016 12:07:58 +0000 (15:07 +0300)]
Use extra specialization to eliminate run-time checks for conditions known at compile time in SEND_VAL_EX and SEND_VAR_EX.
Xinchen Hui [Fri, 5 Feb 2016 11:56:36 +0000 (19:56 +0800)]
Merge branch 'PHP-7.0'
Xinchen Hui [Fri, 5 Feb 2016 11:56:23 +0000 (19:56 +0800)]
Online test
Xinchen Hui [Fri, 5 Feb 2016 11:52:24 +0000 (19:52 +0800)]
Merge branch 'PHP-7.0'
Conflicts:
main/php_version.h
Xinchen Hui [Fri, 5 Feb 2016 11:51:58 +0000 (19:51 +0800)]
Update NEWS
Xinchen Hui [Fri, 5 Feb 2016 11:51:33 +0000 (19:51 +0800)]
Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
ext/curl/interface.c
Xinchen Hui [Fri, 5 Feb 2016 11:49:26 +0000 (19:49 +0800)]
Fixed bug #71523 (Copied handle with new option CURLOPT_HTTPHEADER crashes while curl_multi_exec)
Dmitry Stogov [Fri, 5 Feb 2016 10:18:58 +0000 (13:18 +0300)]
Specialize ASSIGN according to used/unused return value
Lior Kaplan [Thu, 4 Feb 2016 23:13:19 +0000 (01:13 +0200)]
Align NEWS entry format
Lior Kaplan [Thu, 4 Feb 2016 23:11:20 +0000 (01:11 +0200)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Align NEWS entry format
Align NEWS entry format
Lior Kaplan [Thu, 4 Feb 2016 23:08:22 +0000 (01:08 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Align NEWS entry format
Lior Kaplan [Thu, 4 Feb 2016 23:08:01 +0000 (01:08 +0200)]
Align NEWS entry format
Lior Kaplan [Thu, 4 Feb 2016 22:40:12 +0000 (00:40 +0200)]
Align NEWS entry format
Ferenc Kovacs [Thu, 4 Feb 2016 19:41:33 +0000 (20:41 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
update NEWS
Ferenc Kovacs [Thu, 4 Feb 2016 19:41:13 +0000 (20:41 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
update NEWS
Ferenc Kovacs [Thu, 4 Feb 2016 19:40:54 +0000 (20:40 +0100)]
update NEWS
Anatol Belski [Thu, 4 Feb 2016 17:10:12 +0000 (18:10 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
add missin NEWS entry
Anatol Belski [Thu, 4 Feb 2016 17:09:35 +0000 (18:09 +0100)]
add missin NEWS entry
Jakub Zelenka [Thu, 4 Feb 2016 16:57:41 +0000 (16:57 +0000)]
Merge branch 'PHP-7.0'
Jakub Zelenka [Thu, 4 Feb 2016 16:54:44 +0000 (16:54 +0000)]
Merge branch 'PHP-5.6' into PHP-7.0
Jakub Zelenka [Thu, 4 Feb 2016 16:51:36 +0000 (16:51 +0000)]
Split and clean up OpenSSL X509 tests
Bob Weinand [Tue, 2 Feb 2016 02:03:21 +0000 (03:03 +0100)]
Add extra VM operand specialization
For now RETVAL and OP_DATA= are supported
Nikita Popov [Thu, 4 Feb 2016 12:31:21 +0000 (13:31 +0100)]
Remove use of register keyword in headers
Headers must be C++ compatible -- this throws warnings.
The register keyword is not used for optimization, at least not
in optimized builds.
Nikita Popov [Thu, 4 Feb 2016 11:03:07 +0000 (12:03 +0100)]
Add back typedefs for php_uint32 and php_int32
It's pretty likely that extensions rely on these, no need to break
things.
Rouven Weßling [Fri, 29 Jan 2016 12:47:47 +0000 (13:47 +0100)]
Replace usage of php_hash_uint32 and php_hash_uint64 with uint32_t and uint64_t.
Remove the unused php_hash_int32 and php_hash_int64.
Rouven Weßling [Fri, 29 Jan 2016 10:02:46 +0000 (11:02 +0100)]
Replace usage of php_uint16 with uint16_t
Rouven Weßling [Thu, 28 Jan 2016 16:11:53 +0000 (17:11 +0100)]
Replace usage of php_int32 and php_uint32 with int32_t and uint32_t
Nikita Popov [Thu, 4 Feb 2016 10:45:34 +0000 (11:45 +0100)]
Merge branch 'PHP-7.0'
Hieu Le [Wed, 3 Feb 2016 06:20:30 +0000 (13:20 +0700)]
Fix bug #71501
Jakub Zelenka [Wed, 3 Feb 2016 16:23:37 +0000 (16:23 +0000)]
Merge branch 'PHP-7.0'
Jakub Zelenka [Wed, 3 Feb 2016 16:22:39 +0000 (16:22 +0000)]
Merge branch 'PHP-5.6' into PHP-7.0
Jakub Zelenka [Wed, 3 Feb 2016 16:20:27 +0000 (16:20 +0000)]
Rename and clean up OpenSSL tests
Antony Dovgal [Wed, 3 Feb 2016 15:02:58 +0000 (18:02 +0300)]
fix build
sorry about that =\
Antony Dovgal [Wed, 3 Feb 2016 15:02:58 +0000 (18:02 +0300)]
fix build
sorry about that =\
Michael Wallner [Thu, 8 Oct 2015 09:16:22 +0000 (11:16 +0200)]
fix generating config.nice; again
The fix in
a8bc18420702e1b4fa524d21eae804cd6004879e broke if an arg
containing spaces was passed to configure.
Antony Dovgal [Wed, 3 Feb 2016 12:11:59 +0000 (15:11 +0300)]
use correct element size, avoid reading stack
Antony Dovgal [Wed, 3 Feb 2016 12:11:59 +0000 (15:11 +0300)]
use correct element size, avoid reading stack
Antony Dovgal [Wed, 3 Feb 2016 11:48:38 +0000 (14:48 +0300)]
check length first, prevent out-of-bounds read
Antony Dovgal [Wed, 3 Feb 2016 11:48:38 +0000 (14:48 +0300)]
check length first, prevent out-of-bounds read