[PHP-CVS] svn: /php/php-src/trunk/ php.ini-development php.ini-production

2012-02-09 Thread Christopher Jones
sixd Thu, 09 Feb 2012 23:53:07 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=323146

Log:
Merge Stas's 5.4 r323128 to trunk

Changed paths:
U   php/php-src/trunk/php.ini-development
U   php/php-src/trunk/php.ini-production

Modified: php/php-src/trunk/php.ini-development
===
--- php/php-src/trunk/php.ini-development   2012-02-09 22:18:50 UTC (rev 
323145)
+++ php/php-src/trunk/php.ini-development   2012-02-09 23:53:07 UTC (rev 
323146)
@@ -424,7 +424,7 @@
 ; development and early testing.
 ;
 ; Error Level Constants:
-; E_ALL - All errors and warnings (includes E_STRICT as of PHP 
6.0.0)
+; E_ALL - All errors and warnings (includes E_STRICT as of PHP 
5.4.0)
 ; E_ERROR   - fatal run-time errors
 ; E_RECOVERABLE_ERROR  - almost fatal run-time errors
 ; E_WARNING - run-time warnings (non-fatal errors)

Modified: php/php-src/trunk/php.ini-production
===
--- php/php-src/trunk/php.ini-production2012-02-09 22:18:50 UTC (rev 
323145)
+++ php/php-src/trunk/php.ini-production2012-02-09 23:53:07 UTC (rev 
323146)
@@ -424,7 +424,7 @@
 ; development and early testing.
 ;
 ; Error Level Constants:
-; E_ALL - All errors and warnings (includes E_STRICT as of PHP 
6.0.0)
+; E_ALL - All errors and warnings (includes E_STRICT as of PHP 
5.4.0)
 ; E_ERROR   - fatal run-time errors
 ; E_RECOVERABLE_ERROR  - almost fatal run-time errors
 ; E_WARNING - run-time warnings (non-fatal errors)

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/trunk/ php.ini-development php.ini-production

2010-12-20 Thread Moriyoshi Koizumi
moriyoshiTue, 21 Dec 2010 06:57:46 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=306535

Log:
- Update ini descriptions.  It is still possible that zend.multibyte will be 
removed in the near future as it is confirmed to not impose any significant 
overhead with the standard configuration even when it is enabled.

Changed paths:
U   php/php-src/trunk/php.ini-development
U   php/php-src/trunk/php.ini-production

Modified: php/php-src/trunk/php.ini-development
===
--- php/php-src/trunk/php.ini-development   2010-12-21 05:49:13 UTC (rev 
306534)
+++ php/php-src/trunk/php.ini-development   2010-12-21 06:57:46 UTC (rev 
306535)
@@ -352,6 +352,18 @@
 ; http://php.net/realpath-cache-ttl
 ;realpath_cache_ttl = 120

+; If enabled, scripts may be written in encodings that are incompatible with
+; the scanner.  CP936, Big5, CP949 and Shift_JIS are the examples of such
+; encodings.  To use this feature, mbstring extension must be enabled.
+; Default: Off
+;zend.multibyte = Off
+
+; Allows to set the default encoding for the scripts.  This value will be used
+; unless declare(encoding=...) directive appears at the top of the script.
+; Only affects if zend.multibyte is set.
+; Default: 
+;zend.script_encoding =
+
 ;
 ; Miscellaneous ;
 ;
@@ -1734,10 +1746,6 @@
 ; Default: mbstring.http_output_conv_mimetype=^(text/|application/xhtml\+xml)
 ;mbstring.http_output_conv_mimetype=

-; Allows to set script encoding. Only affects if PHP is compiled with 
--enable-zend-multibyte
-; Default: 
-;mbstring.script_encoding=
-
 [gd]
 ; Tell the jpeg decode to ignore warnings and try to create
 ; a gd image. The warning will then be displayed as notices

Modified: php/php-src/trunk/php.ini-production
===
--- php/php-src/trunk/php.ini-production2010-12-21 05:49:13 UTC (rev 
306534)
+++ php/php-src/trunk/php.ini-production2010-12-21 06:57:46 UTC (rev 
306535)
@@ -352,6 +352,18 @@
 ; http://php.net/realpath-cache-ttl
 ;realpath_cache_ttl = 120

+; If enabled, scripts may be written in encodings that are incompatible with
+; the scanner.  CP936, Big5, CP949 and Shift_JIS are the examples of such
+; encodings.  To use this feature, mbstring extension must be enabled.
+; Default: Off
+;zend.multibyte = Off
+
+; Allows to set the default encoding for the scripts.  This value will be used
+; unless declare(encoding=...) directive appears at the top of the script.
+; Only affects if zend.multibyte is set.
+; Default: 
+;zend.script_encoding =
+
 ;
 ; Miscellaneous ;
 ;
@@ -1730,10 +1742,6 @@
 ; Default: mbstring.http_output_conv_mimetype=^(text/|application/xhtml\+xml)
 ;mbstring.http_output_conv_mimetype=

-; Allows to set script encoding. Only affects if PHP is compiled with 
--enable-zend-multibyte
-; Default: 
-;mbstring.script_encoding=
-
 [gd]
 ; Tell the jpeg decode to ignore warnings and try to create
 ; a gd image. The warning will then be displayed as notices

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/trunk/ php.ini-development php.ini-production

2010-12-16 Thread Gustavo André dos Santos Lopes
cataphract   Thu, 16 Dec 2010 11:27:17 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=306401

Log:
- Adding enable_post_data_reading to php.ini-*

Changed paths:
U   php/php-src/trunk/php.ini-development
U   php/php-src/trunk/php.ini-production

Modified: php/php-src/trunk/php.ini-development
===
--- php/php-src/trunk/php.ini-development   2010-12-16 11:16:38 UTC (rev 
306400)
+++ php/php-src/trunk/php.ini-development   2010-12-16 11:27:17 UTC (rev 
306401)
@@ -636,7 +636,18 @@
 ; http://php.net/auto-globals-jit
 auto_globals_jit = On

+; Whether PHP will read the POST data.
+; This option is enabled by default.
+; Most likely, you won't want to disable this option globally. It causes $_POST
+; and $_FILES to always be empty; the only way you will be able to read the
+; POST data will be through the php://input stream wrapper. This can be useful
+; to proxy requests or to process the POST data in a memory efficient fashion.
+; http://php.net/enable-post-data-reading
+;enable_post_data_reading = Off
+
 ; Maximum size of POST data that PHP will accept.
+; Its value may be 0 to disable the limit. It is ignored if POST data reading
+; is disabled through enable_post_data_reading.
 ; http://php.net/post-max-size
 post_max_size = 8M

@@ -685,7 +696,8 @@
 ;default_charset = UTF-8

 ; Always populate the $HTTP_RAW_POST_DATA variable. PHP's default behavior is
-; to disable this feature.
+; 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


Modified: php/php-src/trunk/php.ini-production
===
--- php/php-src/trunk/php.ini-production2010-12-16 11:16:38 UTC (rev 
306400)
+++ php/php-src/trunk/php.ini-production2010-12-16 11:27:17 UTC (rev 
306401)
@@ -636,7 +636,18 @@
 ; http://php.net/auto-globals-jit
 auto_globals_jit = On

+; Whether PHP will read the POST data.
+; This option is enabled by default.
+; Most likely, you won't want to disable this option globally. It causes $_POST
+; and $_FILES to always be empty; the only way you will be able to read the
+; POST data will be through the php://input stream wrapper. This can be useful
+; to proxy requests or to process the POST data in a memory efficient fashion.
+; http://php.net/enable-post-data-reading
+;enable_post_data_reading = Off
+
 ; Maximum size of POST data that PHP will accept.
+; Its value may be 0 to disable the limit. It is ignored if POST data reading
+; is disabled through enable_post_data_reading.
 ; http://php.net/post-max-size
 post_max_size = 8M

@@ -685,7 +696,8 @@
 ;default_charset = UTF-8

 ; Always populate the $HTTP_RAW_POST_DATA variable. PHP's default behavior is
-; to disable this feature.
+; 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


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: /php/php-src/trunk/ php.ini-development php.ini-production

2010-11-18 Thread Patrick Allaert
patrickallaert   Thu, 18 Nov 2010 10:13:58 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=305488

Log:
Reviewing php.ini-* configurations files:
* Making both files as similar as possible
* Removed trailing whitespaces
* Fixed some spelling mistakes
* Section [PostgresSQL] - [PostgreSQL]
* Introducing missing mysqli.allow_{local_infile,persistent} entries in 
-development

Changed paths:
U   php/php-src/trunk/php.ini-development
U   php/php-src/trunk/php.ini-production

Modified: php/php-src/trunk/php.ini-development
===
--- php/php-src/trunk/php.ini-development	2010-11-18 10:11:36 UTC (rev 305487)
+++ php/php-src/trunk/php.ini-development	2010-11-18 10:13:58 UTC (rev 305488)
@@ -588,11 +588,11 @@
 ;arg_separator.input = ;

 ; This directive determines which super global arrays are registered when PHP
-; starts up. G,P,C,E  S are abbreviations for the following respective super
-; globals: GET, POST, COOKIE, ENV and SERVER. There is a performance penalty
-: paid for the registration of these arrays and because ENV is not as commonly
-; used as the others, ENV is is not recommended on productions servers. You
-; can still get access to the environment variables through getenv() should you
+; starts up. G,P,C,E  S are abbreviations for the following respective super
+; globals: GET, POST, COOKIE, ENV and SERVER. There is a performance penalty
+: paid for the registration of these arrays and because ENV is not as commonly
+; used as the others, ENV is is not recommended on productions servers. You
+; can still get access to the environment variables through getenv() should you
 ; need to.
 ; Default Value: EGPCS
 ; Development Value: GPCS
@@ -631,7 +631,7 @@
 ; When enabled, the SERVER and ENV variables are created when they're first
 ; used (Just In Time) instead of when the script starts. If these variables
 ; are not used within a script, having this directive on will result in a
-; performance gain. The PHP directive register_argc_argv must be disabled
+; performance gain. The PHP directive register_argc_argv must be disabled
 ; for this directive to have any affect.
 ; http://php.net/auto-globals-jit
 auto_globals_jit = On
@@ -1152,6 +1152,14 @@
 ; http://php.net/mysqli.max-persistent
 mysqli.max_persistent = -1

+; Allow accessing, from PHP's perspective, local files with LOAD DATA statements
+; http://php.net/mysqli.allow_local_infile
+;mysqli.allow_local_infile = On
+
+; Allow or prevent persistent links.
+; http://php.net/mysqli.allow-persistent
+mysqli.allow_persistent = On
+
 ; Maximum number of links.  -1 means no limit.
 ; http://php.net/mysqli.max-links
 mysqli.max_links = -1
@@ -1192,12 +1200,12 @@
 mysqli.reconnect = Off

 [mysqlnd]
-; Enable / Disable collection of general statstics by mysqlnd which can be
+; Enable / Disable collection of general statistics by mysqlnd which can be
 ; used to tune and monitor MySQL operations.
 ; http://php.net/mysqlnd.collect_statistics
 mysqlnd.collect_statistics = On

-; Enable / Disable collection of memory usage statstics by mysqlnd which can be
+; Enable / Disable collection of memory usage statistics by mysqlnd which can be
 ; used to tune and monitor MySQL operations.
 ; http://php.net/mysqlnd.collect_memory_statistics
 mysqlnd.collect_memory_statistics = On
@@ -1264,7 +1272,7 @@
 ; http://php.net/oci8.old-oci-close-semantics
 ;oci8.old_oci_close_semantics = Off

-[PostgresSQL]
+[PostgreSQL]
 ; Allow or prevent persistent links.
 ; http://php.net/pgsql.allow-persistent
 pgsql.allow_persistent = On
@@ -1382,7 +1390,7 @@
 ;session.cookie_secure =

 ; This option forces PHP to fetch and use a cookie for storing and maintaining
-; the session id. We encourage this operation as it's very helpful in combatting
+; the session id. We encourage this operation as it's very helpful in combating
 ; session hijacking when not specifying and managing your own session id. It is
 ; not the end all be all of session hijacking defense, but it's a good start.
 ; http://php.net/session.use-only-cookies
@@ -1495,7 +1503,7 @@
 ; Defaults to /dev/urandom
 ; On systems that don't have /dev/urandom but do have /dev/arandom, this will default to /dev/arandom
 ; If neither are found at compile time, the default is no entropy file.
-; On windows, setting the entropy_length setting will activate the
+; On windows, setting the entropy_length setting will activate the
 ; Windows random source (using the CryptoAPI)
 ;session.entropy_file = /dev/urandom

@@ -1514,7 +1522,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 publicly accessible computer.
 ; - User may access your site with the same session ID
 ;   always using URL stored in browser's history or bookmarks.
 ; http://php.net/session.use-trans-sid

Modified: 

[PHP-CVS] svn: /php/php-src/trunk/ php.ini-development php.ini-production

2010-03-04 Thread Christopher Jones
sixd Thu, 04 Mar 2010 20:05:27 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=295833

Log:
Remove magic_quotes from php.ini to match code reality

Changed paths:
U   php/php-src/trunk/php.ini-development
U   php/php-src/trunk/php.ini-production

Modified: php/php-src/trunk/php.ini-development
===
--- php/php-src/trunk/php.ini-development   2010-03-04 19:26:14 UTC (rev 
295832)
+++ php/php-src/trunk/php.ini-development   2010-03-04 20:05:27 UTC (rev 
295833)
@@ -121,11 +121,6 @@
 ;   Development Value: On
 ;   Production Value: On

-; magic_quotes_gpc
-;   Default Value: On
-;   Development Value: Off
-;   Production Value: Off
-
 ; max_input_time
 ;   Default Value: -1 (Unlimited)
 ;   Development Value: 60 (60 seconds)
@@ -727,30 +722,6 @@
 ; http://php.net/post-max-size
 post_max_size = 8M

-; Magic quotes are a preprocessing feature of PHP where PHP will attempt to
-; escape any character sequences in GET, POST, COOKIE and ENV data which might
-; otherwise corrupt data being placed in resources such as databases before
-; making that data available to you. Because of character encoding issues and
-; non-standard SQL implementations across many databases, it's not currently
-; possible for this feature to be 100% accurate. PHP's default behavior is to
-; enable the feature. We strongly recommend you use the escaping mechanisms
-; designed specifically for the database your using instead of relying on this
-; feature. Also note, this feature has been deprecated as of PHP 5.3.0 and is
-; scheduled for removal in PHP 6.
-; Default Value: On
-; Development Value: Off
-; Production Value: Off
-; http://php.net/magic-quotes-gpc
-magic_quotes_gpc = Off
-
-; Magic quotes for runtime-generated data, e.g. data from SQL, from exec(), 
etc.
-; http://php.net/magic-quotes-runtime
-magic_quotes_runtime = Off
-
-; Use Sybase-style magic quotes (escape ' with '' instead of \').
-; http://php.net/magic-quotes-sybase
-magic_quotes_sybase = Off
-
 ; Automatically add files before PHP document.
 ; http://php.net/auto-prepend-file
 auto_prepend_file =

Modified: php/php-src/trunk/php.ini-production
===
--- php/php-src/trunk/php.ini-production2010-03-04 19:26:14 UTC (rev 
295832)
+++ php/php-src/trunk/php.ini-production2010-03-04 20:05:27 UTC (rev 
295833)
@@ -121,11 +121,6 @@
 ;   Development Value: On
 ;   Production Value: On

-; magic_quotes_gpc
-;   Default Value: On
-;   Development Value: Off
-;   Production Value: Off
-
 ; max_input_time
 ;   Default Value: -1 (Unlimited)
 ;   Development Value: 60 (60 seconds)
@@ -727,30 +722,6 @@
 ; http://php.net/post-max-size
 post_max_size = 8M

-; Magic quotes are a preprocessing feature of PHP where PHP will attempt to
-; escape any character sequences in GET, POST, COOKIE and ENV data which might
-; otherwise corrupt data being placed in resources such as databases before
-; making that data available to you. Because of character encoding issues and
-; non-standard SQL implementations across many databases, it's not currently
-; possible for this feature to be 100% accurate. PHP's default behavior is to
-; enable the feature. We strongly recommend you use the escaping mechanisms
-; designed specifically for the database your using instead of relying on this
-; feature. Also note, this feature has been deprecated as of PHP 5.3.0 and is
-; scheduled for removal in PHP 6.
-; Default Value: On
-; Development Value: Off
-; Production Value: Off
-; http://php.net/magic-quotes-gpc
-magic_quotes_gpc = Off
-
-; Magic quotes for runtime-generated data, e.g. data from SQL, from exec(), 
etc.
-; http://php.net/magic-quotes-runtime
-magic_quotes_runtime = Off
-
-; Use Sybase-style magic quotes (escape ' with '' instead of \').
-; http://php.net/magic-quotes-sybase
-magic_quotes_sybase = Off
-
 ; Automatically add files before PHP document.
 ; http://php.net/auto-prepend-file
 auto_prepend_file =

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] svn: php/php-src/trunk/ php.ini-development php.ini-production

2009-07-17 Thread Gwynne Raskind
gwynne  Fri, 17 Jul 2009 13:22:44 +

URL: http://svn.php.net/viewvc?view=revisionrevision=284259

Changed paths:
U   php/php-src/trunk/php.ini-development
U   php/php-src/trunk/php.ini-production

Log:
document the hash name functionality available since 5.3

Modified: php/php-src/trunk/php.ini-development
===
--- php/php-src/trunk/php.ini-development   2009-07-17 13:17:20 UTC (rev 
284258)
+++ php/php-src/trunk/php.ini-development   2009-07-17 13:22:44 UTC (rev 
284259)
@@ -1614,6 +1614,9 @@
 ; Possible Values
 ;   0  (MD5 128 bits)
 ;   1  (SHA-1 160 bits)
+; This option may also be set to the name of any hash function supported by
+; the hash extension. A list of available hashes is returned by the 
hash_alogs()
+; function.
 ; http://php.net/session.hash-function
 session.hash_function = 0


Modified: php/php-src/trunk/php.ini-production
===
--- php/php-src/trunk/php.ini-production2009-07-17 13:17:20 UTC (rev 
284258)
+++ php/php-src/trunk/php.ini-production2009-07-17 13:22:44 UTC (rev 
284259)
@@ -1622,6 +1622,9 @@
 ; Possible Values
 ;   0  (MD5 128 bits)
 ;   1  (SHA-1 160 bits)
+; This option may also be set to the name of any hash function supported by
+; the hash extension. A list of available hashes is returned by the 
hash_alogs()
+; function.
 ; http://php.net/session.hash-function
 session.hash_function = 0


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php