diff options
| author | Ferenc Kovacs <tyrael@php.net> | 2015-10-19 23:02:52 +0200 |
|---|---|---|
| committer | Ferenc Kovacs <tyrael@php.net> | 2015-10-19 23:02:52 +0200 |
| commit | 03e1e88db1a4451ed111b6854805bc801a83c9b8 (patch) | |
| tree | 67c7d8b0e1f964c1135d25b281145ef71193219e /sapi/phpdbg/phpdbg_io.c | |
| parent | 26e5429f721b40d6d721fa9e2e2ede5f6222798c (diff) | |
| parent | 395ef4efb72aab6a660612be4632794f00991d85 (diff) | |
| download | php-git-03e1e88db1a4451ed111b6854805bc801a83c9b8.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
fixup, both catched by nikic
use another character device in this test as /dev/console seems that it is different for lxc containers
the de_DE(iso-8859-1) locale is not available on ubuntu by default, but there is no reason to require that over the utf-8 one
let's try running our testsuite without sudo
Diffstat (limited to 'sapi/phpdbg/phpdbg_io.c')
0 files changed, 0 insertions, 0 deletions