Fixed bug #68353 (QsoSSL support removed in libcurl 7.39)

diff --git a/package.xml b/package.xml
index b967106c839cd06d4cbb397acc7573d939794d09..eddca2610775b6d6152661174a1d3ac50913c228 100644 (file)
--- a/package.xml
+++ b/package.xml
@@ -48,7 +48,7 @@ v2: http://dev.iworks.at/ext-http/lcov/ext/http/
  </stability>
  <license>BSD, revised</license>
  <notes><![CDATA[
  </stability>
  <license>BSD, revised</license>
  <notes><![CDATA[

-*
+* Fixed bug #68353 (QsoSSL support removed in libcurl 7.39)

 ]]></notes>
  <contents>
   <dir name="/">
 ]]></notes>
  <contents>
   <dir name="/">

diff --git a/php_http_client_curl.c b/php_http_client_curl.c
index 8f252119493dcd8c3256328d8060ffbf7ccefc24..48deae38df4c00772ce77a85b13e9030018289e7 100644 (file)
--- 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;
                        case CURLSSLBACKEND_NSS:
                                backend = "nss";
                                break;

+#if !PHP_HTTP_CURL_VERSION(7,39,0)

                        case CURLSSLBACKEND_QSOSSL:
                                backend = "qsossl";
                                break;
                        case CURLSSLBACKEND_QSOSSL:
                                backend = "qsossl";
                                break;

+#endif

                        case CURLSSLBACKEND_GSKIT:
                                backend = "gskit";
                                break;
                        case CURLSSLBACKEND_GSKIT:
                                backend = "gskit";
                                break;