Clarify always_populate_raw_post_data situation in 5.6

2 files changed, 7 insertions, 14 deletions

diff --git a/NEWS b/NEWS
index 735d858ca8..340b3e56ac 100644
--- a/NEWS
+++ b/NEWS
@@ -16,9 +16,10 @@ PHP                                                                        NEWS
 	(Gustavo)
   . Uploads equal or greater than 2GB in size are now accepted.
     (Ralf Lang, Mike)
-  . Reduced POST data memory usage by 200-300%. Removed INI setting
-    always_populate_raw_post_data and the $HTTP_RAW_POST_DATA global
-    variable. (Mike)
+  . Reduced POST data memory usage by 200-300%. Changed INI setting
+    always_populate_raw_post_data to throw a deprecation warning when enabling
+	and to accept -1 for never populating the $HTTP_RAW_POST_DATA global 
+	variable, which will be the default in future PHP versions. (Mike)
   . Implemented dedicated syntax for variadic functions
     (RFC: https://wiki.php.net/rfc/variadics). (Nikita)
   . Fixed bug #50333 Improving multi-threaded scalability by using
diff --git a/UPGRADING b/UPGRADING
index f2be0a3ea8..a2e92616ce 100755
--- a/UPGRADING
+++ b/UPGRADING
@@ -20,16 +20,6 @@ PHP X.Y UPGRADE NOTES
 1. Backward Incompatible Changes
 ========================================
 
-- Core:
-  Removed $HTTP_RAW_POST_DATA global variable. Restore backwards compatibility 
-  by:
-  <?php
-  global $HTTP_RAW_POST_DATA;
-  if (!isset($HTTP_RAW_POST_DATA)) {
-      $HTTP_RAW_POST_DATA = file_get_contents("php://input");
-  }
-  ?>
-
 - JSON:
   json_decode() no longer accepts non-lowercase variants of lone JSON true,
   false or null values. For example, True or FALSE will now cause json_decode to
@@ -148,7 +138,9 @@ PHP X.Y UPGRADE NOTES
 ========================================
 
 - Core:
-  Removed always_populate_raw_post_data.
+  Changed always_populate_raw_post_data to throw a deprecation warning when
+  enabled and to recognize ohe value -1 for never populating the global 
+  $HTTP_RAW_POST_DATA variable, which will be default in future PHP versions.
 
 ========================================
 11. Other Changes