From 4a3936ef4abdeb72c7d323fe4b6a65e1ae0ef181 Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Tue, 17 Sep 2013 11:08:23 +0200
Subject: [PATCH] NEWS/UPGRADING{,.INTERNALS} notes about temp POST stream

---
 NEWS                |  3 +++
 UPGRADING           | 14 ++++++++++++++
 UPGRADING.INTERNALS | 10 ++++++++++
 3 files changed, 27 insertions(+)

diff --git a/NEWS b/NEWS
index 60fac8cc94..540f896fe4 100644
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,9 @@ 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)
 
 - cURL:
   . Implemented FR #65646 (re-enable CURLOPT_FOLLOWLOCATION with open_basedir
diff --git a/UPGRADING b/UPGRADING
index e9fba517d4..f5e7cd0bbd 100755
--- a/UPGRADING
+++ b/UPGRADING
@@ -20,11 +20,23 @@ 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_ROW_POST_DATA = file_get_contents("php://input");
+  }
+  ?>
 
 ========================================
 2. New Features
 ========================================
 
+- Core:
+  The php://input stream is now re-usable and can be used concurrently with 
+  enable_post_data_reading=0.
 
 ========================================
 2. Changes in SAPI modules
@@ -91,6 +103,8 @@ PHP X.Y UPGRADE NOTES
 10. Changes to INI File Handling
 ========================================
 
+- Core:
+  Removed always_populate_raw_post_data.
 
 ========================================
 11. Other Changes
diff --git a/UPGRADING.INTERNALS b/UPGRADING.INTERNALS
index 7cb5539fc1..90202f00f0 100644
--- a/UPGRADING.INTERNALS
+++ b/UPGRADING.INTERNALS
@@ -5,6 +5,7 @@ UPGRADE NOTES - PHP X.Y
 1. Internal API changes
   a. Addition of do_operation and compare object handlers
   b. return_value_ptr now always available, RETVAL_ZVAL_FAST macros
+  c. POST data handling
 
 2. Build system changes
   a. Unix build system changes
@@ -57,6 +58,15 @@ UPGRADE NOTES - PHP X.Y
   The macros behave similarly to the non-FAST variants with copy=1 and
   dtor=0, but will try to return the zval without making a copy by utilizing
   return_value_ptr.
+  
+  c. POST data handling
+  
+  The sapi_request_info's members post_data, post_data_len and raw_post_data as 
+  well as raw_post_data_len have been replaced with a temp PHP stream 
+  request_body.
+  
+  The recommended way to access raw POST data is to open and use a php://input 
+  stream wrapper.  It is safe to be used concurrently and more than once. 
 
 ========================
 2. Build system changes
-- 
2.40.0