From 14c8cc83c810ba5d225b338079094af5c7a4031e Mon Sep 17 00:00:00 2001
From: ulvii <v-ulibra@microsoft.com>
Date: Thu, 30 Mar 2017 17:45:27 -0700
Subject: [PATCH 1/5] Adding a script to test sqlsrv connection pooling on
 Linux and Mac

---
 test/sqlsrv/isPooled.php              | 25 ++++++++++++++++++++
 test/sqlsrv/sqlsrv_ConnPool_Unix.phpt | 34 +++++++++++++++++++++++++++
 2 files changed, 59 insertions(+)
 create mode 100644 test/sqlsrv/isPooled.php
 create mode 100644 test/sqlsrv/sqlsrv_ConnPool_Unix.phpt

diff --git a/test/sqlsrv/isPooled.php b/test/sqlsrv/isPooled.php
new file mode 100644
index 00000000..2020eb32
--- /dev/null
+++ b/test/sqlsrv/isPooled.php
@@ -0,0 +1,25 @@
+<?php
+include_once 'autonomous_setup.php';
+$conn1 = sqlsrv_connect( $serverName, $connectionInfo);
+$connId1 = ConnectionID($conn1);
+$conn1 = null;
+
+$conn2 = sqlsrv_connect( $serverName, $connectionInfo);
+$connId2 = ConnectionID($conn2);
+
+if ($connId1 === $connId2){
+    echo "Pooled\n";
+}else{
+    echo "Not Pooled\n";
+}
+
+function ConnectionID($conn)
+{
+	$tsql = "SELECT [connection_id] FROM [sys].[dm_exec_connections] where session_id = @@SPID";
+	$stmt = sqlsrv_query($conn, $tsql);
+	sqlsrv_fetch($stmt);
+	$connID = sqlsrv_get_field($stmt, 0);
+	$stmt = null;
+	return ($connID);
+}
+?>
diff --git a/test/sqlsrv/sqlsrv_ConnPool_Unix.phpt b/test/sqlsrv/sqlsrv_ConnPool_Unix.phpt
new file mode 100644
index 00000000..197f2e27
--- /dev/null
+++ b/test/sqlsrv/sqlsrv_ConnPool_Unix.phpt
@@ -0,0 +1,34 @@
+--TEST--
+SQLSRV Connection Pooling Test on Unix
+This test assumes odbcinst.ini has not been modified. 
+This test also requires root privileges to modify odbcinst.ini file on Linux.
+--SKIPIF--
+<?php if(PHP_OS === "WINNT") die("Skipped: Test for Linux and Mac");
+--FILE--
+<?php
+$lines_to_add="CPTimeout=5\n[ODBC]\nPooling=Yes\n";
+
+//get odbcinst.ini location
+$lines = explode("\n", shell_exec("odbcinst -j"));
+$odbcinst_ini = explode(" ", $lines[1])[1];
+
+//enable pooling by modifying the odbcinst.ini file
+$current = file_get_contents($odbcinst_ini);
+$current.=$lines_to_add;
+file_put_contents($odbcinst_ini, $current);
+
+//Creating a new php process, because for changes in odbcinst.ini file to affect pooling, drivers must be reloaded.
+print_r(shell_exec("php ./test/sqlsrv/isPooled.php"));
+
+//disable pooling by modifying the odbcinst.ini file
+$current = file_get_contents($odbcinst_ini);
+$current = str_replace("CPTimeout=5\n[ODBC]\nPooling=Yes\n",'',$current);
+file_put_contents($odbcinst_ini, $current);
+
+print_r(shell_exec("php ./test/sqlsrv/isPooled.php"));
+?>
+--EXPECT--
+Pooled
+Not Pooled
+
+

From 800a0eb6b2c5fd5afe1c21bcf34e2ec3b1ca9e76 Mon Sep 17 00:00:00 2001
From: ulvii <v-ulibra@microsoft.com>
Date: Fri, 31 Mar 2017 17:41:38 -0700
Subject: [PATCH 2/5] Update sqlsrv_ConnPool_Unix.phpt

Move description to --DESCRIPTION-- section
---
 test/sqlsrv/sqlsrv_ConnPool_Unix.phpt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/sqlsrv/sqlsrv_ConnPool_Unix.phpt b/test/sqlsrv/sqlsrv_ConnPool_Unix.phpt
index 197f2e27..f6a1cafb 100644
--- a/test/sqlsrv/sqlsrv_ConnPool_Unix.phpt
+++ b/test/sqlsrv/sqlsrv_ConnPool_Unix.phpt
@@ -1,9 +1,10 @@
 --TEST--
 SQLSRV Connection Pooling Test on Unix
+--DESCRIPTION--
 This test assumes odbcinst.ini has not been modified. 
 This test also requires root privileges to modify odbcinst.ini file on Linux.
 --SKIPIF--
-<?php if(PHP_OS === "WINNT") die("Skipped: Test for Linux and Mac");
+<?php if(PHP_OS === "WINNT") die("Skipped: Test for Linux and Mac");?>
 --FILE--
 <?php
 $lines_to_add="CPTimeout=5\n[ODBC]\nPooling=Yes\n";

From 00aff96418447b27557af98a034ef9ff027b26cb Mon Sep 17 00:00:00 2001
From: ulvii <v-ulibra@microsoft.com>
Date: Mon, 3 Apr 2017 10:48:59 -0700
Subject: [PATCH 3/5] Update isPooled.php

---
 test/sqlsrv/isPooled.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/sqlsrv/isPooled.php b/test/sqlsrv/isPooled.php
index 2020eb32..ed728dcb 100644
--- a/test/sqlsrv/isPooled.php
+++ b/test/sqlsrv/isPooled.php
@@ -2,7 +2,7 @@
 include_once 'autonomous_setup.php';
 $conn1 = sqlsrv_connect( $serverName, $connectionInfo);
 $connId1 = ConnectionID($conn1);
-$conn1 = null;
+sqlsrv_close($conn1);
 
 $conn2 = sqlsrv_connect( $serverName, $connectionInfo);
 $connId2 = ConnectionID($conn2);
@@ -19,7 +19,7 @@ function ConnectionID($conn)
 	$stmt = sqlsrv_query($conn, $tsql);
 	sqlsrv_fetch($stmt);
 	$connID = sqlsrv_get_field($stmt, 0);
-	$stmt = null;
+	sqlsrv_free_stmt($stmt);
 	return ($connID);
 }
 ?>

From b144cf97b643edde8c4bee3d545eba80171985fa Mon Sep 17 00:00:00 2001
From: ulvii <v-ulibra@microsoft.com>
Date: Mon, 3 Apr 2017 10:52:43 -0700
Subject: [PATCH 4/5] Update sqlsrv_ConnPool_Unix.phpt

---
 test/sqlsrv/sqlsrv_ConnPool_Unix.phpt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/sqlsrv/sqlsrv_ConnPool_Unix.phpt b/test/sqlsrv/sqlsrv_ConnPool_Unix.phpt
index f6a1cafb..faa5fd93 100644
--- a/test/sqlsrv/sqlsrv_ConnPool_Unix.phpt
+++ b/test/sqlsrv/sqlsrv_ConnPool_Unix.phpt
@@ -23,7 +23,7 @@ print_r(shell_exec("php ./test/sqlsrv/isPooled.php"));
 
 //disable pooling by modifying the odbcinst.ini file
 $current = file_get_contents($odbcinst_ini);
-$current = str_replace("CPTimeout=5\n[ODBC]\nPooling=Yes\n",'',$current);
+$current = str_replace($lines_to_add,'',$current);
 file_put_contents($odbcinst_ini, $current);
 
 print_r(shell_exec("php ./test/sqlsrv/isPooled.php"));

From 70ad77f9ce70dd7a4b9538f41b810c3644c0c121 Mon Sep 17 00:00:00 2001
From: ulvii <v-ulibra@microsoft.com>
Date: Mon, 3 Apr 2017 10:53:33 -0700
Subject: [PATCH 5/5] Update PDO_ConnPool_Unix.phpt

---
 test/pdo_sqlsrv/PDO_ConnPool_Unix.phpt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/pdo_sqlsrv/PDO_ConnPool_Unix.phpt b/test/pdo_sqlsrv/PDO_ConnPool_Unix.phpt
index d402ac93..79ec0f19 100644
--- a/test/pdo_sqlsrv/PDO_ConnPool_Unix.phpt
+++ b/test/pdo_sqlsrv/PDO_ConnPool_Unix.phpt
@@ -22,7 +22,7 @@ print_r(shell_exec("php ./test/pdo_sqlsrv/isPooled.php"));
 
 //disable pooling by modifying the odbcinst.ini file
 $current = file_get_contents($odbcinst_ini);
-$current = str_replace("CPTimeout=5\n[ODBC]\nPooling=Yes\n",'',$current);
+$current = str_replace($lines_to_add,'',$current);
 file_put_contents($odbcinst_ini, $current);
 
 print_r(shell_exec("php ./test/pdo_sqlsrv/isPooled.php"));