summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2013-12-12 14:42:19 +0400
committerDmitry Stogov <dmitry@zend.com>2013-12-12 14:42:19 +0400
commit9d08f09e06c437420b40f146d2f08ccd85112810 (patch)
treeb47b9fbd98dfe3a17046cab5994d9b114ff55d38
parenta23bcba875a9a17717f77e6365fd16d17ef16db5 (diff)
parentbc1c2b3b316d58ea4450c957aaf6e612bd03847e (diff)
downloadphp-git-9d08f09e06c437420b40f146d2f08ccd85112810.tar.gz
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src: remove always_populate_raw_post_data INI entries from master, UPGRADING.INTERNALS coming shortly
-rw-r--r--php.ini-development6
-rw-r--r--php.ini-production6
2 files changed, 0 insertions, 12 deletions
diff --git a/php.ini-development b/php.ini-development
index 2a01555b7f..df39e42140 100644
--- a/php.ini-development
+++ b/php.ini-development
@@ -692,12 +692,6 @@ default_mimetype = "text/html"
; http://php.net/default-charset
;default_charset = "UTF-8"
-; Always populate the $HTTP_RAW_POST_DATA variable. PHP's default behavior is
-; to disable this feature. If post reading is disabled through
-; enable_post_data_reading, $HTTP_RAW_POST_DATA is *NOT* populated.
-; http://php.net/always-populate-raw-post-data
-;always_populate_raw_post_data = On
-
;;;;;;;;;;;;;;;;;;;;;;;;;
; Paths and Directories ;
;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/php.ini-production b/php.ini-production
index d78cdcbe41..cff1a3bc00 100644
--- a/php.ini-production
+++ b/php.ini-production
@@ -692,12 +692,6 @@ default_mimetype = "text/html"
; http://php.net/default-charset
;default_charset = "UTF-8"
-; Always populate the $HTTP_RAW_POST_DATA variable. PHP's default behavior is
-; to disable this feature. If post reading is disabled through
-; enable_post_data_reading, $HTTP_RAW_POST_DATA is *NOT* populated.
-; http://php.net/always-populate-raw-post-data
-;always_populate_raw_post_data = On
-
;;;;;;;;;;;;;;;;;;;;;;;;;
; Paths and Directories ;
;;;;;;;;;;;;;;;;;;;;;;;;;