johannes Sun Jun 28 17:56:18 2009 UTC Modified files: (Branch: PHP_5_3) /php-src php.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.14&r2=1.1.2.15&diff_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.14 Sun 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.13&r2=1.1.2.14&diff_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. ; http://php.net/mbstring.language @@ -1782,6 +1804,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 @@ -1849,18 +1875,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
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php