bjori Tue, 23 Aug 2011 10:00:18 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=315352
Log:
Sync -development with -production
Changed paths:
U php/php-src/branches/PHP_5_3/php.ini-development
U php/php-src/branches/PHP_5_4/php.ini-development
U php/php-src/trunk/php.ini-development
Modified: php/php-src/branches/PHP_5_3/php.ini-development
===================================================================
--- php/php-src/branches/PHP_5_3/php.ini-development 2011-08-23 09:39:56 UTC
(rev 315351)
+++ php/php-src/branches/PHP_5_3/php.ini-development 2011-08-23 10:00:18 UTC
(rev 315352)
@@ -969,7 +969,6 @@
;extension=php_pdo_pgsql.dll
;extension=php_pdo_sqlite.dll
;extension=php_pgsql.dll
-;extension=php_phar.dll
;extension=php_pspell.dll
;extension=php_shmop.dll
@@ -1248,6 +1247,14 @@
; http://php.net/mysqli.max-persistent
mysqli.max_persistent = -1
+; Allow accessing, from PHP's perspective, local files with LOAD DATA
statements
+; http://php.net/mysqli.allow_local_infile
+;mysqli.allow_local_infile = On
+
+; Allow or prevent persistent links.
+; http://php.net/mysqli.allow-persistent
+mysqli.allow_persistent = On
+
; Maximum number of links. -1 means no limit.
; http://php.net/mysqli.max-links
mysqli.max_links = -1
Modified: php/php-src/branches/PHP_5_4/php.ini-development
===================================================================
--- php/php-src/branches/PHP_5_4/php.ini-development 2011-08-23 09:39:56 UTC
(rev 315351)
+++ php/php-src/branches/PHP_5_4/php.ini-development 2011-08-23 10:00:18 UTC
(rev 315352)
@@ -871,14 +871,12 @@
;extension=php_oci8_11g.dll ; Use with Oracle 11g Instant Client
;extension=php_openssl.dll
;extension=php_pdo_firebird.dll
-;extension=php_pdo_mssql.dll
;extension=php_pdo_mysql.dll
;extension=php_pdo_oci.dll
;extension=php_pdo_odbc.dll
;extension=php_pdo_pgsql.dll
;extension=php_pdo_sqlite.dll
;extension=php_pgsql.dll
-;extension=php_phar.dll
;extension=php_pspell.dll
;extension=php_shmop.dll
Modified: php/php-src/trunk/php.ini-development
===================================================================
--- php/php-src/trunk/php.ini-development 2011-08-23 09:39:56 UTC (rev
315351)
+++ php/php-src/trunk/php.ini-development 2011-08-23 10:00:18 UTC (rev
315352)
@@ -871,14 +871,12 @@
;extension=php_oci8_11g.dll ; Use with Oracle 11g Instant Client
;extension=php_openssl.dll
;extension=php_pdo_firebird.dll
-;extension=php_pdo_mssql.dll
;extension=php_pdo_mysql.dll
;extension=php_pdo_oci.dll
;extension=php_pdo_odbc.dll
;extension=php_pdo_pgsql.dll
;extension=php_pdo_sqlite.dll
;extension=php_pgsql.dll
-;extension=php_phar.dll
;extension=php_pspell.dll
;extension=php_shmop.dll
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
