diff options
| author | Christopher Jones <sixd@php.net> | 2013-09-16 10:21:22 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2013-09-16 10:21:22 -0700 |
| commit | e06a712c900d05895dd9d03c9ff5caa708fc30e7 (patch) | |
| tree | 1acd75297fb648fc74fec1115153609633eff6d5 /sapi/cli/php_cli_server.c | |
| parent | d52dbd569fd0f68ec2c79a96f1a3466c71ef549e (diff) | |
| parent | b5283b9b7abecde841eb268c4b158cd76630d53b (diff) | |
| download | php-git-e06a712c900d05895dd9d03c9ff5caa708fc30e7.tar.gz | |
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
# By Xinchen Hui (2) and Michael Wallner (1)
# Via Michael Wallner
* 'PHP-5.5' of https://git.php.net/repository/php-src:
double test timeout for travis
Add test for ISSUE #128
Fixed bug #65665 (Exception not properly caught when opcache enabled)
Diffstat (limited to 'sapi/cli/php_cli_server.c')
0 files changed, 0 insertions, 0 deletions