From: Hannes Magnusson <bjori@php.net>
Date: Tue, 23 Aug 2011 10:00:18 +0000 (+0000)
Subject: Sync -development with -production
X-Git-Tag: php-5.3.9RC1~346
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5f38ffb1678a0ff6c41e9078becaadb997efec39;p=php

Sync -development with -production
---

diff --git a/php.ini-development b/php.ini-development
index 4a494a0514..111bc11bae 100644
--- a/php.ini-development
+++ b/php.ini-development
@@ -969,7 +969,6 @@ default_socket_timeout = 60
 ;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 @@ mysql.trace_mode = Off
 ; 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