Adding missing MSSQL Server ini settings

diff --git a/php.ini-dist b/php.ini-dist
index a51b48da33f0f7e09af101ab0d1a0f21d027566b..821cb5ee29a8308571bb24b414d5cc368d21da59 100644 (file)
--- a/php.ini-dist
+++ b/php.ini-dist
@@ -961,6 +961,12 @@ mssql.min_message_severity = 10
 ; Compatability mode with old versions of PHP 3.0.
 mssql.compatability_mode = Off
 
+; Connec timeout
+;mssql.connect_timeout = 5
+
+; Query timeout
+;mssql.timeout = 60
+
 ; Valid range 0 - 2147483647.  Default = 4096.
 ;mssql.textlimit = 4096
 
@@ -970,6 +976,11 @@ mssql.compatability_mode = Off
 ; Limits the number of records in each batch.  0 = all records in one batch.
 ;mssql.batchsize = 0
 
+; Specify how datetime and datetim4 columns are returned
+; On => Returns data converted to SQL server settings
+; Off => Returns values as YYYY-MM-DD hh:mm:ss
+;mssql.datetimeconvert = On
+
 ; Use NT authentication when connecting to the server
 mssql.secure_connection = Off
 

diff --git a/php.ini-recommended b/php.ini-recommended
index 267966ec999193cb38e484c9c2b22c67e5b16808..ffd4ae5aca46fc2052451cd312b4afa040186907 100644 (file)
--- a/php.ini-recommended
+++ b/php.ini-recommended
@@ -970,6 +970,12 @@ mssql.min_message_severity = 10
 ; Compatability mode with old versions of PHP 3.0.
 mssql.compatability_mode = Off
 
+; Connec timeout
+;mssql.connect_timeout = 5
+
+; Query timeout
+;mssql.timeout = 60
+
 ; Valid range 0 - 2147483647.  Default = 4096.
 ;mssql.textlimit = 4096
 
@@ -979,6 +985,11 @@ mssql.compatability_mode = Off
 ; Limits the number of records in each batch.  0 = all records in one batch.
 ;mssql.batchsize = 0
 
+; Specify how datetime and datetim4 columns are returned
+; On => Returns data converted to SQL server settings
+; Off => Returns values as YYYY-MM-DD hh:mm:ss
+;mssql.datetimeconvert = On
+
 ; Use NT authentication when connecting to the server
 mssql.secure_connection = Off