diff options
| author | Julien Pauli <jpauli@php.net> | 2015-12-24 10:33:41 +0100 |
|---|---|---|
| committer | Julien Pauli <jpauli@php.net> | 2015-12-24 10:33:41 +0100 |
| commit | 3f09d301b5e4b50825b4560f0dd6673dbe616fc5 (patch) | |
| tree | 02028020f7a98f10bbcad5bf75dd2a1fc7d287ca /php.ini-development | |
| parent | aadb3dd503b8564e0525b056e432d8ac410ba95b (diff) | |
| parent | 9306c1d25461ab62d6108780b5b625ab40866d35 (diff) | |
| download | php-git-3f09d301b5e4b50825b4560f0dd6673dbe616fc5.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Update default_mimetype ini setting description
Diffstat (limited to 'php.ini-development')
| -rw-r--r-- | php.ini-development | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/php.ini-development b/php.ini-development index 2224309925..703fddb20f 100644 --- a/php.ini-development +++ b/php.ini-development @@ -663,11 +663,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" |