From e52ce17783e9209a9141a5d8fa95f3a485a1e973 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Fri, 11 Mar 2016 14:15:47 +0100 Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run --- php/apache2-php5.6/php.ini | 11 +++-------- php/cgi-php5.6/php.ini | 11 +++-------- php/cli-php5.6/php.ini | 11 +++-------- php/embed-php5.6/php.ini | 11 +++-------- php/fpm-php5.6/php-fpm.conf | 4 ++-- php/fpm-php5.6/php.ini | 11 +++-------- 6 files changed, 17 insertions(+), 42 deletions(-) diff --git a/php/apache2-php5.6/php.ini b/php/apache2-php5.6/php.ini index 28ab2a78..4176901c 100644 --- a/php/apache2-php5.6/php.ini +++ b/php/apache2-php5.6/php.ini @@ -667,11 +667,10 @@ auto_prepend_file = ; http://php.net/auto-append-file auto_append_file = -; By default, PHP will output a character encoding using -; the Content-type: header. To disable sending of the charset, simply -; set it to be empty. +; By default, PHP will output a media type using the Content-Type header. To +; disable this, simply set it to be empty. ; -; PHP's built-in default is text/html +; PHP's built-in default media type is set to text/html. ; http://php.net/default-mimetype default_mimetype = "text/html" @@ -969,10 +968,6 @@ cli_server.color = On ; Default is 0, which does not produce any errors. ;intl.error_level = E_WARNING -[sqlite] -; http://php.net/sqlite.assoc-case -;sqlite.assoc_case = 0 - [sqlite3] ;sqlite3.extension_dir = diff --git a/php/cgi-php5.6/php.ini b/php/cgi-php5.6/php.ini index 28ab2a78..4176901c 100644 --- a/php/cgi-php5.6/php.ini +++ b/php/cgi-php5.6/php.ini @@ -667,11 +667,10 @@ auto_prepend_file = ; http://php.net/auto-append-file auto_append_file = -; By default, PHP will output a character encoding using -; the Content-type: header. To disable sending of the charset, simply -; set it to be empty. +; By default, PHP will output a media type using the Content-Type header. To +; disable this, simply set it to be empty. ; -; PHP's built-in default is text/html +; PHP's built-in default media type is set to text/html. ; http://php.net/default-mimetype default_mimetype = "text/html" @@ -969,10 +968,6 @@ cli_server.color = On ; Default is 0, which does not produce any errors. ;intl.error_level = E_WARNING -[sqlite] -; http://php.net/sqlite.assoc-case -;sqlite.assoc_case = 0 - [sqlite3] ;sqlite3.extension_dir = diff --git a/php/cli-php5.6/php.ini b/php/cli-php5.6/php.ini index 28ab2a78..4176901c 100644 --- a/php/cli-php5.6/php.ini +++ b/php/cli-php5.6/php.ini @@ -667,11 +667,10 @@ auto_prepend_file = ; http://php.net/auto-append-file auto_append_file = -; By default, PHP will output a character encoding using -; the Content-type: header. To disable sending of the charset, simply -; set it to be empty. +; By default, PHP will output a media type using the Content-Type header. To +; disable this, simply set it to be empty. ; -; PHP's built-in default is text/html +; PHP's built-in default media type is set to text/html. ; http://php.net/default-mimetype default_mimetype = "text/html" @@ -969,10 +968,6 @@ cli_server.color = On ; Default is 0, which does not produce any errors. ;intl.error_level = E_WARNING -[sqlite] -; http://php.net/sqlite.assoc-case -;sqlite.assoc_case = 0 - [sqlite3] ;sqlite3.extension_dir = diff --git a/php/embed-php5.6/php.ini b/php/embed-php5.6/php.ini index 28ab2a78..4176901c 100644 --- a/php/embed-php5.6/php.ini +++ b/php/embed-php5.6/php.ini @@ -667,11 +667,10 @@ auto_prepend_file = ; http://php.net/auto-append-file auto_append_file = -; By default, PHP will output a character encoding using -; the Content-type: header. To disable sending of the charset, simply -; set it to be empty. +; By default, PHP will output a media type using the Content-Type header. To +; disable this, simply set it to be empty. ; -; PHP's built-in default is text/html +; PHP's built-in default media type is set to text/html. ; http://php.net/default-mimetype default_mimetype = "text/html" @@ -969,10 +968,6 @@ cli_server.color = On ; Default is 0, which does not produce any errors. ;intl.error_level = E_WARNING -[sqlite] -; http://php.net/sqlite.assoc-case -;sqlite.assoc_case = 0 - [sqlite3] ;sqlite3.extension_dir = diff --git a/php/fpm-php5.6/php-fpm.conf b/php/fpm-php5.6/php-fpm.conf index 9fa6d199..f71047f2 100644 --- a/php/fpm-php5.6/php-fpm.conf +++ b/php/fpm-php5.6/php-fpm.conf @@ -20,14 +20,14 @@ [global] ; Pid file -; Note: the default prefix is /var/lib +; Note: the default prefix is /var ; Default Value: none ;pid = run/php-fpm.pid ; Error log file ; If it's set to "syslog", log is sent to syslogd instead of being written ; in a local file. -; Note: the default prefix is /var/lib +; Note: the default prefix is /var ; Default Value: log/php-fpm.log ;error_log = log/php-fpm.log diff --git a/php/fpm-php5.6/php.ini b/php/fpm-php5.6/php.ini index 28ab2a78..4176901c 100644 --- a/php/fpm-php5.6/php.ini +++ b/php/fpm-php5.6/php.ini @@ -667,11 +667,10 @@ auto_prepend_file = ; http://php.net/auto-append-file auto_append_file = -; By default, PHP will output a character encoding using -; the Content-type: header. To disable sending of the charset, simply -; set it to be empty. +; By default, PHP will output a media type using the Content-Type header. To +; disable this, simply set it to be empty. ; -; PHP's built-in default is text/html +; PHP's built-in default media type is set to text/html. ; http://php.net/default-mimetype default_mimetype = "text/html" @@ -969,10 +968,6 @@ cli_server.color = On ; Default is 0, which does not produce any errors. ;intl.error_level = E_WARNING -[sqlite] -; http://php.net/sqlite.assoc-case -;sqlite.assoc_case = 0 - [sqlite3] ;sqlite3.extension_dir = -- 2.39.5