X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=src%2Fphp_http_client_curl.c;h=f07b5b822e1a72f57e55f7ba5ea7b70357f1a420;hp=e5132113015c8f5b30ff76873d65d27a678d1868;hb=02db4df1bc8a7a6fef41297c082ecfe5d259ca96;hpb=27e55ddfb44454595ef5d388259a7bc194beda9c

diff --git a/src/php_http_client_curl.c b/src/php_http_client_curl.c
index e513211..f07b5b8 100644
--- a/src/php_http_client_curl.c
+++ b/src/php_http_client_curl.c
@@ -21,7 +21,7 @@
 #	include <openssl/ssl.h>
 #endif
 #if PHP_HTTP_HAVE_LIBCURL_GNUTLS
-#	include <gnutls.h>
+#	include <gnutls/gnutls.h>
 #endif
 
 typedef struct php_http_client_curl_handler {
@@ -480,6 +480,24 @@ static ZEND_RESULT_CODE php_http_curle_get_info(CURL *ch, HashTable *info)
 		zend_hash_str_update(info, "http_version", lenof("http_version"), &tmp);
 	}
 #endif
+#if PHP_HTTP_CURL_VERSION(7,52,0)
+	if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_PROXY_SSL_VERIFYRESULT, &l)) {
+		ZVAL_LONG(&tmp, l);
+		zend_hash_str_update(info, "proxy_ssl_verifyresult", lenof("proxy_ssl_verifyresult"), &tmp);
+	}
+#endif
+#if PHP_HTTP_CURL_VERSION(7,52,0)
+	if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_PROTOCOL, &l)) {
+		ZVAL_LONG(&tmp, l);
+		zend_hash_str_update(info, "protocol", lenof("protocol"), &tmp);
+	}
+#endif
+#if PHP_HTTP_CURL_VERSION(7,52,0)
+	if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_SCHEME, &c)) {
+		ZVAL_STRING(&tmp, STR_PTR(c));
+		zend_hash_str_update(info, "scheme", lenof("scheme"), &tmp);
+	}
+#endif
 
 	/* END::CURLINFO */
 
@@ -2429,6 +2447,14 @@ php_http_client_ops_t *php_http_client_curl_get_ops(void)
 	return &php_http_client_curl_ops;
 }
 
+#define REGISTER_NS_STRING_OR_NULL_CONSTANT(ns, name, str, flags)                              \
+		do {                                                                           \
+			if ((str) != NULL) {                                                   \
+				REGISTER_NS_STRING_CONSTANT(ns, name, str, flags);             \
+			} else {                                                               \
+				REGISTER_NS_NULL_CONSTANT(ns, name, flags);                    \
+			}                                                                      \
+		} while (0)
 
 PHP_MINIT_FUNCTION(http_client_curl)
 {
@@ -2509,12 +2535,12 @@ PHP_MINIT_FUNCTION(http_client_curl)
 		REGISTER_NS_STRING_CONSTANT("http\\Client\\Curl", "VERSIONS", curl_version(), CONST_CS|CONST_PERSISTENT);
 #if CURLVERSION_NOW >= 0
 		REGISTER_NS_STRING_CONSTANT("http\\Client\\Curl\\Versions", "CURL", (char *) info->version, CONST_CS|CONST_PERSISTENT);
-		REGISTER_NS_STRING_CONSTANT("http\\Client\\Curl\\Versions", "SSL", (char *) info->ssl_version, CONST_CS|CONST_PERSISTENT);
-		REGISTER_NS_STRING_CONSTANT("http\\Client\\Curl\\Versions", "LIBZ", (char *) info->libz_version, CONST_CS|CONST_PERSISTENT);
+		REGISTER_NS_STRING_OR_NULL_CONSTANT("http\\Client\\Curl\\Versions", "SSL", (char *) info->ssl_version, CONST_CS|CONST_PERSISTENT);
+		REGISTER_NS_STRING_OR_NULL_CONSTANT("http\\Client\\Curl\\Versions", "LIBZ", (char *) info->libz_version, CONST_CS|CONST_PERSISTENT);
 # if CURLVERSION_NOW >= 1
-		REGISTER_NS_STRING_CONSTANT("http\\Client\\Curl\\Versions", "ARES", (char *) info->ares, CONST_CS|CONST_PERSISTENT);
+		REGISTER_NS_STRING_OR_NULL_CONSTANT("http\\Client\\Curl\\Versions", "ARES", (char *) info->ares, CONST_CS|CONST_PERSISTENT);
 #  if CURLVERSION_NOW >= 2
-		REGISTER_NS_STRING_CONSTANT("http\\Client\\Curl\\Versions", "IDN", (char *) info->libidn, CONST_CS|CONST_PERSISTENT);
+		REGISTER_NS_STRING_OR_NULL_CONSTANT("http\\Client\\Curl\\Versions", "IDN", (char *) info->libidn, CONST_CS|CONST_PERSISTENT);
 #  endif
 # endif
 #endif