Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:14384
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Message-ID: <5.1.0.14.2.20050113173119.03927cb0@localhost>
Date: Thu, 13 Jan 2005 17:31:40 -0800
To: Daniel Lorch <ml-daniel@lorch.cc>,internals@lists.php.net
In-Reply-To: <41E687E1.7090203@lorch.cc>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"; format=flowed
Subject: Re: [Fwd: [PHP-DEV] [PATCH] php.ini-(recommended|dist)
	whitespace noise and typo fix]
From: andi@zend.com (Andi Gutmans)
References: <41E687E1.7090203@lorch.cc>

Can you send it as attachment? If you did, then maybe try and gzip it 
before you send it. I'll apply it. Is it against all branches?

At 03:38 PM 1/13/2005 +0100, Daniel Lorch wrote:
>Hi
>
>It seems that this patch has been overlooked somehow. This is only a 
>cosmetic patch (but a useful one, I believe) which doesn't change any 
>functionality. It shouldn't take long to verify/apply.
>
>Daniel
>
>-------- Original Message --------
>Subject: [PHP-DEV] [PATCH] php.ini-(recommended|dist) whitespace noise and 
>typo fix
>Date: Tue, 21 Dec 2004 01:00:59 +0100
>From: Daniel Lorch <ml-daniel@lorch.cc>
>To: internals@lists.php.net
>
>Hi
>
>I did a `diff -u php.ini-dist php.ini-recommended` to see which settings
>differ. I discovered a lot of 'whitespace noise' and some typos in
>comments. No big deal but I'd be glad if someone could apply the patch
>attached to this mail.
>
>Daniel
>
>
>
>diff -ur php-4.3.10-dist/php.ini-dist php-4.3.10/php.ini-dist
>--- php-4.3.10-dist/php.ini-dist        Wed Aug 18 07:05:23 2004
>+++ php-4.3.10/php.ini-dist     Tue Dec 21 00:54:26 2004
>@@ -108,7 +108,7 @@
>  ; Transparent output compression using the zlib library
>  ; Valid values for this option are 'off', 'on', or a specific buffer size
>  ; to be used for compression (default is 4KB)
>-; Note: Resulting chunk size may vary due to nature of compression. PHP
>+; Note: Resulting chunk size may vary due to nature of compression. PHP
>  ;       outputs chunks that are few hundreds bytes each as a result of
>  ;       compression. If you prefer a larger chunk size for better
>  ;       performance, enable output_buffering in addition.
>@@ -153,6 +153,7 @@
>  ; reference).
>  allow_call_time_pass_reference = On
>
>+;
>  ; Safe Mode
>  ;
>  safe_mode = Off
>@@ -231,6 +232,7 @@
>  max_input_time = 60    ; Maximum amount of time each script may spend 
> parsing request data
>  memory_limit = 8M      ; Maximum amount of memory a script may consume (8MB)
>
>+
>  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
>  ; Error handling and logging ;
>  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
>@@ -309,7 +311,7 @@
>
>  ; Disable the inclusion of HTML tags in error messages.
>  ;html_errors = Off
>-
>+
>  ; If html_errors is set On PHP produces clickable error messages that 
> direct
>  ; to a page describing the error or function causing the error in detail.
>  ; You can download a copy of the PHP manual from 
> http://www.php.net/docs.php
>@@ -469,7 +471,7 @@
>  ; RFC2616 compliant header.
>  ; Default is zero.
>  ;cgi.rfc2616_headers = 0
>-
>+
>
>  ;;;;;;;;;;;;;;;;
>  ; File Uploads ;
>@@ -692,7 +694,7 @@
>  pgsql.allow_persistent = On
>
>  ; Detect broken persistent links always with pg_pconnect(). Need a 
> little overhead.
>-pgsql.auto_reset_persistent = Off
>+pgsql.auto_reset_persistent = Off
>
>  ; Maximum number of persistent links.  -1 means no limit.
>  pgsql.max_persistent = -1
>@@ -701,6 +703,7 @@
>  pgsql.max_links = -1
>
>  ; Ignore PostgreSQL backends Notice message or not.
>+; Notice message logging requires a little overhead.
>  pgsql.ignore_notice = 0
>
>  ; Log PostgreSQL backends Noitce message or not.
>@@ -892,7 +895,7 @@
>
>  ;session.entropy_file = /dev/urandom
>
>-; Set to {nocache,private,public,} to determine HTTP caching aspects
>+; Set to {nocache,private,public,} to determine HTTP caching aspects.
>  ; or leave this empty to avoid sending anti-caching headers.
>  session.cache_limiter = nocache
>
>@@ -900,7 +903,7 @@
>  session.cache_expire = 180
>
>  ; trans sid support is disabled by default.
>-; Use of trans sid may risk your users security.
>+; Use of trans sid may risk your users security.
>  ; Use this option with caution.
>  ; - User may send URL contains active session ID
>  ;   to other person via. email/irc/etc.
>@@ -936,7 +939,7 @@
>  ; Compatability mode with old versions of PHP 3.0.
>  mssql.compatability_mode = Off
>
>-; Connec timeout
>+; Connect timeout
>  ;mssql.connect_timeout = 5
>
>  ; Query timeout
>diff -ur php-4.3.10-dist/php.ini-recommended php-4.3.10/php.ini-recommended
>--- php-4.3.10-dist/php.ini-recommended Wed Aug 18 07:05:23 2004
>+++ php-4.3.10/php.ini-recommended      Tue Dec 21 00:54:55 2004
>@@ -121,12 +121,12 @@
>  ; Transparent output compression using the zlib library
>  ; Valid values for this option are 'off', 'on', or a specific buffer size
>  ; to be used for compression (default is 4KB)
>-; Note: Resulting chunk size may vary due to nature of compression. PHP
>-;       outputs chunks that are few handreds bytes each as a result of 
>compression.
>-;       If you want larger chunk size for better performence, enable 
>output_buffering
>-;       also.
>-; Note: output_handler must be empty if this is set 'On' !!!!
>-;       Instead you must use zlib.output_handler.
>+; Note: Resulting chunk size may vary due to nature of compression. PHP
>+;       outputs chunks that are few hundreds bytes each as a result of
>+;       compression. If you prefer a larger chunk size for better
>+;       performance, enable output_buffering in addition.
>+; Note: You need to use zlib.output_handler instead of the standard
>+;       output_handler, or otherwise the output will be corrupted.
>  zlib.output_compression = Off
>
>  ; You cannot specify additional output handlers if zlib.output_compression
>@@ -414,7 +414,7 @@
>  default_mimetype = "text/html"
>  ;default_charset = "iso-8859-1"
>
>-; Always populate the $HTTP_RAW_POST_DATA 
>variable.
>+; Always populate the $HTTP_RAW_POST_DATA variable.
>  ;always_populate_raw_post_data = On
>
>
>@@ -435,7 +435,7 @@
>  ; cgi.force_redirect configuration below
>  doc_root =
>
>-; The directory under which PHP opens the script using /~usernamem used only
>+; The directory under which PHP opens the script using /~username used only
>  ; if nonempty.
>  user_dir =
>
>@@ -511,8 +511,8 @@
>  ; Define the anonymous ftp password (your email address)
>  ;from="john@doe.com"
>
>-; Define the user agent for php to send
>-;user_agent="PHP"
>+; Define the User-Agent string
>+; user_agent="PHP"
>
>  ; Default timeout for socket based streams (seconds)
>  default_socket_timeout = 60
>@@ -706,8 +706,7 @@
>  ; Allow or prevent persistent links.
>  pgsql.allow_persistent = On
>
>-; Detect broken persistent links always with pg_pconnect().
>-; Auto reset feature requires a little overheads.
>+; Detect broken persistent links always with pg_pconnect(). Need a little 
>overhead.
>  pgsql.auto_reset_persistent = Off
>
>  ; Maximum number of persistent links.  -1 means no limit.
>@@ -717,7 +716,7 @@
>  pgsql.max_links = -1
>
>  ; Ignore PostgreSQL backends Notice message or not.
>-; Notice message logging require a little overheads.
>+; Notice message logging requires a little overhead.
>  pgsql.ignore_notice = 0
>
>  ; Log PostgreSQL backends Noitce message or not.
>@@ -826,12 +825,23 @@
>  ; Argument passed to save_handler.  In the case of files, this is the path
>  ; where data files are stored. Note: Windows users have to change this
>  ; variable in order to use PHP's session functions.
>+; As of PHP 4.0.1, you can define the path as:
>+;     session.save_path = "N;/path"
>+; where N is an integer.  Instead of storing all the session files in
>+; /path, what this will do is use subdirectories N-levels deep, and
>+; store the session data in those directories.  This is useful if you
>+; or your OS have problems with lots of files in one directory, and is
>+; a more efficient layout for servers that handle lots of sessions.
>+; NOTE 1: PHP will not create this directory structure automatically.
>+;         You can use the script in the ext/session dir for that purpose.
>+; NOTE 2: See the section on garbage collection below if you choose to
>+;         use subdirectories for session storage
>  ;session.save_path = /tmp
>
>  ; Whether to use cookies.
>  session.use_cookies = 1
>
>-; This option enables administrators to make their users invulnerable to
>+; This option enables administrators to make their users invulnerable to
>  ; attacks which involve passing session ids in URLs; defaults to 0.
>  ; session.use_only_cookies = 1
>
>@@ -866,6 +876,14 @@
>  ; cleaned up by the garbage collection process.
>  session.gc_maxlifetime = 1440
>
>+; NOTE: If you are using the subdirectory option for storing session files
>+;       (see session.save_path above), then garbage collection does *not*
>+;       happen automatically.  You will need to do your own garbage
>+;       collection through a shell script, cron entry, or some other method.
>+;       For example, the following script would is the equivalent of
>+;       setting session.gc_maxlifetime to 1440 (1440 seconds = 24 minutes):
>+;          cd /path/to/sessions; find -cmin +24 | xargs rm
>+
>  ; PHP 4.2 and less have an undocumented feature/bug that allows you to
>  ; to initialize a session variable in the global scope, albeit 
> register_globals
>  ; is disabled.  PHP 4.3 and later will warn you, if this feature is used.
>@@ -903,7 +921,7 @@
>  ; - User may send URL contains active session ID
>  ;   to other person via. email/irc/etc.
>  ; - URL that contains active session ID may be stored
>-;   in publically accessible computer.
>+;   in publically accessible computer.
>  ; - User may access your site with the same session ID
>  ;   always using URL stored in browser's history or bookmarks.
>  session.use_trans_sid = 0
>
>
>
>--
>PHP Internals - PHP Runtime Development Mailing List
>To unsubscribe, visit: http://www.php.net/unsub.php