From 1e92b24a2aeedfe7679f2d5d92b5cfdb363b549b Mon Sep 17 00:00:00 2001 From: Chris McCafferty Date: Sun, 9 Nov 2014 22:30:51 -0500 Subject: Fix #68355: Inconsistency in example php.ini comments There are some arbitrary differences between php.ini-production and php.ini-development. This patch corrects the differences. --- php.ini-production | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'php.ini-production') diff --git a/php.ini-production b/php.ini-production index a2a50ea2f8..d886985b85 100644 --- a/php.ini-production +++ b/php.ini-production @@ -678,7 +678,7 @@ auto_append_file = ; http://php.net/default-mimetype default_mimetype = "text/html" -; PHP's default character set is set to empty. +; PHP's default character set is set to UTF-8. ; http://php.net/default-charset default_charset = "UTF-8" @@ -688,10 +688,12 @@ default_charset = "UTF-8" ;internal_encoding = ; PHP input character encoding is set to empty. +; If empty, default_charset is used. ; http://php.net/input-encoding ;input_encoding = ; PHP output character encoding is set to empty. +; If empty, default_charset is used. ; mbstring or iconv output handler is used. ; See also output_buffer. ; http://php.net/output-encoding -- cgit v1.2.1 From 7386b74b075c2a96ef788f0518d8b7aafad91ef5 Mon Sep 17 00:00:00 2001 From: Reeze Xia Date: Wed, 8 Oct 2014 23:27:52 +0800 Subject: 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 is ok. --- php.ini-production | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'php.ini-production') diff --git a/php.ini-production b/php.ini-production index d886985b85..c069756f96 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" -- cgit v1.2.1 From 6d148f7ed97ec55439c378577c4373e03842414e Mon Sep 17 00:00:00 2001 From: Sobak Date: Sun, 28 Sep 2014 12:44:40 +0200 Subject: Update comments in php.ini --- php.ini-production | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'php.ini-production') diff --git a/php.ini-production b/php.ini-production index 74e7ceb761..7cdd069c44 100644 --- a/php.ini-production +++ b/php.ini-production @@ -293,20 +293,17 @@ serialize_precision = 17 ; open_basedir, if set, limits all file operations to the defined directory ; and below. This directive makes most sense if used in a per-directory -; or per-virtualhost web server configuration file. This directive is -; *NOT* affected by whether Safe Mode is turned On or Off. +; or per-virtualhost web server configuration file. ; http://php.net/open-basedir ;open_basedir = ; This directive allows you to disable certain functions for security reasons. -; It receives a comma-delimited list of function names. This directive is -; *NOT* affected by whether Safe Mode is turned On or Off. +; It receives a comma-delimited list of function names. ; http://php.net/disable-functions disable_functions = ; This directive allows you to disable certain classes for security reasons. -; It receives a comma-delimited list of class names. This directive is -; *NOT* affected by whether Safe Mode is turned On or Off. +; It receives a comma-delimited list of class names. ; http://php.net/disable-classes disable_classes = @@ -1005,7 +1002,7 @@ smtp_port = 25 ; Force the addition of the specified parameters to be passed as extra parameters ; to the sendmail binary. These parameters will always replace the value of -; the 5th parameter to mail(), even in safe mode. +; the 5th parameter to mail(). ;mail.force_extra_parameters = ; Add X-PHP-Originating-Script: that will include uid of the script followed by the filename -- cgit v1.2.1