[PHP-CVS] cvs: php-src(PHP_5_3) / php.ini-development php.ini-production
lsmith Thu Jul 2 13:34:38 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcphp.ini-production php.ini-development Log: MFH: removed references to track_vars, since this option doesnt exist since ages http://cvs.php.net/viewvc.cgi/php-src/php.ini-production?r1=1.1.2.14r2=1.1.2.15diff_format=u Index: php-src/php.ini-production diff -u php-src/php.ini-production:1.1.2.14 php-src/php.ini-production:1.1.2.15 --- php-src/php.ini-production:1.1.2.14 Sun Jun 28 17:56:18 2009 +++ php-src/php.ini-production Thu Jul 2 13:34:38 2009 @@ -22,7 +22,7 @@ ; The syntax of the file is extremely simple. Whitespace and Lines ; beginning with a semicolon are silently ignored (as you probably guessed). ; Section headers (e.g. [Foo]) are also silently ignored, even though -; they might mean something in the future. +; they might mean something in the future. ; Directives following the section heading [PATH=/www/mysite] only ; apply to PHP files in the /www/mysite directory. Directives @@ -437,11 +437,11 @@ ; Maximum execution time of each script, in seconds ; http://php.net/max-execution-time ; Note: This directive is hardcoded to 0 for the CLI SAPI -max_execution_time = 30 +max_execution_time = 30 ; Maximum amount of time each script may spend parsing request data. It's a good ; idea to limit this time on productions servers in order to eliminate unexpectedly -; long running scripts. +; long running scripts. ; Note: This directive is hardcoded to -1 for the CLI SAPI ; Default Value: -1 (Unlimited) ; Development Value: 60 (60 seconds) @@ -521,8 +521,8 @@ ; It's recommended that errors be logged on production servers rather than ; having the errors sent to STDOUT. ; Possible Values: -; Off = Do not display any errors -; stderr = Display errors to STDERR (affects only CGI/CLI binaries!) +; Off = Do not display any errors +; stderr = Display errors to STDERR (affects only CGI/CLI binaries!) ; On or stdout = Display errors to STDOUT ; Default Value: On ; Development Value: On @@ -641,8 +641,6 @@ ; Data Handling ; ; -; Note - track_vars is ALWAYS enabled - ; The separator used in PHP generated URLs to separate arguments. ; PHP's default setting is . ; http://php.net/arg-separator.output @@ -674,7 +672,7 @@ ; 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 +; 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 @@ -685,9 +683,7 @@ ; Whether or not to register the EGPCS variables as global variables. You may ; want to turn this off if you don't want to clutter your scripts' global scope -; with user data. This makes most sense when coupled with track_vars - in which -; case you can access all of the GPC variables through the $HTTP_*_VARS[], -; variables. +; with user data. ; You should do your best to write your scripts so that they do not require ; register_globals to be on; Using form variables as globals can easily lead ; to possible security problems, if the code is not very well thought of. @@ -944,7 +940,7 @@ ; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5) ; extension folders as well as the separate PECL DLL download (PHP 5). ; Be sure to appropriately set the extension_dir directive. -; +; ;extension=php_bz2.dll ;extension=php_curl.dll ;extension=php_dba.dll @@ -1021,7 +1017,7 @@ ;iconv.output_encoding = ISO-8859-1 [intl] -;intl.default_locale = +;intl.default_locale = [sqlite] ; http://php.net/sqlite.assoc-case @@ -1035,9 +1031,9 @@ ; http://php.net/pcre.backtrack-limit ;pcre.backtrack_limit=10 -;PCRE library recursion limit. -;Please note that if you set this value to a high number you may consume all -;the available process stack and eventually crash PHP (due to reaching the +;PCRE library recursion limit. +;Please note that if you set this value to a high number you may consume all +;the available process stack and eventually crash PHP (due to reaching the ;stack size limit imposed by the Operating System). ; http://php.net/pcre.recursion-limit ;pcre.recursion_limit=10 @@ -1115,7 +,7 @@ ; http://php.net/odbc.default-pw ;odbc.default_pw= Not yet implemented -; Controls the ODBC cursor model. +; Controls the ODBC cursor model. ; Default: SQL_CURSOR_STATIC (default). ;odbc.default_cursortype @@ -1509,7 +1505,7 @@ ; Whether or not to add the httpOnly flag to the cookie, which makes it inaccessible to browser scripting languages such as JavaScript. ; http://php.net/session.cookie-httponly -session.cookie_httponly =
[PHP-CVS] cvs: php-src(PHP_5_3) / php.ini-development php.ini-production
johannesSun Jun 28 15:21:19 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcphp.ini-development php.ini-production Log: MFH: Add missing MySQL entries http://cvs.php.net/viewvc.cgi/php-src/php.ini-development?r1=1.1.2.10r2=1.1.2.11diff_format=u Index: php-src/php.ini-development diff -u php-src/php.ini-development:1.1.2.10 php-src/php.ini-development:1.1.2.11 --- php-src/php.ini-development:1.1.2.10Sat Jun 27 13:29:53 2009 +++ php-src/php.ini-development Sun Jun 28 15:21:19 2009 @@ -8,7 +8,7 @@ ; PHP attempts to find and load this configuration from a number of locations. ; The following is a summary of its search order: -; 1. SAPI module specific location. +; 1. SAPI module specific locamystion. ; 2. The PHPRC environment variable. (As of PHP 5.2.0) ; 3. A number of predefined registry keys on Windows (As of PHP 5.2.0) ; 4. Current working directory (except CLI) @@ -1047,6 +1047,16 @@ ; http://php.net/pdo-odbc.connection-pooling ;pdo_odbc.connection_pooling=strict +[Pdo_mysql] +; If mysqlnd is used: Number of cache slots for the internal result set cache +; http://php.net/pdo_mysql.cache_size +pdo_mysql.cache_size = 2000 + +; Default socket name for local MySQL connects. If empty, uses the built-in +; MySQL defaults. +; http://php.net/pdo_mysql.default-socket +pdo_mysql.default_socket= + [Phar] ; http://php.net/phar.readonly ;phar.readonly = On @@ -1133,10 +1143,18 @@ ;birdstep.max_links = -1 [MySQL] +; Allow accessing, from PHP's perspective, local files with LOAD DATA statements +; http://php.net/mysql.allow_local_infile +mysql.allow_local_infile = On + ; Allow or prevent persistent links. ; http://php.net/mysql.allow-persistent mysql.allow_persistent = On +; If mysqlnd is used: Number of cache slots for the internal result set cache +; http://php.net/mysql.cache_size +mysql.cache_size = 2000 + ; Maximum number of persistent links. -1 means no limit. ; http://php.net/mysql.max-persistent mysql.max_persistent = -1 @@ -1184,10 +1202,18 @@ [MySQLi] +; Maximum number of persistent links. -1 means no limit. +; http://php.net/mysqli.max-persistent +mysqli.max_persistent = -1 + ; Maximum number of links. -1 means no limit. ; http://php.net/mysqli.max-links mysqli.max_links = -1 +; If mysqlnd is used: Number of cache slots for the internal result set cache +; http://php.net/mysqli.cache_size +mysqli.cache_size = 2000 + ; Default port number for mysqli_connect(). If unset, mysqli_connect() will use ; the $MYSQL_TCP_PORT or the mysql-tcp entry in /etc/services or the ; compile-time value defined MYSQL_PORT (in that order). Win32 will only look @@ -1219,6 +1245,26 @@ ; Allow or prevent reconnect mysqli.reconnect = Off +[mysqlnd] +; Enable / Disable collection of general statstics 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 +; used to tune and monitor MySQL operations. +; http://php.net/mysqlnd.collect_memory_statistics +mysqlnd.collect_memory_statistics = On + +; Size of a pre-allocated buffer used when sending commands to MySQL in bytes. +; http://php.net/mysqlnd.net_cmd_buffer_size +;mysqlnd.net_cmd_buffer_size = 2048 + +; Size of a pre-allocated buffer used for reading data sent by the server in +; bytes. +; http://php.net/mysqlnd.net_read_buffer_size +;mysqlnd.net_read_buffer_size = 32768 + [OCI8] ; Connection: Enables privileged connections using external @@ -1772,24 +1818,9 @@ ;ibase.timestampformat= ;ibase.dateformat= ;ibase.timeformat= -;mysqli.max_persistent= -;mysqli.allow_persistent= -;mysqli.allow_local_infile= -;mysqli.cache_size= ;mbstring.script_encoding= ;mbstring.http_output_conv_mimetypes= -;pdo_mysql.default_socket= -;pdo_mysql.debug= -;pdo_mysql.cache_size= ;com.code_page= -;mysql.allow_local_infile= -;mysql.cache_size= -;mysqlnd.collect_statistics= -;mysqlnd.collect_memory_statistics= -;mysqlnd.debug= -;mysqlnd.net_cmd_buffer_size= -;mysqlnd.net_read_buffer_size= -;mysqlnd.log_mask= ;odbc.default_cursortype= ;session.encode_sources= ;ldap.max_links= http://cvs.php.net/viewvc.cgi/php-src/php.ini-production?r1=1.1.2.10r2=1.1.2.11diff_format=u Index: php-src/php.ini-production diff -u php-src/php.ini-production:1.1.2.10 php-src/php.ini-production:1.1.2.11 --- php-src/php.ini-production:1.1.2.10 Sat Jun 27 13:29:53 2009 +++ php-src/php.ini-production Sun Jun 28 15:21:19 2009 @@ -1047,6 +1047,16 @@ ; http://php.net/pdo-odbc.connection-pooling ;pdo_odbc.connection_pooling=strict +[Pdo_mysql] +; If mysqlnd is used: Number of cache slots for the internal result set cache +; http://php.net/pdo_mysql.cache_size +pdo_mysql.cache_size = 2000 + +; Default socket name for local MySQL connects. If empty, uses the built-in +; MySQL defaults. +; http://php.net/pdo_mysql.default-socket
[PHP-CVS] cvs: php-src(PHP_5_3) / php.ini-development
johannesSun Jun 28 15:29:24 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcphp.ini-development Log: MFH: fix typo http://cvs.php.net/viewvc.cgi/php-src/php.ini-development?r1=1.1.2.11r2=1.1.2.12diff_format=u Index: php-src/php.ini-development diff -u php-src/php.ini-development:1.1.2.11 php-src/php.ini-development:1.1.2.12 --- php-src/php.ini-development:1.1.2.11Sun Jun 28 15:21:19 2009 +++ php-src/php.ini-development Sun Jun 28 15:29:24 2009 @@ -8,7 +8,7 @@ ; PHP attempts to find and load this configuration from a number of locations. ; The following is a summary of its search order: -; 1. SAPI module specific locamystion. +; 1. SAPI module specific location. ; 2. The PHPRC environment variable. (As of PHP 5.2.0) ; 3. A number of predefined registry keys on Windows (As of PHP 5.2.0) ; 4. Current working directory (except CLI) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / php.ini-development php.ini-production
johannesSun Jun 28 15:56:20 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcphp.ini-development php.ini-production Log: MFH: Add two ini settings and remove ini setting which is commented out in code http://cvs.php.net/viewvc.cgi/php-src/php.ini-development?r1=1.1.2.12r2=1.1.2.13diff_format=u Index: php-src/php.ini-development diff -u php-src/php.ini-development:1.1.2.12 php-src/php.ini-development:1.1.2.13 --- php-src/php.ini-development:1.1.2.12Sun Jun 28 15:29:24 2009 +++ php-src/php.ini-development Sun Jun 28 15:56:19 2009 @@ -1799,11 +1799,18 @@ ; http://php.net/soap.wsdl-cache-ttl soap.wsdl_cache_ttl=86400 +; Sets the size of the cache limit. (Max. number of WSDL files to cache) +soap.wsdl_cache_limit = 5 + [sysvshm] ; A default size of the shared memory segment ;sysvshm.init_mem = 1 -;soap.wsdl_cache_limit= +[ldap] +; Sets the maximum number of open links or -1 for unlimited. +ldap.max_links = -1 + + ;dba.default_handler= ;pdo_odbc.db2_instance_name= ;mcrypt.algorithms_dir= @@ -1822,8 +1829,6 @@ ;mbstring.http_output_conv_mimetypes= ;com.code_page= ;odbc.default_cursortype= -;session.encode_sources= -;ldap.max_links= ;sybct.login_timeout= ;sybct.hostname= ;sybct.deadlock_retry_count= http://cvs.php.net/viewvc.cgi/php-src/php.ini-production?r1=1.1.2.11r2=1.1.2.12diff_format=u Index: php-src/php.ini-production diff -u php-src/php.ini-production:1.1.2.11 php-src/php.ini-production:1.1.2.12 --- php-src/php.ini-production:1.1.2.11 Sun Jun 28 15:21:19 2009 +++ php-src/php.ini-production Sun Jun 28 15:56:19 2009 @@ -1807,11 +1807,18 @@ ; http://php.net/soap.wsdl-cache-ttl soap.wsdl_cache_ttl=86400 +; Sets the size of the cache limit. (Max. number of WSDL files to cache) +soap.wsdl_cache_limit = 5 + [sysvshm] ; A default size of the shared memory segment ;sysvshm.init_mem = 1 -;soap.wsdl_cache_limit= +[ldap] +; Sets the maximum number of open links or -1 for unlimited. +ldap.max_links = -1 + + ;dba.default_handler= ;pdo_odbc.db2_instance_name= ;mcrypt.algorithms_dir= @@ -1830,8 +1837,6 @@ ;mbstring.http_output_conv_mimetypes= ;com.code_page= ;odbc.default_cursortype= -;session.encode_sources= -;ldap.max_links= ;sybct.login_timeout= ;sybct.hostname= ;sybct.deadlock_retry_count= -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / php.ini-development php.ini-production
johannesSun Jun 28 16:41:17 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcphp.ini-development php.ini-production Log: MFH: Add ibase settings http://cvs.php.net/viewvc.cgi/php-src/php.ini-development?r1=1.1.2.13r2=1.1.2.14diff_format=u Index: php-src/php.ini-development diff -u php-src/php.ini-development:1.1.2.13 php-src/php.ini-development:1.1.2.14 --- php-src/php.ini-development:1.1.2.13Sun Jun 28 15:56:19 2009 +++ php-src/php.ini-development Sun Jun 28 16:41:17 2009 @@ -1142,6 +1142,37 @@ ;birdstep.max_links = -1 +[Interbase] +; Allow or prevent persistent links. +ibase.allow_persistent = 1 + +; Maximum number of persistent links. -1 means no limit. +ibase.max_persistent = -1 + +; Maximum number of links (persistent + non-persistent). -1 means no limit. +ibase.max_links = -1 + +; Default database name for ibase_connect(). +;ibase.default_db = + +; Default username for ibase_connect(). +;ibase.default_user = + +; Default password for ibase_connect(). +;ibase.default_password = + +; Default charset for ibase_connect(). +;ibase.default_charset = + +; Default timestamp format. +ibase.timestampformat = %Y-%m-%d %H:%M:%S + +; Default date format. +ibase.dateformat = %Y-%m-%d + +; Default time format. +ibase.timeformat = %H:%M:%S + [MySQL] ; Allow accessing, from PHP's perspective, local files with LOAD DATA statements ; http://php.net/mysql.allow_local_infile @@ -1815,16 +1846,6 @@ ;pdo_odbc.db2_instance_name= ;mcrypt.algorithms_dir= ;mcrypt.modes_dir= -;ibase.allow_persistent= -;ibase.max_persistent= -;ibase.max_links= -;ibase.default_db= -;ibase.default_user= -;ibase.default_password= -;ibase.default_charset= -;ibase.timestampformat= -;ibase.dateformat= -;ibase.timeformat= ;mbstring.script_encoding= ;mbstring.http_output_conv_mimetypes= ;com.code_page= http://cvs.php.net/viewvc.cgi/php-src/php.ini-production?r1=1.1.2.12r2=1.1.2.13diff_format=u Index: php-src/php.ini-production diff -u php-src/php.ini-production:1.1.2.12 php-src/php.ini-production:1.1.2.13 --- php-src/php.ini-production:1.1.2.12 Sun Jun 28 15:56:19 2009 +++ php-src/php.ini-production Sun Jun 28 16:41:17 2009 @@ -1142,6 +1142,37 @@ ;birdstep.max_links = -1 +[Interbase] +; Allow or prevent persistent links. +ibase.allow_persistent = 1 + +; Maximum number of persistent links. -1 means no limit. +ibase.max_persistent = -1 + +; Maximum number of links (persistent + non-persistent). -1 means no limit. +ibase.max_links = -1 + +; Default database name for ibase_connect(). +;ibase.default_db = + +; Default username for ibase_connect(). +;ibase.default_user = + +; Default password for ibase_connect(). +;ibase.default_password = + +; Default charset for ibase_connect(). +;ibase.default_charset = + +; Default timestamp format. +ibase.timestampformat = %Y-%m-%d %H:%M:%S + +; Default date format. +ibase.dateformat = %Y-%m-%d + +; Default time format. +ibase.timeformat = %H:%M:%S + [MySQL] ; Allow accessing, from PHP's perspective, local files with LOAD DATA statements ; http://php.net/mysql.allow_local_infile @@ -1823,16 +1854,6 @@ ;pdo_odbc.db2_instance_name= ;mcrypt.algorithms_dir= ;mcrypt.modes_dir= -;ibase.allow_persistent= -;ibase.max_persistent= -;ibase.max_links= -;ibase.default_db= -;ibase.default_user= -;ibase.default_password= -;ibase.default_charset= -;ibase.timestampformat= -;ibase.dateformat= -;ibase.timeformat= ;mbstring.script_encoding= ;mbstring.http_output_conv_mimetypes= ;com.code_page= -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / php.ini-development php.ini-production
johannesSun Jun 28 17:56:18 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcphp.ini-development php.ini-production Log: MFH Add missing ini entries (Mikko) http://cvs.php.net/viewvc.cgi/php-src/php.ini-development?r1=1.1.2.14r2=1.1.2.15diff_format=u Index: php-src/php.ini-development diff -u php-src/php.ini-development:1.1.2.14 php-src/php.ini-development:1.1.2.15 --- php-src/php.ini-development:1.1.2.14Sun Jun 28 16:41:17 2009 +++ php-src/php.ini-development Sun Jun 28 17:56:18 2009 @@ -1047,6 +1047,8 @@ ; http://php.net/pdo-odbc.connection-pooling ;pdo_odbc.connection_pooling=strict +;pdo_odbc.db2_instance_name + [Pdo_mysql] ; If mysqlnd is used: Number of cache slots for the internal result set cache ; http://php.net/pdo_mysql.cache_size @@ -1113,6 +1115,10 @@ ; http://php.net/odbc.default-pw ;odbc.default_pw= Not yet implemented +; Controls the ODBC cursor model. +; Default: SQL_CURSOR_STATIC (default). +;odbc.default_cursortype + ; Allow or prevent persistent links. ; http://php.net/odbc.allow-persistent odbc.allow_persistent = On @@ -1404,6 +1410,18 @@ ;sybct.packet_size +; The maximum time in seconds to wait for a connection attempt to succeed before returning failure. +; Default: one minute +;sybct.login_timeout= + +; The name of the host you claim to be connecting from, for display by sp_who. +; Default: none +;sybct.hostname= + +; Allows you to define how often deadlocks are to be retried. -1 means forever. +; Default: 0 +;sybct.deadlock_retry_count= + [bcmath] ; Number of decimal digits for all bcmath functions. ; http://php.net/bcmath.scale @@ -1717,6 +1735,10 @@ ; http://php.net/com.autoregister-verbose ;com.autoregister_verbose = true +; The default character set code-page to use when passing strings to and from COM objects. +; Default: system ANSI code page +;com.code_page= + [mbstring] ; language for internal character representation. ; http://php.net/mbstring.language @@ -1774,6 +1796,10 @@ ; 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 @@ -1841,18 +1867,19 @@ ; Sets the maximum number of open links or -1 for unlimited. ldap.max_links = -1 +[mcrypt] +; For more information about mcrypt settings see http://php.net/mcrypt-module-open -;dba.default_handler= -;pdo_odbc.db2_instance_name= +; Directory where to load mcrypt algorithms +; Default: Compiled in into libmcrypt (usually /usr/local/lib/libmcrypt) ;mcrypt.algorithms_dir= + +; Directory where to load mcrypt modes +; Default: Compiled in into libmcrypt (usually /usr/local/lib/libmcrypt) ;mcrypt.modes_dir= -;mbstring.script_encoding= -;mbstring.http_output_conv_mimetypes= -;com.code_page= -;odbc.default_cursortype= -;sybct.login_timeout= -;sybct.hostname= -;sybct.deadlock_retry_count= + +[dba] +;dba.default_handler= ; Local Variables: ; tab-width: 4 http://cvs.php.net/viewvc.cgi/php-src/php.ini-production?r1=1.1.2.13r2=1.1.2.14diff_format=u Index: php-src/php.ini-production diff -u php-src/php.ini-production:1.1.2.13 php-src/php.ini-production:1.1.2.14 --- php-src/php.ini-production:1.1.2.13 Sun Jun 28 16:41:17 2009 +++ php-src/php.ini-production Sun Jun 28 17:56:18 2009 @@ -1047,6 +1047,8 @@ ; http://php.net/pdo-odbc.connection-pooling ;pdo_odbc.connection_pooling=strict +;pdo_odbc.db2_instance_name + [Pdo_mysql] ; If mysqlnd is used: Number of cache slots for the internal result set cache ; http://php.net/pdo_mysql.cache_size @@ -1113,6 +1115,10 @@ ; http://php.net/odbc.default-pw ;odbc.default_pw= Not yet implemented +; Controls the ODBC cursor model. +; Default: SQL_CURSOR_STATIC (default). +;odbc.default_cursortype + ; Allow or prevent persistent links. ; http://php.net/odbc.allow-persistent odbc.allow_persistent = On @@ -1412,6 +1418,18 @@ ;sybct.packet_size +; The maximum time in seconds to wait for a connection attempt to succeed before returning failure. +; Default: one minute +;sybct.login_timeout= + +; The name of the host you claim to be connecting from, for display by sp_who. +; Default: none +;sybct.hostname= + +; Allows you to define how often deadlocks are to be retried. -1 means forever. +; Default: 0 +;sybct.deadlock_retry_count= + [bcmath] ; Number of decimal digits for all bcmath functions. ; http://php.net/bcmath.scale @@ -1725,6 +1743,10 @@ ; http://php.net/com.autoregister-verbose ;com.autoregister_verbose = true +; The default character set code-page to use when passing strings to and from COM objects. +; Default: system ANSI code page +;com.code_page= + [mbstring] ; language for internal character representation. ;
[PHP-CVS] cvs: php-src(PHP_5_3) / php.ini-development php.ini-production
bjori Sat Jun 27 13:29:53 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcphp.ini-development php.ini-production Log: - Remove outdated version information - Remove no-longer-existing windows dll (there could be more..) - List missing INI directives (need to add descriptions to them and sort them correctly..) http://cvs.php.net/viewvc.cgi/php-src/php.ini-development?r1=1.1.2.9r2=1.1.2.10diff_format=u Index: php-src/php.ini-development diff -u php-src/php.ini-development:1.1.2.9 php-src/php.ini-development:1.1.2.10 --- php-src/php.ini-development:1.1.2.9 Mon May 4 15:20:38 2009 +++ php-src/php.ini-development Sat Jun 27 13:29:53 2009 @@ -641,7 +641,7 @@ ; Data Handling ; ; -; Note - track_vars is ALWAYS enabled as of PHP 4.0.3 +; Note - track_vars is ALWAYS enabled ; The separator used in PHP generated URLs to separate arguments. ; PHP's default setting is . @@ -763,7 +763,7 @@ ; http://php.net/auto-append-file auto_append_file = -; As of 4.0b4, PHP always outputs a character encoding by default in +; By default, PHP will output a character encoding using ; the Content-type: header. To disable sending of the charset, simply ; set it to be empty. ; @@ -958,7 +958,6 @@ ;extension=php_interbase.dll ;extension=php_ldap.dll ;extension=php_mbstring.dll -;extension=php_mime_magic.dll ;extension=php_ming.dll ;extension=php_mssql.dll ;extension=php_mysql.dll @@ -1346,7 +1345,7 @@ ; 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: +; The path can be defined as: ; ; session.save_path = N;/path ; @@ -1758,6 +1757,45 @@ ; A default size of the shared memory segment ;sysvshm.init_mem = 1 +;soap.wsdl_cache_limit= +;dba.default_handler= +;pdo_odbc.db2_instance_name= +;mcrypt.algorithms_dir= +;mcrypt.modes_dir= +;ibase.allow_persistent= +;ibase.max_persistent= +;ibase.max_links= +;ibase.default_db= +;ibase.default_user= +;ibase.default_password= +;ibase.default_charset= +;ibase.timestampformat= +;ibase.dateformat= +;ibase.timeformat= +;mysqli.max_persistent= +;mysqli.allow_persistent= +;mysqli.allow_local_infile= +;mysqli.cache_size= +;mbstring.script_encoding= +;mbstring.http_output_conv_mimetypes= +;pdo_mysql.default_socket= +;pdo_mysql.debug= +;pdo_mysql.cache_size= +;com.code_page= +;mysql.allow_local_infile= +;mysql.cache_size= +;mysqlnd.collect_statistics= +;mysqlnd.collect_memory_statistics= +;mysqlnd.debug= +;mysqlnd.net_cmd_buffer_size= +;mysqlnd.net_read_buffer_size= +;mysqlnd.log_mask= +;odbc.default_cursortype= +;session.encode_sources= +;ldap.max_links= +;sybct.login_timeout= +;sybct.hostname= +;sybct.deadlock_retry_count= ; Local Variables: ; tab-width: 4 http://cvs.php.net/viewvc.cgi/php-src/php.ini-production?r1=1.1.2.9r2=1.1.2.10diff_format=u Index: php-src/php.ini-production diff -u php-src/php.ini-production:1.1.2.9 php-src/php.ini-production:1.1.2.10 --- php-src/php.ini-production:1.1.2.9 Mon May 4 15:20:38 2009 +++ php-src/php.ini-production Sat Jun 27 13:29:53 2009 @@ -641,7 +641,7 @@ ; Data Handling ; ; -; Note - track_vars is ALWAYS enabled as of PHP 4.0.3 +; Note - track_vars is ALWAYS enabled ; The separator used in PHP generated URLs to separate arguments. ; PHP's default setting is . @@ -763,7 +763,7 @@ ; http://php.net/auto-append-file auto_append_file = -; As of 4.0b4, PHP always outputs a character encoding by default in +; By default, PHP will output a character encoding using ; the Content-type: header. To disable sending of the charset, simply ; set it to be empty. ; @@ -958,7 +958,6 @@ ;extension=php_interbase.dll ;extension=php_ldap.dll ;extension=php_mbstring.dll -;extension=php_mime_magic.dll ;extension=php_ming.dll ;extension=php_mssql.dll ;extension=php_mysql.dll @@ -1346,7 +1345,7 @@ ; 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: +; The path can be defined as: ; ; session.save_path = N;/path ; @@ -1758,6 +1757,45 @@ ; A default size of the shared memory segment ;sysvshm.init_mem = 1 +;soap.wsdl_cache_limit= +;dba.default_handler= +;pdo_odbc.db2_instance_name= +;mcrypt.algorithms_dir= +;mcrypt.modes_dir= +;ibase.allow_persistent= +;ibase.max_persistent= +;ibase.max_links= +;ibase.default_db= +;ibase.default_user= +;ibase.default_password= +;ibase.default_charset= +;ibase.timestampformat= +;ibase.dateformat= +;ibase.timeformat= +;mysqli.max_persistent= +;mysqli.allow_persistent= +;mysqli.allow_local_infile= +;mysqli.cache_size= +;mbstring.script_encoding= +;mbstring.http_output_conv_mimetypes= +;pdo_mysql.default_socket= +;pdo_mysql.debug= +;pdo_mysql.cache_size= +;com.code_page= +;mysql.allow_local_infile= +;mysql.cache_size= +;mysqlnd.collect_statistics=
[PHP-CVS] cvs: php-src(PHP_5_3) / php.ini-development php.ini-production
pajoye Mon May 4 15:20:38 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcphp.ini-development php.ini-production Log: - win extension_dir http://cvs.php.net/viewvc.cgi/php-src/php.ini-development?r1=1.1.2.8r2=1.1.2.9diff_format=u Index: php-src/php.ini-development diff -u php-src/php.ini-development:1.1.2.8 php-src/php.ini-development:1.1.2.9 --- php-src/php.ini-development:1.1.2.8 Fri Apr 10 01:18:49 2009 +++ php-src/php.ini-development Mon May 4 15:20:38 2009 @@ -809,6 +809,8 @@ ; Directory in which the loadable extensions (modules) reside. ; http://php.net/extension-dir ; extension_dir = ./ +; On windows: +; extension_dir = ext ; Whether or not to enable the dl() function. The dl() function does NOT work ; properly in multithreaded servers, such as IIS or Zeus, and is automatically http://cvs.php.net/viewvc.cgi/php-src/php.ini-production?r1=1.1.2.8r2=1.1.2.9diff_format=u Index: php-src/php.ini-production diff -u php-src/php.ini-production:1.1.2.8 php-src/php.ini-production:1.1.2.9 --- php-src/php.ini-production:1.1.2.8 Fri Apr 10 01:18:49 2009 +++ php-src/php.ini-production Mon May 4 15:20:38 2009 @@ -809,6 +809,8 @@ ; Directory in which the loadable extensions (modules) reside. ; http://php.net/extension-dir ; extension_dir = ./ +; On windows: +; extension_dir = ext ; Whether or not to enable the dl() function. The dl() function does NOT work ; properly in multithreaded servers, such as IIS or Zeus, and is automatically -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / php.ini-development php.ini-production
bjori Mon Apr 6 08:37:33 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcphp.ini-development php.ini-production Log: MFH: Mention which directives are hardcoded using the CLI SAPI http://cvs.php.net/viewvc.cgi/php-src/php.ini-development?r1=1.1.2.5r2=1.1.2.6diff_format=u Index: php-src/php.ini-development diff -u php-src/php.ini-development:1.1.2.5 php-src/php.ini-development:1.1.2.6 --- php-src/php.ini-development:1.1.2.5 Thu Mar 26 18:45:37 2009 +++ php-src/php.ini-development Mon Apr 6 08:37:33 2009 @@ -254,6 +254,7 @@ ; On = Enabled and buffer is unlimited. (Use with caution) ; Off = Disabled ; Integer = Enables the buffer and sets its maximum size in bytes. +; Note: This directive is hardcoded to Off for the CLI SAPI ; Default Value: Off ; Development Value: 4096 ; Production Value: 4096 @@ -302,6 +303,7 @@ ; and every HTML block. Turning this option on has serious performance ; implications and is generally recommended for debugging purposes only. ; http://www.php.net/manual/en/outcontrol.configuration.php#ini.implicit-flush +; Note: This directive is hardcoded to On for the CLI SAPI implicit_flush = Off ; The unserialize callback function will be called (with the undefined class' @@ -434,11 +436,13 @@ ; Maximum execution time of each script, in seconds ; http://www.php.net/manual/en/info.configuration.php#ini.max-execution-time +; Note: This directive is hardcoded to 0 for the CLI SAPI max_execution_time = 30 ; Maximum amount of time each script may spend parsing request data. It's a good ; idea to limit this time on productions servers in order to eliminate unexpectedly ; long running scripts. +; Note: This directive is hardcoded to -1 for the CLI SAPI ; Default Value: -1 (Unlimited) ; Development Value: 60 (60 seconds) ; Production Value: 60 (60 seconds) @@ -592,6 +596,7 @@ ; links to documentation related to that error. This directive controls whether ; those HTML links appear in error messages or not. For performance and security ; reasons, it's recommended you disable this on production servers. +; Note: This directive is hardcoded to Off for the CLI SAPI ; Default Value: On ; Development Value: On ; Production value: Off @@ -707,6 +712,7 @@ ; enabled, registering these variables consumes CPU cycles and memory each time ; a script is executed. For performance reasons, this feature should be disabled ; on production servers. +; Note: This directive is hardcoded to On for the CLI SAPI ; Default Value: On ; Development Value: Off ; Production Value: Off http://cvs.php.net/viewvc.cgi/php-src/php.ini-production?r1=1.1.2.5r2=1.1.2.6diff_format=u Index: php-src/php.ini-production diff -u php-src/php.ini-production:1.1.2.5 php-src/php.ini-production:1.1.2.6 --- php-src/php.ini-production:1.1.2.5 Thu Mar 26 18:45:37 2009 +++ php-src/php.ini-production Mon Apr 6 08:37:33 2009 @@ -254,6 +254,7 @@ ; On = Enabled and buffer is unlimited. (Use with caution) ; Off = Disabled ; Integer = Enables the buffer and sets its maximum size in bytes. +; Note: This directive is hardcoded to Off for the CLI SAPI ; Default Value: Off ; Development Value: 4096 ; Production Value: 4096 @@ -302,6 +303,7 @@ ; and every HTML block. Turning this option on has serious performance ; implications and is generally recommended for debugging purposes only. ; http://www.php.net/manual/en/outcontrol.configuration.php#ini.implicit-flush +; Note: This directive is hardcoded to On for the CLI SAPI implicit_flush = Off ; The unserialize callback function will be called (with the undefined class' @@ -434,11 +436,13 @@ ; Maximum execution time of each script, in seconds ; http://www.php.net/manual/en/info.configuration.php#ini.max-execution-time +; Note: This directive is hardcoded to 0 for the CLI SAPI max_execution_time = 30 ; Maximum amount of time each script may spend parsing request data. It's a good ; idea to limit this time on productions servers in order to eliminate unexpectedly ; long running scripts. +; Note: This directive is hardcoded to -1 for the CLI SAPI ; Default Value: -1 (Unlimited) ; Development Value: 60 (60 seconds) ; Production Value: 60 (60 seconds) @@ -592,6 +596,7 @@ ; links to documentation related to that error. This directive controls whether ; those HTML links appear in error messages or not. For performance and security ; reasons, it's recommended you disable this on production servers. +; Note: This directive is hardcoded to Off for the CLI SAPI ; Default Value: On ; Development Value: On ; Production value: Off @@ -707,6 +712,7 @@ ; enabled, registering these variables consumes CPU cycles and memory each time ; a script is executed. For performance reasons, this feature should be disabled ; on production servers. +; Note: This directive is hardcoded to On for the CLI SAPI ; Default Value: On ; Development Value: Off ; Production Value: Off --
[PHP-CVS] cvs: php-src(PHP_5_3) / php.ini-development php.ini-production
pajoye Thu Mar 26 18:45:37 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcphp.ini-development php.ini-production Log: - update extension= http://cvs.php.net/viewvc.cgi/php-src/php.ini-development?r1=1.1.2.4r2=1.1.2.5diff_format=u Index: php-src/php.ini-development diff -u php-src/php.ini-development:1.1.2.4 php-src/php.ini-development:1.1.2.5 --- php-src/php.ini-development:1.1.2.4 Thu Mar 26 01:38:53 2009 +++ php-src/php.ini-development Thu Mar 26 18:45:37 2009 @@ -940,31 +940,24 @@ ;extension=php_bz2.dll ;extension=php_curl.dll ;extension=php_dba.dll -;extension=php_dbase.dll ;extension=php_exif.dll ;extension=php_fileinfo.dll -;extension=php_fdf.dll ;extension=php_gd2.dll ;extension=php_gettext.dll ;extension=php_gmp.dll -;extension=php_ifx.dll ;extension=php_intl.dll ;extension=php_imap.dll ;extension=php_interbase.dll ;extension=php_ldap.dll ;extension=php_mbstring.dll -;extension=php_mcrypt.dll -;extension=php_mhash.dll ;extension=php_mime_magic.dll ;extension=php_ming.dll -;extension=php_msql.dll ;extension=php_mssql.dll ;extension=php_mysql.dll ;extension=php_mysqli.dll ;extension=php_oci8.dll ; Use with Oracle 10gR2 Instant Client ;extension=php_oci8_11g.dll ; Use with Oracle 11g Instant Client ;extension=php_openssl.dll -;extension=php_pdo.dll ;extension=php_pdo_firebird.dll ;extension=php_pdo_mssql.dll ;extension=php_pdo_mysql.dll http://cvs.php.net/viewvc.cgi/php-src/php.ini-production?r1=1.1.2.4r2=1.1.2.5diff_format=u Index: php-src/php.ini-production diff -u php-src/php.ini-production:1.1.2.4 php-src/php.ini-production:1.1.2.5 --- php-src/php.ini-production:1.1.2.4 Thu Mar 26 01:38:53 2009 +++ php-src/php.ini-production Thu Mar 26 18:45:37 2009 @@ -940,31 +940,24 @@ ;extension=php_bz2.dll ;extension=php_curl.dll ;extension=php_dba.dll -;extension=php_dbase.dll ;extension=php_exif.dll ;extension=php_fileinfo.dll -;extension=php_fdf.dll ;extension=php_gd2.dll ;extension=php_gettext.dll ;extension=php_gmp.dll -;extension=php_ifx.dll ;extension=php_intl.dll ;extension=php_imap.dll ;extension=php_interbase.dll ;extension=php_ldap.dll ;extension=php_mbstring.dll -;extension=php_mcrypt.dll -;extension=php_mhash.dll ;extension=php_mime_magic.dll ;extension=php_ming.dll -;extension=php_msql.dll ;extension=php_mssql.dll ;extension=php_mysql.dll ;extension=php_mysqli.dll ;extension=php_oci8.dll ; Use with Oracle 10gR2 Instant Client ;extension=php_oci8_11g.dll ; Use with Oracle 11g Instant Client ;extension=php_openssl.dll -;extension=php_pdo.dll ;extension=php_pdo_firebird.dll ;extension=php_pdo_mssql.dll ;extension=php_pdo_mysql.dll -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / php.ini-development php.ini-production
ericstewart Thu Mar 26 01:38:53 2009 UTC Modified files: (Branch: PHP_5_3) /php-srcphp.ini-development php.ini-production Log: Corrected missing comment. http://cvs.php.net/viewvc.cgi/php-src/php.ini-development?r1=1.1.2.3r2=1.1.2.4diff_format=u Index: php-src/php.ini-development diff -u php-src/php.ini-development:1.1.2.3 php-src/php.ini-development:1.1.2.4 --- php-src/php.ini-development:1.1.2.3 Mon Mar 23 02:36:34 2009 +++ php-src/php.ini-development Thu Mar 26 01:38:53 2009 @@ -578,7 +578,7 @@ ; Default Value: Off ; Development Value: On ; Production Value: Off -http://www.php.net/manual/en/errorfunc.configuration.php#ini.track-errors +; http://www.php.net/manual/en/errorfunc.configuration.php#ini.track-errors track_errors = On ; Turn off normal error reporting and emit XML-RPC error XML http://cvs.php.net/viewvc.cgi/php-src/php.ini-production?r1=1.1.2.3r2=1.1.2.4diff_format=u Index: php-src/php.ini-production diff -u php-src/php.ini-production:1.1.2.3 php-src/php.ini-production:1.1.2.4 --- php-src/php.ini-production:1.1.2.3 Mon Mar 23 02:36:34 2009 +++ php-src/php.ini-production Thu Mar 26 01:38:53 2009 @@ -578,7 +578,7 @@ ; Default Value: Off ; Development Value: On ; Production Value: Off -http://www.php.net/manual/en/errorfunc.configuration.php#ini.track-errors +; http://www.php.net/manual/en/errorfunc.configuration.php#ini.track-errors track_errors = Off ; Turn off normal error reporting and emit XML-RPC error XML -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src(PHP_5_3) / php.ini-development php.ini-production
ericstewart Mon Mar 23 02:36:35 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-srcphp.ini-development php.ini-production
Log:
1. Involves an mbstring setting correction regarding:
http://marc.info/?l=php-cvsm=123596904426621w=2
2. Added mbstring.http_output_conv_mimetype directive.
3. Adds an additional comment including XOR in the list of usable bitwise
operators.
4. Note regarding the merge of E_STRICT into E_ALL in PHP 6.0.0.
5. Notes regarding [PATH] and [HOST] use in CGI/FastCGI.
http://cvs.php.net/viewvc.cgi/php-src/php.ini-development?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/php.ini-development
diff -u php-src/php.ini-development:1.1.2.2 php-src/php.ini-development:1.1.2.3
--- php-src/php.ini-development:1.1.2.2 Tue Mar 17 19:19:17 2009
+++ php-src/php.ini-development Mon Mar 23 02:36:34 2009
@@ -22,20 +22,32 @@
; The syntax of the file is extremely simple. Whitespace and Lines
; beginning with a semicolon are silently ignored (as you probably guessed).
; Section headers (e.g. [Foo]) are also silently ignored, even though
-; they might mean something in the future. The exceptions to this rule are
-; section headers starting with [HOST= or [PATH=
+; they might mean something in the future.
+
+; Directives following the section heading [PATH=/www/mysite] only
+; apply to PHP files in the /www/mysite directory. Directives
+; following the section heading [HOST=www.example.com] only apply to
+; PHP files served from www.example.com. Directives set in these
+; special sections cannot be overridden by user-defined INI files or
+; at runtime. Currently, [PATH=] and [HOST=] sections only work under
+; CGI/FastCGI.
; http://www.php.net/manual/en/ini.sections.php
; Directives are specified using the following syntax:
; directive = value
; Directive names are *case sensitive* - foo=bar is different from FOO=bar.
+; Directives are variables used to configure PHP or PHP extensions.
+; There is no name validation. If PHP can't find an expected
+; directive because it is not set or is mistyped, a default value will be used.
; The value can be a string, a number, a PHP constant (e.g. E_ALL or M_PI), one
; of the INI constants (On, Off, True, False, Yes, No and None) or an
expression
-; (e.g. E_ALL ~E_NOTICE), or a quoted string (foo).
+; (e.g. E_ALL ~E_NOTICE), a quoted string (bar), or a reference to a
+; previously set variable or directive (e.g. ${foo})
; Expressions in the INI file are limited to bitwise operators and parentheses:
; | bitwise OR
+; ^ bitwise XOR
; bitwise AND
; ~ bitwise NOT
; ! boolean NOT
@@ -461,7 +473,7 @@
; development and early testing.
;
; Error Level Constants:
-; E_ALL - All errors and warnings (doesn't include E_STRICT)
+; E_ALL - All errors and warnings (includes E_STRICT as of PHP
6.0.0)
; E_ERROR - fatal run-time errors
; E_RECOVERABLE_ERROR - almost fatal run-time errors
; E_WARNING - run-time warnings (non-fatal errors)
@@ -916,7 +928,7 @@
;
; extension=/path/to/extension/msql.so
;
-; If you only provide the name of the extension, PHP will look for it in it's
+; If you only provide the name of the extension, PHP will look for it in its
; default extension directory.
;
; Windows Extensions
@@ -1075,7 +1087,7 @@
mail.add_x_header = On
; Log all mail() calls including the full path of the script, line #, to
address and headers
-mail.log =
+;mail.log =
[SQL]
; http://www.php.net/manual/en/ini.core.php#ini.sql.safe-mode
@@ -1678,7 +1690,12 @@
;mbstring.func_overload = 0
; enable strict encoding detection.
-;mbstring.strict_encoding = Off
+;mbstring.strict_detection = Off
+
+; This directive specifies the regex pattern of content types for which
mb_output_handler()
+; is activated.
+; Default: mbstring.http_output_conv_mimetype=^(text/|application/xhtml\+xml)
+;mbstring.http_output_conv_mimetype=
[gd]
; Tell the jpeg decode to ignore warnings and try to create
http://cvs.php.net/viewvc.cgi/php-src/php.ini-production?r1=1.1.2.2r2=1.1.2.3diff_format=u
Index: php-src/php.ini-production
diff -u php-src/php.ini-production:1.1.2.2 php-src/php.ini-production:1.1.2.3
--- php-src/php.ini-production:1.1.2.2 Tue Mar 17 19:19:17 2009
+++ php-src/php.ini-production Mon Mar 23 02:36:34 2009
@@ -22,20 +22,32 @@
; The syntax of the file is extremely simple. Whitespace and Lines
; beginning with a semicolon are silently ignored (as you probably guessed).
; Section headers (e.g. [Foo]) are also silently ignored, even though
-; they might mean something in the future. The exceptions to this rule are
-; section headers starting with [HOST= or [PATH=
+; they might mean something in the future.
+
+; Directives following the section heading [PATH=/www/mysite] only
+; apply to PHP files in the /www/mysite directory. Directives
+; following the section heading [HOST=www.example.com] only apply to
+; PHP files served
