From: Johannes Schlüter <johannes@php.net>
Date: Sun, 28 Jun 2009 16:41:17 +0000 (+0000)
Subject: MFH: Add ibase settings
X-Git-Tag: php-5.3.0~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6d68dbc33193f5f070b398acc1e036d93218c568;p=php

MFH: Add ibase settings
---

diff --git a/php.ini-development b/php.ini-development
index 4fa84591aa..af20d0550f 100644
--- a/php.ini-development
+++ b/php.ini-development
@@ -1142,6 +1142,37 @@ odbc.defaultbinmode = 1
 
 ;birdstep.max_links = -1
 
+[Interbase]
+; Allow or prevent persistent links.
+ibase.allow_persistent = 1
+
+; Maximum number of persistent links.  -1 means no limit.
+ibase.max_persistent = -1
+
+; Maximum number of links (persistent + non-persistent).  -1 means no limit.
+ibase.max_links = -1
+
+; Default database name for ibase_connect().
+;ibase.default_db =
+
+; Default username for ibase_connect().
+;ibase.default_user =
+
+; Default password for ibase_connect().
+;ibase.default_password =
+
+; Default charset for ibase_connect().
+;ibase.default_charset =
+
+; Default timestamp format.
+ibase.timestampformat = "%Y-%m-%d %H:%M:%S"
+
+; Default date format.
+ibase.dateformat = "%Y-%m-%d"
+
+; Default time format.
+ibase.timeformat = "%H:%M:%S"
+
 [MySQL]
 ; Allow accessing, from PHP's perspective, local files with LOAD DATA statements
 ; http://php.net/mysql.allow_local_infile
@@ -1815,16 +1846,6 @@ ldap.max_links = -1
 ;pdo_odbc.db2_instance_name=
 ;mcrypt.algorithms_dir=
 ;mcrypt.modes_dir=
-;ibase.allow_persistent=
-;ibase.max_persistent=
-;ibase.max_links=
-;ibase.default_db=
-;ibase.default_user=
-;ibase.default_password=
-;ibase.default_charset=
-;ibase.timestampformat=
-;ibase.dateformat=
-;ibase.timeformat=
 ;mbstring.script_encoding=
 ;mbstring.http_output_conv_mimetypes=
 ;com.code_page=
diff --git a/php.ini-production b/php.ini-production
index 0d814f78af..91d83cde75 100644
--- a/php.ini-production
+++ b/php.ini-production
@@ -1142,6 +1142,37 @@ odbc.defaultbinmode = 1
 
 ;birdstep.max_links = -1
 
+[Interbase]
+; Allow or prevent persistent links.
+ibase.allow_persistent = 1
+
+; Maximum number of persistent links.  -1 means no limit.
+ibase.max_persistent = -1
+
+; Maximum number of links (persistent + non-persistent).  -1 means no limit.
+ibase.max_links = -1
+
+; Default database name for ibase_connect().
+;ibase.default_db =
+
+; Default username for ibase_connect().
+;ibase.default_user =
+
+; Default password for ibase_connect().
+;ibase.default_password =
+
+; Default charset for ibase_connect().
+;ibase.default_charset =
+
+; Default timestamp format.
+ibase.timestampformat = "%Y-%m-%d %H:%M:%S"
+
+; Default date format.
+ibase.dateformat = "%Y-%m-%d"
+
+; Default time format.
+ibase.timeformat = "%H:%M:%S"
+
 [MySQL]
 ; Allow accessing, from PHP's perspective, local files with LOAD DATA statements
 ; http://php.net/mysql.allow_local_infile
@@ -1823,16 +1854,6 @@ ldap.max_links = -1
 ;pdo_odbc.db2_instance_name=
 ;mcrypt.algorithms_dir=
 ;mcrypt.modes_dir=
-;ibase.allow_persistent=
-;ibase.max_persistent=
-;ibase.max_links=
-;ibase.default_db=
-;ibase.default_user=
-;ibase.default_password=
-;ibase.default_charset=
-;ibase.timestampformat=
-;ibase.dateformat=
-;ibase.timeformat=
 ;mbstring.script_encoding=
 ;mbstring.http_output_conv_mimetypes=
 ;com.code_page=