diff options
author | Hannes Magnusson <bjori@php.net> | 2011-08-23 10:00:18 +0000 |
---|---|---|
committer | Hannes Magnusson <bjori@php.net> | 2011-08-23 10:00:18 +0000 |
commit | 5f38ffb1678a0ff6c41e9078becaadb997efec39 (patch) | |
tree | e3b4d4fef7718d06277ae12cf3c5fbdcb47272af /php.ini-development | |
parent | 8c007d81796da8822ecfc35dfc563ee2d7e83211 (diff) | |
download | php-git-5f38ffb1678a0ff6c41e9078becaadb997efec39.tar.gz |
Sync -development with -production
Diffstat (limited to 'php.ini-development')
-rw-r--r-- | php.ini-development | 9 |
1 files changed, 8 insertions, 1 deletions
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 |