diff options
| author | Anatol Belski <ab@php.net> | 2014-09-11 23:33:12 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-09-11 23:33:12 +0200 |
| commit | 0292c34b05663be32e623d1e1b65834186d481ee (patch) | |
| tree | ef20e33a28a148ed9739ff16322a0547e6e8ab25 /sapi/apache2handler/php_functions.c | |
| parent | 8527657ca65ee6633055b88f10f63cf96e14c2d0 (diff) | |
| parent | 13280a9e36174c02aa923647fbf9a38a1a5182d3 (diff) | |
| download | php-git-0292c34b05663be32e623d1e1b65834186d481ee.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
reflect in the test that GSS-Negotiate is deprecated since libcurl 7.38.0
5.6.2 now
Conflicts:
configure.in
main/php_version.h
Diffstat (limited to 'sapi/apache2handler/php_functions.c')
0 files changed, 0 insertions, 0 deletions