diff options
author | Dmitry Stogov <dmitry@zend.com> | 2015-09-29 14:11:39 +0300 |
---|---|---|
committer | Dmitry Stogov <dmitry@zend.com> | 2015-09-29 14:11:39 +0300 |
commit | 27d4d32e6bd4c6ff2f65d162e9478671348764f4 (patch) | |
tree | c565d96a976e08e3173bb312caf60344a9f1d28d /sapi/cli/php_cli.c | |
parent | 27a5f66da4634d81fa670786d7b47cca76b4db92 (diff) | |
parent | bfd26370682b5b90ea63a4bbf5a7a9c6ce3f5866 (diff) | |
download | php-git-27d4d32e6bd4c6ff2f65d162e9478671348764f4.tar.gz |
Merge branch 'PHP-7.0' of git.php.net:php-src into PHP-7.0
* 'PHP-7.0' of git.php.net:php-src:
fix test
Ensure timeout tests wait for the entire specified duration
Diffstat (limited to 'sapi/cli/php_cli.c')
0 files changed, 0 insertions, 0 deletions