[Pkg-php-commits] [php/debian-sid] update debian patch mssql-null-exception.patch

Sean Finney seanius at debian.org
Sat Sep 19 22:12:25 UTC 2009


they've removed the error checking and added an extra DBSETOPT, but i
guess we should keep our previous #if ..  #endif regardless.
---
 debian/patches/mssql-null-exception.patch |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian/patches/mssql-null-exception.patch b/debian/patches/mssql-null-exception.patch
index 49baa7c..9655a21 100644
--- a/debian/patches/mssql-null-exception.patch
+++ b/debian/patches/mssql-null-exception.patch
@@ -2,14 +2,16 @@ Index: php/ext/pdo_dblib/dblib_driver.c
 ===================================================================
 --- php.orig/ext/pdo_dblib/dblib_driver.c
 +++ php/ext/pdo_dblib/dblib_driver.c
-@@ -230,9 +230,11 @@ static int pdo_dblib_handle_factory(pdo_
+@@ -230,10 +230,12 @@ static int pdo_dblib_handle_factory(pdo_
  		goto cleanup;
  	}
  
 +#if PHP_DBLIB_IS_MSSQL
- 	if (DBSETOPT(H->link, DBTEXTLIMIT, "2147483647") == FAIL) {
- 		goto cleanup;
- 	}
+ 	/* 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");
 +#endif
  
  	if (vars[3].optval && FAIL == dbuse(H->link, vars[3].optval)) {
-- 
1.5.6.5





More information about the Pkg-php-commits mailing list