diff options
| author | Stanislav Malyshev <stas@php.net> | 2013-08-25 00:29:33 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2013-08-25 00:29:33 -0700 |
| commit | e045cbaa1447489cd38fc8bc827563bc39148075 (patch) | |
| tree | 87231804ee3d77fc16bc761f6141564baf505011 /sapi/cli/php_cli_server.c | |
| parent | c0bfccafd2b09e3772adbade33b1e47bd15fcc97 (diff) | |
| parent | a2d8ae9a1fa9704707ac9dcc293de639d4824eab (diff) | |
| download | php-git-e045cbaa1447489cd38fc8bc827563bc39148075.tar.gz | |
Merge branch 'fix_travis' into PHP-5.5
* fix_travis:
fix mysql tests & mark nextRowset problematic tests
fix mysql init
add openssl
add mysql settings
Diffstat (limited to 'sapi/cli/php_cli_server.c')
0 files changed, 0 insertions, 0 deletions