diff options
| author | Christopher Jones <sixd@php.net> | 2013-09-27 15:57:13 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2013-09-27 15:57:13 -0700 |
| commit | aba30ce30676b6d73a2169b10311dfb07768630c (patch) | |
| tree | a8f56339dff39eba9a933a718362f390ef77621d /php.ini-development | |
| parent | a3b0fa0d04cad5712f64e08463d0026f9890a37c (diff) | |
| parent | 56eee05f66431b153c9212452c1f4f2e8525efc4 (diff) | |
| download | php-git-aba30ce30676b6d73a2169b10311dfb07768630c.tar.gz | |
Merge branch 'master' of https://git.php.net/repository/php-src
# By Dmitry Stogov (2) and others
# Via Christopher Jones (22) and others
* 'master' of https://git.php.net/repository/php-src:
Removed references to "Zend Support"
Added support for GNU Hurd. (Svante Signell)
- Updated to version 2013.6 (2013f)
More OCI8 DTrace probe updates. Change php.ini-* doc to match an earlier change to config.w32
FIX BUG #48539 - Disable TEXTLIMIT for FreeTDS driver
Don't track parameter number in separate znode
fix missing change from 'tcp_socket' to the more common 'server'
fix many parallel test issues
Diffstat (limited to 'php.ini-development')
| -rw-r--r-- | php.ini-development | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/php.ini-development b/php.ini-development index beebabbd24..cc1cae2986 100644 --- a/php.ini-development +++ b/php.ini-development @@ -884,8 +884,7 @@ default_socket_timeout = 60 ;extension=php_exif.dll ; Must be after mbstring as it depends on it ;extension=php_mysql.dll ;extension=php_mysqli.dll -;extension=php_oci8.dll ; Use with Oracle 10gR2 Instant Client -;extension=php_oci8_11g.dll ; Use with Oracle 11gR2 Instant Client +;extension=php_oci8_12c.dll ; Use with Oracle Database 12c Instant Client ;extension=php_openssl.dll ;extension=php_pdo_firebird.dll ;extension=php_pdo_mysql.dll |