felipe          Sun Jun 28 02:09:51 2009 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src/ext/pdo_dblib      dblib_driver.c 
    /php-src    NEWS 
  Log:
  - MFH: Fixed bug #48539 (pdo_dblib fails to connect, throws empty 
PDOException "SQLSTATE[] (null)")
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_dblib/dblib_driver.c?r1=1.9.2.2.2.5&r2=1.9.2.2.2.6&diff_format=u
Index: php-src/ext/pdo_dblib/dblib_driver.c
diff -u php-src/ext/pdo_dblib/dblib_driver.c:1.9.2.2.2.5 
php-src/ext/pdo_dblib/dblib_driver.c:1.9.2.2.2.6
--- php-src/ext/pdo_dblib/dblib_driver.c:1.9.2.2.2.5    Fri Mar 20 22:14:17 2009
+++ php-src/ext/pdo_dblib/dblib_driver.c        Sun Jun 28 02:09:50 2009
@@ -17,7 +17,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: dblib_driver.c,v 1.9.2.2.2.5 2009/03/20 22:14:17 sfox Exp $ */
+/* $Id: dblib_driver.c,v 1.9.2.2.2.6 2009/06/28 02:09:50 felipe Exp $ */
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
@@ -230,9 +230,11 @@
                goto cleanup;
        }
 
+#if PHP_DBLIB_IS_MSSQL
        if (DBSETOPT(H->link, DBTEXTLIMIT, "2147483647") == FAIL) {
                goto cleanup;
        }
+#endif
 
        if (vars[3].optval && FAIL == dbuse(H->link, vars[3].optval)) {
                goto cleanup;
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1570&r2=1.2027.2.547.2.1571&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1570 php-src/NEWS:1.2027.2.547.2.1571
--- php-src/NEWS:1.2027.2.547.2.1570    Sun Jun 28 01:16:36 2009
+++ php-src/NEWS        Sun Jun 28 02:09:50 2009
@@ -11,6 +11,8 @@
 - Fixed bug #48619 (imap_search ALL segfaults). (Pierre)
 - Fixed bug #48555 (ImageFTBBox() differs from previous versions for texts
   with new lines) (Takeshi Abe)
+- Fixed bug #48539 (pdo_dblib fails to connect, throws empty PDOException
+  "SQLSTATE[] (null)"). (Felipe)
 - Fixed bug #48465 (sys_get_temp_dir() possibly inconsistent when using
   TMPDIR). (Ilia)
 - Fixed bug #48450 (Compile failure under IRIX 6.5.30 building gd.c). (Kalle)



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

Reply via email to