svn: /php/php-src/ branches/PHP_5_2/ext/pdo_dblib/dblib_driver.c branches/PHP_5_3/ext/pdo_dblib/dblib_driver.c trunk/ext/pdo_dblib/dblib_driver.c
| From: | Felipe Pena | Date: | Thu, 10 Sep 2009 01:20:42 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_2/ext/pdo_dblib/dblib_driver.c branches/PHP_5_3/ext/pdo_dblib/dblib_driver.c trunk/ext/pdo_dblib/dblib_driver.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-60360@lists.php.net to get a copy of this message | ||
felipe Thu, 10 Sep 2009 01:20:42 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=288215
Log:
- Possible fix for bug #49344 on Windows (pdo_mssql fails to connect,throws PDOException SQLSTATE[]
(null) (severity 0))
Bug: http://bugs.php.net/49344 (Feedback) pdo_mssql fails to
connect,throws PDOException SQLSTATE[] (null) (severity 0)
Changed paths:
U php/php-src/branches/PHP_5_2/ext/pdo_dblib/dblib_driver.c
U php/php-src/branches/PHP_5_3/ext/pdo_dblib/dblib_driver.c
U php/php-src/trunk/ext/pdo_dblib/dblib_driver.c
Modified: php/php-src/branches/PHP_5_2/ext/pdo_dblib/dblib_driver.c
===================================================================
--- php/php-src/branches/PHP_5_2/ext/pdo_dblib/dblib_driver.c 2009-09-09 23:27:12 UTC (rev 288214)
+++ php/php-src/branches/PHP_5_2/ext/pdo_dblib/dblib_driver.c 2009-09-10 01:20:42 UTC (rev 288215)
@@ -230,11 +230,11 @@
goto cleanup;
}
-#if PHP_DBLIB_IS_MSSQL
- if (DBSETOPT(H->link, DBTEXTLIMIT, "2147483647") == FAIL) {
- goto cleanup;
- }
-#endif
+ /* dblib do not return more than this length from text/image */
+ DBSETOPT(H->link, DBTEXTLIMIT, "2147483647");
+
+ /* limit text/image from network */
+ DBSETOPT(H->link, DBTEXTSIZE, "2147483647");
if (vars[3].optval && FAIL == dbuse(H->link, vars[3].optval)) {
goto cleanup;
Modified: php/php-src/branches/PHP_5_3/ext/pdo_dblib/dblib_driver.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/pdo_dblib/dblib_driver.c 2009-09-09 23:27:12 UTC (rev 288214)
+++ php/php-src/branches/PHP_5_3/ext/pdo_dblib/dblib_driver.c 2009-09-10 01:20:42 UTC (rev 288215)
@@ -230,11 +230,11 @@
goto cleanup;
}
-#if PHP_DBLIB_IS_MSSQL
- if (DBSETOPT(H->link, DBTEXTLIMIT, "2147483647") == FAIL) {
- goto cleanup;
- }
-#endif
+ /* dblib do not return more than this length from text/image */
+ DBSETOPT(H->link, DBTEXTLIMIT, "2147483647");
+
+ /* limit text/image from network */
+ DBSETOPT(H->link, DBTEXTSIZE, "2147483647");
if (vars[3].optval && FAIL == dbuse(H->link, vars[3].optval)) {
goto cleanup;
Modified: php/php-src/trunk/ext/pdo_dblib/dblib_driver.c
===================================================================
--- php/php-src/trunk/ext/pdo_dblib/dblib_driver.c 2009-09-09 23:27:12 UTC (rev 288214)
+++ php/php-src/trunk/ext/pdo_dblib/dblib_driver.c 2009-09-10 01:20:42 UTC (rev 288215)
@@ -230,11 +230,11 @@
goto cleanup;
}
-#if PHP_DBLIB_IS_MSSQL
- if (DBSETOPT(H->link, DBTEXTLIMIT, "2147483647") == FAIL) {
- goto cleanup;
- }
-#endif
+ /* dblib do not return more than this length from text/image */
+ DBSETOPT(H->link, DBTEXTLIMIT, "2147483647");
+
+ /* limit text/image from network */
+ DBSETOPT(H->link, DBTEXTSIZE, "2147483647");
if (vars[3].optval && FAIL == dbuse(H->link, vars[3].optval)) {
goto cleanup;