com php-src: Fix php.ini-*'s comment about directive: request_order: php.ini-development php.ini-producti on

Commit: 7386b74b075c2a96ef788f0518d8b7aafad91ef5 Author: Reeze Xia <reeze@php.net> Wed, 8 Oct 2014 23:27:52 +0800 Committer: Stanislav Malyshev <stas@php.net> Sun, 23 Nov 2014 16:07:47 -0800 Parents: 8439eb6277feaa242810ca8808982cc4fba7ffb8 Branches: PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7386b74b075c2a96ef788f0518d8b7aafad91ef5 Log: Fix php.ini-*'s comment about directive: request_order request_order directive only support register G,P,C but not all of the EGPCS global variables. The doc <http://php.net/manual/en/ini.core.php#ini.request-order> is ok. Changed paths: M php.ini-development M php.ini-production Diff: diff --git a/php.ini-development b/php.ini-development index d29cc80..e0571e5 100644 --- a/php.ini-development +++ b/php.ini-development @@ -611,13 +611,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" diff --git a/php.ini-production b/php.ini-production index d886985..c069756 100644 --- a/php.ini-production +++ b/php.ini-production @@ -611,13 +611,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"