Thanks for taking care of the rest of this -Hannes
2009/6/28 Johannes Schlüter <johan...@php.net>: > johannes Sun Jun 28 17:55:36 2009 UTC > > Modified files: > /php-src php.ini-development php.ini-production > Log: > Add missing ini entries (Mikko) > > > http://cvs.php.net/viewvc.cgi/php-src/php.ini-development?r1=1.12&r2=1.13&diff_format=u > Index: php-src/php.ini-development > diff -u php-src/php.ini-development:1.12 php-src/php.ini-development:1.13 > --- php-src/php.ini-development:1.12 Sun Jun 28 16:40:22 2009 > +++ php-src/php.ini-development Sun Jun 28 17:55:36 2009 > @@ -1048,6 +1048,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 > @@ -1114,6 +1116,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 > @@ -1405,6 +1411,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 > @@ -1718,6 +1736,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 > @@ -1775,6 +1797,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 > http://cvs.php.net/viewvc.cgi/php-src/php.ini-production?r1=1.11&r2=1.12&diff_format=u > Index: php-src/php.ini-production > diff -u php-src/php.ini-production:1.11 php-src/php.ini-production:1.12 > --- php-src/php.ini-production:1.11 Sun Jun 28 16:40:22 2009 > +++ php-src/php.ini-production Sun Jun 28 17:55:36 2009 > @@ -1048,6 +1048,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 > @@ -1114,6 +1116,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 > @@ -1413,6 +1419,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 > @@ -1726,6 +1744,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 > @@ -1783,6 +1805,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 > > > > -- > PHP CVS Mailing List (http://www.php.net/) > To unsubscribe, visit: http://www.php.net/unsub.php > > -- PHP Internals - PHP Runtime Development Mailing List To unsubscribe, visit: http://www.php.net/unsub.php
