summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph M. Becker <cmbecker69@gmx.de>2016-09-29 14:41:12 +0200
committerChristoph M. Becker <cmbecker69@gmx.de>2016-09-29 14:41:12 +0200
commit0edb16e768b45cfb9d1abdf962f0581102a1ef2c (patch)
treed7cab69f2e46d23d804dd0f24205d0ee292a91e5
parent38283232907c5dcf22f521607001ba9dbb46db75 (diff)
parent81cbbb68af0feb284ce098c8cf96dc5a857b5239 (diff)
downloadphp-git-0edb16e768b45cfb9d1abdf962f0581102a1ef2c.tar.gz
Merge branch 'PHP-7.0' into PHP-7.1
-rw-r--r--ext/curl/interface.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index 0fe4dbf2e9..741254c96a 100644
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -816,6 +816,9 @@ PHP_MINIT_FUNCTION(curl)
REGISTER_CURL_CONSTANT(CURLE_SSL_ENGINE_NOTFOUND);
REGISTER_CURL_CONSTANT(CURLE_SSL_ENGINE_SETFAILED);
REGISTER_CURL_CONSTANT(CURLE_SSL_PEER_CERTIFICATE);
+#if LIBCURL_VERSION_NUM >= 0x072700 /* Available since 7.39.0 */
+ REGISTER_CURL_CONSTANT(CURLE_SSL_PINNEDPUBKEYNOTMATCH);
+#endif
REGISTER_CURL_CONSTANT(CURLE_TELNET_OPTION_SYNTAX);
REGISTER_CURL_CONSTANT(CURLE_TOO_MANY_REDIRECTS);
REGISTER_CURL_CONSTANT(CURLE_UNKNOWN_TELNET_OPTION);