Remove some more interbase leftovers

diff --git a/EXTENSIONS b/EXTENSIONS
index ce75f64f6bbbab9a7d246be40b0a81907063a098..29f0d1f43e125ce9b1c2e0036cb299cd4f94ac31 100644 (file)
--- a/EXTENSIONS
+++ b/EXTENSIONS
@@ -76,11 +76,6 @@ MAINTENANCE:         Maintained
 STATUS:              Working
 COMMENT:             DBM abstraction for db2, db3, db4, dbm, ndbm, gdbm, ini
 -------------------------------------------------------------------------------
-EXTENSION:           interbase
-PRIMARY MAINTAINER:  Ard Biesheuvel <ard@ard.nu> (2003 - 2005)
-MAINTENANCE:         Odd fixes
-STATUS:              Working
--------------------------------------------------------------------------------
 EXTENSION:           mysqli
 PRIMARY MAINTAINER:  Georg Richter <georg@php.net> (2003 - 2006)
                      Andrey Hristov <andrey@php.net> (2003 - 2016)

diff --git a/appveyor/build_task.bat b/appveyor/build_task.bat
index 00703936948ea2e3c6755c86f2b63a73e0d39ccf..41c43479faf21dc2b7a4b59b41632ffbfa122d12 100644 (file)
--- a/appveyor/build_task.bat
+++ b/appveyor/build_task.bat
@@ -51,7 +51,7 @@ if %errorlevel% neq 0 exit /b 3
 if "%THREAD_SAFE%" equ "0" set ADD_CONF=%ADD_CONF% --disable-zts
 if "%INTRINSICS%" neq "" set ADD_CONF=%ADD_CONF% --enable-native-intrinsics=%INTRINSICS%
 
-set EXT_EXCLUDE_FROM_TEST=snmp,oci8_12c,pdo_oci,pdo_firebird,interbase,ldap,imap,ftp
+set EXT_EXCLUDE_FROM_TEST=snmp,oci8_12c,pdo_oci,pdo_firebird,ldap,imap,ftp
 if "%OPCACHE%" equ "0" set EXT_EXCLUDE_FROM_TEST=%EXT_EXCLUDE_FROM_TEST%,opcache
 
 cmd /c configure.bat ^

diff --git a/php.ini-development b/php.ini-development
index dd015e489403cca6969a58760bde0b7848d21e71..f9957045a46714e4e625a168a53c77341e04967f 100644 (file)
--- a/php.ini-development
+++ b/php.ini-development
@@ -902,7 +902,6 @@ default_socket_timeout = 60
 ;extension=gmp
 ;extension=intl
 ;extension=imap
-;extension=interbase
 ;extension=ldap
 ;extension=mbstring
 ;extension=exif      ; Must be after mbstring as it depends on it
@@ -1117,37 +1116,6 @@ odbc.defaultlrl = 4096
 ; http://php.net/odbc.defaultbinmode
 odbc.defaultbinmode = 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"
-
 [MySQLi]
 
 ; Maximum number of persistent links.  -1 means no limit.

diff --git a/php.ini-production b/php.ini-production
index 34d428fe18592df2b2664a45bfe1fabf807e3f75..3bc67c6a5e2619d726b89fa213ffc93d241abc06 100644 (file)
--- a/php.ini-production
+++ b/php.ini-production
@@ -909,7 +909,6 @@ default_socket_timeout = 60
 ;extension=gmp
 ;extension=intl
 ;extension=imap
-;extension=interbase
 ;extension=ldap
 ;extension=mbstring
 ;extension=exif      ; Must be after mbstring as it depends on it
@@ -1124,37 +1123,6 @@ odbc.defaultlrl = 4096
 ; http://php.net/odbc.defaultbinmode
 odbc.defaultbinmode = 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"
-
 [MySQLi]
 
 ; Maximum number of persistent links.  -1 means no limit.