Merge branch 'master' of git.php.net:php-src

Conflicts:
	ext/openssl/xp_ssl.c

1 files changed, 0 insertions, 11 deletions

diff --git a/UPGRADING b/UPGRADING
index 79f7875593..f5e36fefc8 100755
--- a/UPGRADING
+++ b/UPGRADING
@@ -24,17 +24,6 @@ PHP X.Y UPGRADE NOTES
   . dba_delete() now returns false if the key was not found for the inifile 
     handler, too.
 
-- openssl:
-  To prevent Man-in-the-Middle attacks against encrypted transfers client
-  streams now verify peer certificates by default. Previous versions
-  required users to manually enable peer verification. As a result of this
-  change, existing code using ssl:// or tls:// stream wrappers (e.g.
-  file_get_contents(), fsockopen(), stream_socket_client()) may no longer
-  connect successfully without manually disabling peer verification via the
-  stream context's "verify_peer" setting. Encrypted transfers delegate to
-  operating system certificate stores by default, so many/most users *should*
-  be unaffected by this transparent security enhancement.
-
 ========================================
 2. New Features
 ========================================