Merge remote-tracking branch 'origin/master' into str_size_and_int64

* origin/master:
  This test depends on expose_php being on
  fixed broken merged code
  Fixed a bug that cannot access custom request header stored in apache_request_headers() though array index.
  Test output relies on expose_php being on
  1.2 is a problematic float to print out Lower the default display precision for this test
  The test output is dependent on expose_php ini
  cleanup file headers.
  Do not kill children process in pre-fork mode when parent process quit.
  update year & copyright
  Fix bug #67587: Redirection loop on nginx with FPM
  Fix still broken session test.  Only return true/false.
  Followup fix to custom session save handlers
  Fix handling of session user module custom handlers.
  Update info.c

Conflicts:
	ext/session/mod_user.c
	main/php_content_types.c

1 files changed, 0 insertions, 23 deletions

diff --git a/main/php_content_types.c b/main/php_content_types.c
index 26e939e7b3..c8db921421 100644
--- a/main/php_content_types.c
+++ b/main/php_content_types.c
@@ -42,29 +42,6 @@ SAPI_API SAPI_POST_READER_FUNC(php_default_post_reader)
 			/* no post handler registered, so we just swallow the data */
 			sapi_read_standard_form_data(TSRMLS_C);
 		}
-
-		if (populate_raw_post_data(TSRMLS_C)) {
-			size_t length;
-			char *data = NULL;
-
-			php_stream_rewind(SG(request_info).request_body);
-			length = php_stream_copy_to_mem(SG(request_info).request_body, &data, PHP_STREAM_COPY_ALL, 0);
-			php_stream_rewind(SG(request_info).request_body);
-
-			if (length > INT_MAX) {
-				sapi_module.sapi_error(E_WARNING,
-					"HTTP_RAW_POST_DATA truncated from %lu to %d bytes",
-					(unsigned long) length, INT_MAX);
-				length = INT_MAX;
-			}
-			SET_VAR_STRINGL("HTTP_RAW_POST_DATA", data, length);
-
-			sapi_module.sapi_error(E_DEPRECATED,
-				"Automatically populating $HTTP_RAW_POST_DATA is deprecated and "
-				"will be removed in a future version. To avoid this warning set "
-				"'always_populate_raw_post_data' to '-1' in php.ini and use the "
-				"php://input stream instead.");
-		}
 	}
 }
 /* }}} */