Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5: reflect in the test that GSS-Negotiate is deprecated since libcurl 7.38.0
12 years ago · 13280a9e36
1 changed files with 1 additions and 1 deletions
--- a/ext/curl/tests/check_win_config.phpt
+++ b/ext/curl/tests/check_win_config.phpt
@ -28,7 +28,7 @@ Features
 AsynchDNS => Yes
 CharConv => No
 Debug => No
-GSS-Negotiate => Yes
+GSS-Negotiate => No
 IDN => Yes
 IPv6 => Yes
 krb4 => No