]>
granicus.if.org Git - php/log
Xinchen Hui [Wed, 2 Nov 2016 04:12:25 +0000 (12:12 +0800)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Update NEWS
Fixed bug #73423 (Reproducible crash with GDB backtrace)
Xinchen Hui [Wed, 2 Nov 2016 04:12:12 +0000 (12:12 +0800)]
Update NEWS
Xinchen Hui [Wed, 2 Nov 2016 04:11:48 +0000 (12:11 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #73423 (Reproducible crash with GDB backtrace)
Xinchen Hui [Wed, 2 Nov 2016 04:11:30 +0000 (12:11 +0800)]
Fixed bug #73423 (Reproducible crash with GDB backtrace)
Dmitry Stogov [Tue, 1 Nov 2016 19:58:59 +0000 (22:58 +0300)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Intriduced ZEND_ACC_INHERITED class flag. It's going to be helpful for static optimisations, when "parent" is not known yet.
Dmitry Stogov [Tue, 1 Nov 2016 19:56:25 +0000 (22:56 +0300)]
Intriduced ZEND_ACC_INHERITED class flag.
It's going to be helpful for static optimisations, when "parent" is not known yet.
Christoph M. Becker [Tue, 1 Nov 2016 19:30:18 +0000 (20:30 +0100)]
Merge branch 'PHP-7.1'
Christoph M. Becker [Tue, 1 Nov 2016 19:29:11 +0000 (20:29 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Tue, 1 Nov 2016 19:24:10 +0000 (20:24 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Tue, 1 Nov 2016 19:13:53 +0000 (20:13 +0100)]
Fix #73436: Setting allow_url_fopen to Off makes several tests fail
We make sure that these tests run with allow_url_fopen=1.
Sara Golemon [Tue, 1 Nov 2016 16:37:02 +0000 (09:37 -0700)]
Merge branch 'PHP-7.1'
This commit already landed on master as
b041bebb
but I didn't realize we needed it on 7.1 as well.
Cherry-picking, then merging the pick to keep the repo happy.
* PHP-7.1:
Change Big Endian backup implementations to use signed indexes
Sara Golemon [Wed, 12 Oct 2016 03:43:02 +0000 (20:43 -0700)]
Change Big Endian backup implementations to use signed indexes
load64() counted down from 7..0, but the decrement turned 0 into 255.
This means the loop would never terminate on Big Endian systems.
Just use signed char integers since we're only dealing with values from 0..7 anyway.
Closes https://bugs.php.net/bug.php?id=73282
Dmitry Stogov [Tue, 1 Nov 2016 16:04:23 +0000 (19:04 +0300)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed reference-counter inference
Dmitry Stogov [Tue, 1 Nov 2016 16:04:10 +0000 (19:04 +0300)]
Fixed reference-counter inference
Anatol Belski [Tue, 1 Nov 2016 13:02:49 +0000 (14:02 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
add run target
Anatol Belski [Tue, 1 Nov 2016 13:02:04 +0000 (14:02 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
add run target
Anatol Belski [Tue, 1 Nov 2016 12:50:46 +0000 (13:50 +0100)]
add run target
With this it is possible to run some code with the currently compiled
PHP and all the required environment included.
Dmitry Stogov [Mon, 31 Oct 2016 21:18:34 +0000 (00:18 +0300)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed reference-counter inference
Dmitry Stogov [Mon, 31 Oct 2016 21:18:12 +0000 (00:18 +0300)]
Fixed reference-counter inference
Dmitry Stogov [Mon, 31 Oct 2016 18:39:50 +0000 (21:39 +0300)]
Merge branch 'PHP-7.1'
* PHP-7.1:
typo
Dmitry Stogov [Mon, 31 Oct 2016 18:39:34 +0000 (21:39 +0300)]
typo
Adam Baratz [Mon, 31 Oct 2016 17:15:03 +0000 (13:15 -0400)]
Use more accurate types to avoid compiler warnings
Dmitry Stogov [Mon, 31 Oct 2016 16:51:50 +0000 (19:51 +0300)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed reference-counter inference
Dmitry Stogov [Mon, 31 Oct 2016 16:51:19 +0000 (19:51 +0300)]
Fixed reference-counter inference
Adam Baratz [Mon, 31 Oct 2016 16:39:22 +0000 (12:39 -0400)]
Fix comment style
Derick Rethans [Mon, 31 Oct 2016 10:43:54 +0000 (10:43 +0000)]
Merge branch 'PHP-7.1'
Derick Rethans [Mon, 31 Oct 2016 10:43:33 +0000 (10:43 +0000)]
- Fixed bug #73426: createFromFormat with 'z' format char results in incorrect time.
Stanislav Malyshev [Mon, 31 Oct 2016 00:12:21 +0000 (17:12 -0700)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Typo
Stanislav Malyshev [Mon, 31 Oct 2016 00:11:18 +0000 (17:11 -0700)]
Merge branch 'pull-request/2179' into PHP-7.1
* pull-request/2179:
Typo
Anatol Belski [Sun, 30 Oct 2016 20:27:54 +0000 (21:27 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
prefer symbols read from the bin to those matching the naming scheme
Anatol Belski [Sun, 30 Oct 2016 20:27:35 +0000 (21:27 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
prefer symbols read from the bin to those matching the naming scheme
Anatol Belski [Sun, 30 Oct 2016 20:22:24 +0000 (21:22 +0100)]
prefer symbols read from the bin to those matching the naming scheme
Anatol Belski [Sun, 30 Oct 2016 20:14:21 +0000 (21:14 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
remove debug out
Anatol Belski [Sun, 30 Oct 2016 20:13:55 +0000 (21:13 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
remove debug out
Anatol Belski [Sun, 30 Oct 2016 20:12:50 +0000 (21:12 +0100)]
remove debug out
Anatol Belski [Sun, 30 Oct 2016 20:09:31 +0000 (21:09 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
fix link with deps pdb availability
Anatol Belski [Sun, 30 Oct 2016 20:07:20 +0000 (21:07 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix link with deps pdb availability
Anatol Belski [Sun, 30 Oct 2016 19:55:38 +0000 (20:55 +0100)]
fix link with deps pdb availability
Unlike debugger, linker is currently not able to read the pdb files,
even if they're put onto path. As result, a lot of LNK4099 warnings
and in some cases also missing debug information in the end binaries.
This is solved by copying the relevant pdb into the build dir, which
then can be picked up on link time. This also leads to the inclusion
of those pdb files into the debug package, so symbols won't be missed
in crash dumps. As otherwise the debug info for dependencies is only
contained in the dependency packages.
Jakub Zelenka [Sun, 30 Oct 2016 19:13:21 +0000 (19:13 +0000)]
Merge branch 'PHP-7.1'
Jakub Zelenka [Sun, 30 Oct 2016 19:12:24 +0000 (19:12 +0000)]
Define X509_get_signature_nid for LibreSSL
It should hopefully fix the LibreSSL build. Thanks to Alice Wonder!
Jakub Zelenka [Sun, 30 Oct 2016 19:02:46 +0000 (19:02 +0000)]
Merge branch 'PHP-7.1'
Jakub Zelenka [Sun, 30 Oct 2016 18:58:11 +0000 (18:58 +0000)]
Fix EC_KEY memory leaks
It was caused by using of EVP_PKEY_get1_EC_KEY which increments an EC_KEY
reference. The fix it we simply use EVP_PKEY_get0_EC_KEY.
Anatol Belski [Sun, 30 Oct 2016 14:30:33 +0000 (15:30 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
use rather the makefile var
rename the env setting target and reuse it for build-snap
Anatol Belski [Sun, 30 Oct 2016 14:30:17 +0000 (15:30 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
use rather the makefile var
rename the env setting target and reuse it for build-snap
Anatol Belski [Sun, 30 Oct 2016 14:28:56 +0000 (15:28 +0100)]
use rather the makefile var
Anatol Belski [Sun, 30 Oct 2016 14:22:45 +0000 (15:22 +0100)]
rename the env setting target and reuse it for build-snap
Jakub Zelenka [Sun, 30 Oct 2016 13:22:45 +0000 (13:22 +0000)]
Merge branch 'PHP-7.1'
Jakub Zelenka [Sun, 30 Oct 2016 13:20:10 +0000 (13:20 +0000)]
Introduce json encoder to fix globals related issues
It fixes bugs #66025 and #73254 by replacing globals with
a passed structure holding depth and error code. In addition
it fixes #72069 in a more generic way.
Bob Weinand [Sat, 29 Oct 2016 16:50:36 +0000 (18:50 +0200)]
Merge branch 'PHP-7.1'
Bob Weinand [Sat, 29 Oct 2016 16:50:06 +0000 (18:50 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Bob Weinand [Sat, 29 Oct 2016 16:49:38 +0000 (18:49 +0200)]
Fixed build failure introduced by PR #2158
Note: AC_TRY_LINK interprets the source as part of a main function, ending up with int main() { /* ... */ int main() { /* ... */ } ; return 0; } here - Using AC_LINK_IFELSE with AC_LANG_SOURCE directly instead.
Anatol Belski [Sat, 29 Oct 2016 15:58:01 +0000 (17:58 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
fix condition
Anatol Belski [Sat, 29 Oct 2016 15:57:33 +0000 (17:57 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix condition
Anatol Belski [Sat, 29 Oct 2016 12:57:15 +0000 (14:57 +0200)]
fix condition
Xinchen Hui [Sat, 29 Oct 2016 15:44:48 +0000 (23:44 +0800)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed bug #73402 (Opcache segfault when using class constant to call a method)
Xinchen Hui [Sat, 29 Oct 2016 15:44:37 +0000 (23:44 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #73402 (Opcache segfault when using class constant to call a method)
Xinchen Hui [Sat, 29 Oct 2016 15:43:59 +0000 (23:43 +0800)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fixed bug #73402 (Opcache segfault when using class constant to call a method)
Conflicts:
ext/opcache/Optimizer/zend_optimizer.c
Xinchen Hui [Sat, 29 Oct 2016 15:41:51 +0000 (23:41 +0800)]
Fixed bug #73402 (Opcache segfault when using class constant to call a method)
Nikita Popov [Sat, 29 Oct 2016 15:11:55 +0000 (17:11 +0200)]
Drop dead code in zend_call_method
As no_separation=1 is used this can not happen anymore.
Nikita Popov [Sat, 29 Oct 2016 12:51:41 +0000 (14:51 +0200)]
Cleanup zend_std_call_setter
__set() does not use the return value to indicate success, and at
this point I doubt it ever will.
Nikita Popov [Sat, 29 Oct 2016 12:39:07 +0000 (14:39 +0200)]
Merge branch 'PHP-7.1'
Nikita Popov [Sat, 29 Oct 2016 12:32:38 +0000 (14:32 +0200)]
Optimize __get etc
Cheap 20% win by skipping the function name allocation if we don't
need it.
Xinchen Hui [Sat, 29 Oct 2016 06:23:55 +0000 (14:23 +0800)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Skip if no jit is built
Xinchen Hui [Sat, 29 Oct 2016 06:23:47 +0000 (14:23 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Skip if no jit is built
Xinchen Hui [Sat, 29 Oct 2016 06:23:25 +0000 (14:23 +0800)]
Skip if no jit is built
Anatol Belski [Sat, 29 Oct 2016 01:18:43 +0000 (03:18 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
fix test run with autogenerated ini
Anatol Belski [Sat, 29 Oct 2016 01:18:19 +0000 (03:18 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
fix test run with autogenerated ini
Anatol Belski [Sat, 29 Oct 2016 01:17:29 +0000 (03:17 +0200)]
fix test run with autogenerated ini
Anatol Belski [Sat, 29 Oct 2016 00:27:13 +0000 (02:27 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
generate test ini file, so shared exts are loaded for nmake test
additional env is generated for phpize, too
Anatol Belski [Sat, 29 Oct 2016 00:12:05 +0000 (02:12 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
generate test ini file, so shared exts are loaded for nmake test
additional env is generated for phpize, too
Anatol Belski [Sat, 29 Oct 2016 00:08:48 +0000 (02:08 +0200)]
generate test ini file, so shared exts are loaded for nmake test
Anatol Belski [Fri, 28 Oct 2016 21:11:47 +0000 (23:11 +0200)]
additional env is generated for phpize, too
Anatol Belski [Fri, 28 Oct 2016 21:02:38 +0000 (23:02 +0200)]
fix doc
Anatol Belski [Fri, 28 Oct 2016 18:49:12 +0000 (20:49 +0200)]
extend info to float related constants
Anatol Belski [Fri, 28 Oct 2016 18:27:32 +0000 (20:27 +0200)]
note to UPDRADING
Anatol Belski [Fri, 28 Oct 2016 17:58:02 +0000 (19:58 +0200)]
update NEWS
Michele Locati [Mon, 29 Aug 2016 09:57:53 +0000 (11:57 +0200)]
Add VT100 support for Windows
Fix function names prefix
Use Unicode version of GetFinalPathNameByHandle
Use EG(windows_version_info) instead of RtlGetVersion
Use the specified handle_id instead of STD_OUTPUT_HANDLE
Switch from stream name to stream resource
Allow running tests capturing only stdout and/or stderr
Add tests for stream_vt100_support function
Export Win32 console functions
Fix x64 build
Use zend_long instead of long long, use GetConsole instead of GetFinalPathNameByHandleW to check if a handle is a valid console stream
Always use zend_long on any platform
Use _get_osfhandle to determine the standard handle
Accept stream names
Raise warnings in case of invalid stream parameter
Return true if disabling VT100 support on a not-console/redirected stream or on old Windows versions
Remove php_win32_console_os_supports_vt100
Differentiate stdin vs stdout/stderr
Simplify setting flag
Allow avoid piping STDIN
Let stream_vt100_support accept only resources
Fix run-tests
Revert console flags in case of failure
Simplify logic of stream_vt100_support when setting the flag
Return true if succeeded, false otherwise
Drop support for STDIN
More comprehensive tests for stream_vt100_support
Remove old tests
Fix name of included file and use absolute paths
Enable ENABLE_VIRTUAL_TERMINAL_PROCESSING on Windows by default
Remove tests for stream_vt100_support
Split stream_vt100_support into stream_isatty+sapi_windows_vt100_support
Add tests for stream_isatty
Add tests for sapi_windows_vt100_support
Return null from stream_isatty is neither Windows nor Posix
Fallback to S_ISCHR if neither Windows nor Posix
Avoid defining argc since it's only used once
Better comment about php_win32_console_fileno_is_console
Use events instead of cNumberOfEvents
Do not restore previous console mode
We need to restore previous console mode on failing SetConsole calls only for STDIN
Don't configure STDOUT/STDERR on Windows with PHP_CLI_WIN32_NO_CONSOLE
Xinchen Hui [Fri, 28 Oct 2016 13:22:02 +0000 (21:22 +0800)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Update NEWS
Fixed bug #73392 (A use-after-free in zend allocator management)
Xinchen Hui [Fri, 28 Oct 2016 13:21:48 +0000 (21:21 +0800)]
Update NEWS
Xinchen Hui [Fri, 28 Oct 2016 13:21:35 +0000 (21:21 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #73392 (A use-after-free in zend allocator management)
Xinchen Hui [Fri, 28 Oct 2016 13:21:24 +0000 (21:21 +0800)]
Fixed bug #73392 (A use-after-free in zend allocator management)
Benjamin Morel [Fri, 28 Oct 2016 08:04:23 +0000 (10:04 +0200)]
Typo
Ferenc Kovacs [Thu, 27 Oct 2016 21:44:24 +0000 (23:44 +0200)]
Merge branch 'PHP-7.1'
Ferenc Kovacs [Thu, 27 Oct 2016 21:40:41 +0000 (23:40 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
Ferenc Kovacs [Thu, 27 Oct 2016 21:37:51 +0000 (23:37 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Ferenc Kovacs [Thu, 27 Oct 2016 21:10:59 +0000 (23:10 +0200)]
5.6.29 will be next
Anatol Belski [Thu, 27 Oct 2016 20:36:28 +0000 (22:36 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
use rather the nmake var as it's evaluated on every run
Anatol Belski [Thu, 27 Oct 2016 20:36:00 +0000 (22:36 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
use rather the nmake var as it's evaluated on every run
Anatol Belski [Thu, 27 Oct 2016 20:34:34 +0000 (22:34 +0200)]
use rather the nmake var as it's evaluated on every run
Anatol Belski [Thu, 27 Oct 2016 18:44:30 +0000 (20:44 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
prepend known bin folders to the path for nmake test runs
Anatol Belski [Thu, 27 Oct 2016 18:43:25 +0000 (20:43 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
prepend known bin folders to the path for nmake test runs
Anatol Belski [Thu, 27 Oct 2016 18:41:41 +0000 (20:41 +0200)]
prepend known bin folders to the path for nmake test runs
Adam Baratz [Thu, 27 Oct 2016 17:52:59 +0000 (13:52 -0400)]
Fix #73396: bigint columns are returned as strings
Adam Baratz [Thu, 27 Oct 2016 16:15:45 +0000 (12:15 -0400)]
Remove unneeded macro check. This "hack" is replicated in php_pdo_dblib_int.h.
Adam Baratz [Thu, 27 Oct 2016 16:15:01 +0000 (12:15 -0400)]
remove unread var
Adam Baratz [Thu, 27 Oct 2016 16:14:06 +0000 (12:14 -0400)]
add myself to pdo_dblib CREDITS
Anatol Belski [Thu, 27 Oct 2016 00:46:18 +0000 (02:46 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
yet another uninitialized pointer
Anatol Belski [Thu, 27 Oct 2016 00:45:48 +0000 (02:45 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
yet another uninitialized pointer
Anatol Belski [Thu, 27 Oct 2016 00:40:30 +0000 (02:40 +0200)]
yet another uninitialized pointer
Anatol Belski [Thu, 27 Oct 2016 00:20:35 +0000 (02:20 +0200)]
Merge branch 'PHP-7.1'
* PHP-7.1:
fix uninitialized pointer