X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_client_curl.c;h=78c552a2ce723dbd8d9ea76edf8dbe08482ab129;hp=5443e666b4a592dd437f1499bea78a85ffbfcb85;hb=df0b1923bc8cf7a16e3fdadb54c6bf1921381914;hpb=da79735adbc6acdd2d4f99c4891906e906a1beb4

diff --git a/php_http_client_curl.c b/php_http_client_curl.c
index 5443e66..78c552a 100644
--- a/php_http_client_curl.c
+++ b/php_http_client_curl.c
@@ -502,10 +502,11 @@ static ZEND_RESULT_CODE php_http_curle_get_info(CURL *ch, HashTable *info)
 			case CURLSSLBACKEND_QSOSSL:
 				backend = "qsossl";
 				break;
-#endif
+#else
 			case CURLSSLBACKEND_GSKIT:
 				backend = "gskit";
 				break;
+#endif
 			case CURLSSLBACKEND_POLARSSL:
 				backend = "polarssl";
 				break;
@@ -528,7 +529,7 @@ static ZEND_RESULT_CODE php_http_curle_get_info(CURL *ch, HashTable *info)
 	}
 #endif
 
-#if (PHP_HTTP_CURL_VERSION(7,19,1) && defined(PHP_HTTP_HAVE_OPENSSL)) || (PHP_HTTP_CURL_VERSION(7,42,0) && defined(PHP_HTTP_HAVE_GNUTLS))
+#if (PHP_HTTP_CURL_VERSION(7,19,1) && defined(PHP_HTTP_HAVE_OPENSSL)) || (PHP_HTTP_CURL_VERSION(7,34,0) && defined(PHP_HTTP_HAVE_NSS)) || (PHP_HTTP_CURL_VERSION(7,42,0) && defined(PHP_HTTP_HAVE_GNUTLS)) || (PHP_HTTP_CURL_VERSION(7,39,0) && defined(PHP_HTTP_HAVE_GSKIT))
 	{
 		int i;
 		zval *ci_array;
@@ -1498,7 +1499,7 @@ static void php_http_curle_options_init(php_http_options_t *registry TSRMLS_DC)
 		}
 #	endif
 #endif
-#if PHP_HTTP_CURL_VERSION(7,19,1) && defined(PHP_HTTP_HAVE_OPENSSL)
+#if (PHP_HTTP_CURL_VERSION(7,19,1) && defined(PHP_HTTP_HAVE_OPENSSL)) || (PHP_HTTP_CURL_VERSION(7,34,0) && defined(PHP_HTTP_HAVE_NSS)) || (PHP_HTTP_CURL_VERSION(7,42,0) && defined(PHP_HTTP_HAVE_GNUTLS)) || (PHP_HTTP_CURL_VERSION(7,39,0) && defined(PHP_HTTP_HAVE_GSKIT))
 		php_http_option_register(registry, ZEND_STRL("certinfo"), CURLOPT_CERTINFO, IS_BOOL);
 #endif
 #if PHP_HTTP_CURL_VERSION(7,36,0)
@@ -2116,7 +2117,7 @@ static php_resource_factory_t *create_rf(php_http_client_t *h, php_http_client_e
 	}
 
 	/* only if the client itself is setup for persistence */
-	if (h->rf->dtor == (void (*)(void*)) php_persistent_handle_abandon) {
+	if (php_resource_factory_is_persistent(h->rf)) {
 		char *id_str = NULL;
 		size_t id_len;
 		int port = url->port ? url->port : 80;
@@ -2137,7 +2138,7 @@ static php_resource_factory_t *create_rf(php_http_client_t *h, php_http_client_e
 	}
 
 	if (pf) {
-		rf = php_resource_factory_init(NULL, php_persistent_handle_get_resource_factory_ops(), pf, (void (*)(void*)) php_persistent_handle_abandon);
+		rf = php_persistent_handle_resource_factory_init(NULL, pf);
 	} else {
 		rf = php_resource_factory_init(NULL, &php_http_curle_resource_factory_ops, NULL, NULL);
 	}