diff options
| author | Stanislav Malyshev <stas@php.net> | 2013-08-18 15:44:40 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2013-08-18 15:45:17 -0700 |
| commit | bd29ff7c38a14a0273329180c0e9f4d7a12e0d74 (patch) | |
| tree | 60bb947ce5a997521d6dccb0c5c7fe689526022a /sapi/cli/php_cli_server.c | |
| parent | 265224778bc340b16087e60a52b4ca4a3acb5c01 (diff) | |
| parent | 9973658a44090cbf67cb8a1d93f00d46a4330356 (diff) | |
| download | php-git-bd29ff7c38a14a0273329180c0e9f4d7a12e0d74.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix for php bug #64802 includes test case
Conflicts:
ext/openssl/openssl.c
Diffstat (limited to 'sapi/cli/php_cli_server.c')
0 files changed, 0 insertions, 0 deletions