summaryrefslogtreecommitdiff
path: root/php.ini-development
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2014-11-23 16:08:14 -0800
committerStanislav Malyshev <stas@php.net>2014-11-23 16:08:14 -0800
commit1edc826bed46bbc153cc0881cda75d031cf1bc61 (patch)
tree5a402bb5b734a0b15a455cbab87e53bacdc53a14 /php.ini-development
parent529e1957781d2de8fc2ece3d045c446e9be3e91e (diff)
parent7386b74b075c2a96ef788f0518d8b7aafad91ef5 (diff)
downloadphp-git-1edc826bed46bbc153cc0881cda75d031cf1bc61.tar.gz
Merge branch 'PHP-5.6'
* PHP-5.6: Fix php.ini-*'s comment about directive: request_order
Diffstat (limited to 'php.ini-development')
-rw-r--r--php.ini-development14
1 files changed, 7 insertions, 7 deletions
diff --git a/php.ini-development b/php.ini-development
index a3cb5a3b78..d03972b14a 100644
--- a/php.ini-development
+++ b/php.ini-development
@@ -607,13 +607,13 @@ html_errors = On
; http://php.net/variables-order
variables_order = "GPCS"
-; This directive determines which super global data (G,P,C,E & S) should
-; be registered into the super global array REQUEST. If so, it also determines
-; the order in which that data is registered. The values for this directive are
-; specified in the same manner as the variables_order directive, EXCEPT one.
-; Leaving this value empty will cause PHP to use the value set in the
-; variables_order directive. It does not mean it will leave the super globals
-; array REQUEST empty.
+; This directive determines which super global data (G,P & C) should be
+; registered into the super global array REQUEST. If so, it also determines
+; the order in which that data is registered. The values for this directive
+; are specified in the same manner as the variables_order directive,
+; EXCEPT one. Leaving this value empty will cause PHP to use the value set
+; in the variables_order directive. It does not mean it will leave the super
+; globals array REQUEST empty.
; Default Value: None
; Development Value: "GP"
; Production Value: "GP"