From: Daniel Lowrey <rdlowrey@php.net>
Date: Tue, 10 Mar 2015 05:15:04 +0000 (-0600)
Subject: Update NEWS/UPGRADING
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~725
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dd16a7c82045383c8556a67c649a6b503099d040;p=php

Update NEWS/UPGRADING
---

diff --git a/NEWS b/NEWS
index de18fdecc4..be3e53a276 100644
--- a/NEWS
+++ b/NEWS
@@ -113,8 +113,10 @@
     + Opcache). (Laruence)
 
 - OpenSSL:
-  . Fixed bug #61285, #68329, #68046, #41631 (encrypted streams don't observe
-    socket timeouts). (Brad Broerman)
+  . Added "alpn_protocols" SSL context option allowing encrypted client/server
+    streams to negotiate alternative protocols using the ALPN TLS extension when
+    built against OpenSSL 1.0.2 or newer. Negotiated protocol information is
+    accessible through stream_get_meta_data() output.
 
 - pcntl:
   . Fixed bug #60509 (pcntl_signal doesn't decrease ref-count of old handler
diff --git a/UPGRADING b/UPGRADING
index e844cc4dcd..a024576028 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -446,7 +446,7 @@ Other
   . Added "alpn_protocols" SSL context option allowing encrypted client/server
     streams to negotiate alternative protocols using the ALPN TLS extension when
     built against OpenSSL 1.0.2 or newer. Negotiated protocol information is
-    accessible by passing streams to the new stream_socket_crypto_info().
+    accessible through stream_get_meta_data() output.
 
 ========================================
 3. Changes in SAPI modules
@@ -460,6 +460,10 @@ Other
 4. Deprecated Functionality
 ========================================
 
+- OpenSSL
+  . The "capture_session_meta" SSL context option is now deprecated. Meta
+    data concerning active crypto on a stream resource is now accessible
+    through the return result from stream_get_meta_data().
 
 ========================================
 5. Changed Functions
@@ -485,9 +489,6 @@ Other
   . Added intdiv() function for integer division.
   . Added error_clear_last() function to reset error state.
 
-- Stream:
-  . Added stream_socket_crypto_info() allowing inspection of negotiated TLS
-    connection properties
 
 ========================================
 7. New Classes and Interfaces