X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=php_http_client_curl.c;h=9081978433c7b025c34def624de117295f329428;hb=cad11028f2e3b91d515f22e3a7d41181ff517414;hp=501c2521e7aff2acd3773d71740c7731195c8cb6;hpb=805287392b6266d05533043509367d7e411e595c;p=m6w6%2Fext-http

diff --git a/php_http_client_curl.c b/php_http_client_curl.c
index 501c252..9081978 100644
--- a/php_http_client_curl.c
+++ b/php_http_client_curl.c
@@ -36,6 +36,13 @@
 #	endif
 #endif
 
+#ifdef PHP_HTTP_HAVE_OPENSSL
+#	include <openssl/ssl.h>
+#endif
+#ifdef PHP_HTTP_HAVE_GNUTLS
+#	include <gnutls.h>
+#endif
+
 typedef struct php_http_client_curl {
 	CURLM *handle;
 
@@ -187,7 +194,11 @@ static size_t php_http_curle_read_callback(void *data, size_t len, size_t n, voi
 	return 0;
 }
 
+#if PHP_HTTP_CURL_VERSION(7,32,0)
+static int php_http_curle_xferinfo_callback(void *ctx, curl_off_t dltotal, curl_off_t dlnow, curl_off_t ultotal, curl_off_t ulnow)
+#else
 static int php_http_curle_progress_callback(void *ctx, double dltotal, double dlnow, double ultotal, double ulnow)
+#endif
 {
 	php_http_client_curl_handler_t *h = ctx;
 	zend_bool update = 0;
@@ -474,6 +485,87 @@ static STATUS php_http_curle_get_info(CURL *ch, HashTable *info)
 
 	/* END::CURLINFO */
 
+#if PHP_HTTP_CURL_VERSION(7,34,0)
+	{
+		int i;
+		zval *ti_array;
+		struct curl_tlssessioninfo *ti;
+
+		if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_TLS_SESSION, &ti)) {
+			const char *backend;
+
+			MAKE_STD_ZVAL(subarray);
+			ZVAL_NULL(subarray);
+			MAKE_STD_ZVAL(ti_array);
+			array_init(ti_array);
+
+			switch (ti->backend) {
+			case CURLSSLBACKEND_NONE:
+				backend = "none";
+				break;
+			case CURLSSLBACKEND_OPENSSL:
+				backend = "openssl";
+#ifdef PHP_HTTP_HAVE_OPENSSL
+				{
+					SSL_CTX *ctx = ti->internals;
+
+					array_init(subarray);
+					add_assoc_long_ex(subarray, ZEND_STRS("number"), SSL_CTX_sess_number(ctx));
+					add_assoc_long_ex(subarray, ZEND_STRS("connect"), SSL_CTX_sess_connect(ctx));
+					add_assoc_long_ex(subarray, ZEND_STRS("connect_good"), SSL_CTX_sess_connect_good(ctx));
+					add_assoc_long_ex(subarray, ZEND_STRS("connect_renegotiate"), SSL_CTX_sess_connect_renegotiate(ctx));
+					add_assoc_long_ex(subarray, ZEND_STRS("hits"), SSL_CTX_sess_hits(ctx));
+					add_assoc_long_ex(subarray, ZEND_STRS("cache_full"), SSL_CTX_sess_cache_full(ctx));
+				}
+#endif
+				break;
+			case CURLSSLBACKEND_GNUTLS:
+				backend = "gnutls";
+#ifdef PHP_HTTP_HAVE_GNUTLS
+				{
+					gnutls_session_t sess = ti->internals;
+					char *desc;
+
+					array_init(subarray);
+					if ((desc = gnutls_session_get_desc(sess))) {
+						add_assoc_string_ex(subarray, ZEND_STRS("desc"), desc, 1);
+						gnutls_free(desc);
+					}
+					add_assoc_bool_ex(subarray, ZEND_STRS("resumed"), gnutls_session_is_resumed(sess));
+				}
+#endif
+				break;
+			case CURLSSLBACKEND_NSS:
+				backend = "nss";
+				break;
+			case CURLSSLBACKEND_QSOSSL:
+				backend = "qsossl";
+				break;
+			case CURLSSLBACKEND_GSKIT:
+				backend = "gskit";
+				break;
+			case CURLSSLBACKEND_POLARSSL:
+				backend = "polarssl";
+				break;
+			case CURLSSLBACKEND_CYASSL:
+				backend = "cyassl";
+				break;
+			case CURLSSLBACKEND_SCHANNEL:
+				backend = "schannel";
+				break;
+			case CURLSSLBACKEND_DARWINSSL:
+				backend = "darwinssl";
+				break;
+			default:
+				backend = "unknown";
+			}
+			add_assoc_string_ex(ti_array, ZEND_STRS("backend"), estrdup(backend), 0);
+			add_assoc_zval_ex(ti_array, ZEND_STRS("internals"), subarray);
+			add_assoc_zval_ex(&array, "tls_session", sizeof("tls_session"), ti_array);
+		}
+	}
+#endif
+
 #if PHP_HTTP_CURL_VERSION(7,19,1) && defined(PHP_HTTP_HAVE_OPENSSL)
 	{
 		int i;
@@ -1419,9 +1511,14 @@ static php_http_client_curl_handler_t *php_http_client_curl_handler_init(php_htt
 	curl_easy_setopt(handle, CURLOPT_DEBUGFUNCTION, php_http_curle_raw_callback);
 	curl_easy_setopt(handle, CURLOPT_READFUNCTION, php_http_curle_read_callback);
 	curl_easy_setopt(handle, CURLOPT_IOCTLFUNCTION, php_http_curle_ioctl_callback);
+#if PHP_HTTP_CURL_VERSION(7,32,0)
+	curl_easy_setopt(handle, CURLOPT_XFERINFOFUNCTION, php_http_curle_xferinfo_callback);
+	curl_easy_setopt(handle, CURLOPT_XFERINFODATA, handler);
+#else
 	curl_easy_setopt(handle, CURLOPT_PROGRESSFUNCTION, php_http_curle_progress_callback);
-	curl_easy_setopt(handle, CURLOPT_DEBUGDATA, handler);
 	curl_easy_setopt(handle, CURLOPT_PROGRESSDATA, handler);
+#endif
+	curl_easy_setopt(handle, CURLOPT_DEBUGDATA, handler);
 
 	php_http_client_curl_handler_reset(handler);
 
@@ -1532,7 +1629,11 @@ static void php_http_client_curl_handler_dtor(php_http_client_curl_handler_t *ha
 	TSRMLS_FETCH_FROM_CTX(handler->client->ts);
 
 	curl_easy_setopt(handler->handle, CURLOPT_NOPROGRESS, 1L);
+#if PHP_HTTP_CURL_VERSION(7,32,0)
+	curl_easy_setopt(handler->handle, CURLOPT_XFERINFOFUNCTION, NULL);
+#else
 	curl_easy_setopt(handler->handle, CURLOPT_PROGRESSFUNCTION, NULL);
+#endif
 	curl_easy_setopt(handler->handle, CURLOPT_VERBOSE, 0L);
 	curl_easy_setopt(handler->handle, CURLOPT_DEBUGFUNCTION, NULL);