summaryrefslogtreecommitdiff
path: root/UPGRADING
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2015-03-22 18:52:55 -0700
committerStanislav Malyshev <stas@php.net>2015-03-22 18:54:48 -0700
commitc6384a7908976c5339374e7449e4ad5f38934e49 (patch)
treeb9bff3b6810e76582640389395063956cef10796 /UPGRADING
parentfce9a856e73cfb6d9a4521d5b8ea2c15417f3145 (diff)
parent1badfd8171119ef70a5d088068b9de88ba668f73 (diff)
downloadphp-git-c6384a7908976c5339374e7449e4ad5f38934e49.tar.gz
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5: add CURL_HTTP_VERSION_2_0 and CURL_VERSION_HTTP2
Diffstat (limited to 'UPGRADING')
-rw-r--r--UPGRADING3
1 files changed, 3 insertions, 0 deletions
diff --git a/UPGRADING b/UPGRADING
index 9428add450..52f139de28 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -394,6 +394,9 @@ PHP 5.6 UPGRADE NOTES
10. New Global Constants
========================================
+- CURL:
+ CURL_HTTP_VERSION_2_0 and CURL_VERSION_HTTP2 (>= 5.6.8)
+
- LDAP:
LDAP_ESCAPE_FILTER int(1)
LDAP_ESCAPE_DN int(2)