I'm pretty sure #4294 is not the correct bug number.. --Jani
On Mon, 2007-10-22 at 22:43 +0000, Ilia Alshanetsky wrote: > iliaa Mon Oct 22 22:43:44 2007 UTC > > Modified files: (Branch: PHP_5_2) > /php-src/ext/mssql php_mssql.c > /php-src NEWS > Log: > > MFB: Fixed bug #4294 (Move *timeout initialization from RINIT to connect > time) > > http://cvs.php.net/viewvc.cgi/php-src/ext/mssql/php_mssql.c?r1=1.152.2.13.2.4&r2=1.152.2.13.2.5&diff_format=u > Index: php-src/ext/mssql/php_mssql.c > diff -u php-src/ext/mssql/php_mssql.c:1.152.2.13.2.4 > php-src/ext/mssql/php_mssql.c:1.152.2.13.2.5 > --- php-src/ext/mssql/php_mssql.c:1.152.2.13.2.4 Sat Feb 24 02:17:25 2007 > +++ php-src/ext/mssql/php_mssql.c Mon Oct 22 22:43:44 2007 > @@ -16,7 +16,7 @@ > +----------------------------------------------------------------------+ > */ > > -/* $Id: php_mssql.c,v 1.152.2.13.2.4 2007/02/24 02:17:25 helly Exp $ */ > +/* $Id: php_mssql.c,v 1.152.2.13.2.5 2007/10/22 22:43:44 iliaa Exp $ */ > > #ifdef COMPILE_DL_MSSQL > #define HAVE_MSSQL 1 > @@ -345,9 +345,7 @@ > MS_SQL_G(min_error_severity) = MS_SQL_G(cfg_min_error_severity); > MS_SQL_G(min_message_severity) = MS_SQL_G(cfg_min_message_severity); > if (MS_SQL_G(connect_timeout) < 1) MS_SQL_G(connect_timeout) = 1; > - dbsetlogintime(MS_SQL_G(connect_timeout)); > if (MS_SQL_G(timeout) < 0) MS_SQL_G(timeout) = 60; > - dbsettime(MS_SQL_G(timeout)); > if (MS_SQL_G(max_procs) != -1) { > dbsetmaxprocs((TDS_SHORT)MS_SQL_G(max_procs)); > } > @@ -468,6 +466,9 @@ > RETURN_FALSE; > } > > + dbsetlogintime(MS_SQL_G(connect_timeout)); > + dbsettime(MS_SQL_G(timeout)); > + > /* set a DBLOGIN record */ > if ((mssql.login = dblogin()) == NULL) { > php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to allocate > login record"); > http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.984&r2=1.2027.2.547.2.985&diff_format=u > Index: php-src/NEWS > diff -u php-src/NEWS:1.2027.2.547.2.984 php-src/NEWS:1.2027.2.547.2.985 > --- php-src/NEWS:1.2027.2.547.2.984 Mon Oct 22 07:52:03 2007 > +++ php-src/NEWS Mon Oct 22 22:43:44 2007 > @@ -39,6 +39,8 @@ > > - Fixed bug #43020 (Warning message is missing with shuffle() and more > than one argument). (Scott) > +- Fixed bug #4294 (Move *timeout initialization from RINIT to connect time). > + (Ilia) > - Fixed bug #42917 (PDO::FETCH_KEY_PAIR doesn't work with setFetchMode). > (Ilia) > - Fixed bug #42890 (Constant "LIST" defined by mysqlclient and c-client). > -- Patches/Donations: http://pecl.php.net/~jani/ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
