[Pkg-php-commits] [php/debian-sid] Cherry pick patch to allow the timeout on mssql to be effective p/query

[Raphael Geissert]

---
 debian/patches/series                              |    1 +
 .../patches/upstream/mssql_per_query_timeout.patch |   16 ++++++++++++++++
 2 files changed, 17 insertions(+), 0 deletions(-)
 create mode 100644 debian/patches/upstream/mssql_per_query_timeout.patch

diff --git a/debian/patches/series b/debian/patches/series
index 85ce3c4..e12ea7f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -64,3 +64,4 @@ upstream/mysqli_options_mem_issue.patch
 session_save_path.patch
 upstream/multiple_typos.patch
 upstream/db4.8_workarounds.patch
+upstream/mssql_per_query_timeout.patch
diff --git a/debian/patches/upstream/mssql_per_query_timeout.patch b/debian/patches/upstream/mssql_per_query_timeout.patch
new file mode 100644
index 0000000..0a86e48
--- /dev/null
+++ b/debian/patches/upstream/mssql_per_query_timeout.patch
@@ -0,0 +1,16 @@
+Description: Allow the timeout on mssql to be effective per query
+Origin: http://svn.php.net/viewvc?view=revision&revision=298255
+Last-Update: 2010-05-02
+
+Index: php/ext/mssql/php_mssql.c
+===================================================================
+--- php.orig/ext/mssql/php_mssql.c
++++ php/ext/mssql/php_mssql.c
+@@ -1343,6 +1343,7 @@ PHP_FUNCTION(mssql_query)
+ 	mssql_result *result;
+ 	int id = -1;
+ 
++	dbsettime(MS_SQL_G(timeout));
+ 	batchsize = MS_SQL_G(batchsize);
+ 
+ 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|rl", &query, &query_len, &mssql_link_index, &zbatchsize) == FAILURE) {
-- 
1.6.5