From: Michael Wallner <mike@php.net>
Date: Thu, 6 Nov 2014 10:13:32 +0000 (+0100)
Subject: Merge branch 'R_2_1'
X-Git-Tag: RELEASE_2_2_0_RC1~9^2~4
X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=commitdiff_plain;h=f27f09fb8025a8d640fdd283b25577956fee13f8;hp=69b0fc68b1a2181b115b110f5c37610c540ad3b6

Merge branch 'R_2_1'
---

diff --git a/php_http_client_curl.c b/php_http_client_curl.c
index 9fc0291..1f0e1aa 100644
--- a/php_http_client_curl.c
+++ b/php_http_client_curl.c
@@ -539,9 +539,11 @@ static STATUS php_http_curle_get_info(CURL *ch, HashTable *info)
 			case CURLSSLBACKEND_NSS:
 				backend = "nss";
 				break;
+#if !PHP_HTTP_CURL_VERSION(7,39,0)
 			case CURLSSLBACKEND_QSOSSL:
 				backend = "qsossl";
 				break;
+#endif
 			case CURLSSLBACKEND_GSKIT:
 				backend = "gskit";
 				break;