[Pkg-php-commits] [php/debian-sid] Fix an unconditional limit on dblib_driver.c (Closes: #534881)

[Raphael Geissert]

Patch was cherry-picked from upstream. Thanks to Dr. Tilo Levante for
the report.
---
 debian/patches/mssql-null-exception.patch |   16 ++++++++++++++++
 debian/patches/series                     |    1 +
 2 files changed, 17 insertions(+), 0 deletions(-)
 create mode 100644 debian/patches/mssql-null-exception.patch

diff --git a/debian/patches/mssql-null-exception.patch b/debian/patches/mssql-null-exception.patch
new file mode 100644
index 0000000..49baa7c
--- /dev/null
+++ b/debian/patches/mssql-null-exception.patch
@@ -0,0 +1,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_
+ 		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;
diff --git a/debian/patches/series b/debian/patches/series
index fc39313..e24a276 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -36,3 +36,4 @@ bad_whatis_entries.patch
 curl_streams_sleep.patch
 gentoo/006_ext-curl-set_opt-crash.patch
 gentoo/009_ob-memory-leaks.patch
+mssql-null-exception.patch
-- 
1.5.6.5