Merge branch 'PHP-5.5'

* PHP-5.5:
  Added curl config test for windows

ext/curl/tests/check_win_config.phpt

@@ -0,0 +1,48 @@
+--TEST--
+Check libcurl config on windows
+--SKIPIF--
+<?php 
+if (!extension_loaded("curl")) {
+	die('skip - curl extension not available in this build'); 
+}
+if(substr(PHP_OS, 0, 3) != 'WIN' )
+  die("skip for windows only");
+?>
+--FILE--
+<?php
+	ob_start();
+	phpinfo();
+	$s = ob_get_contents();
+	ob_end_clean();
+	preg_match('/curl\n\n(.+)\n\n/siU', $s, $m);
+
+	echo $m[1], "\n";
+
+?>
+DONE
+--EXPECTF--
+cURL support => enabled
+cURL Information => %s
+Age => %d
+Features
+AsynchDNS => Yes
+CharConv => No
+Debug => No
+GSS-Negotiate => Yes
+IDN => Yes
+IPv6 => Yes
+krb4 => No
+Largefile => Yes
+libz => Yes
+NTLM => Yes
+NTLMWB => No
+SPNEGO => Yes
+SSL => Yes
+SSPI => Yes
+TLS-SRP => No
+Protocols => dict, file, ftp, ftps, gopher, http, https, imap, imaps, ldap, pop3, pop3s, rtsp, scp, sftp, smtp, smtps, telnet, tftp
+Host => %s-pc-win32
+SSL Version => OpenSSL/%s
+ZLib Version => %s
+libSSH Version => libssh2/%s
+DONE