com php-src: Update default_mimetype ini setting descri ption: php.ini-development php.ini-production
| From: | JulienPauli | Date: | Thu, 24 Dec 2015 09:33:15 +0000 |
| Subject: | com php-src: Update default_mimetype ini setting descri ption: php.ini-development php.ini-production | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-90435@lists.php.net to get a copy of this message | ||
Commit: 9306c1d25461ab62d6108780b5b625ab40866d35
Author: Thomas Punt <tpunt@hotmail.co.uk> Mon, 21 Dec 2015 20:25:30 +0000
Committer: Julien Pauli <jpauli@php.net> Thu, 24 Dec 2015 10:33:15 +0100
Parents: 0b8c8bfc818062fbe7364f48343885726cbcfd4d
Branches: PHP-5.6 PHP-7.0 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9306c1d25461ab62d6108780b5b625ab40866d35
Log:
Update default_mimetype ini setting description
This is in response to doc bug #70287
Bugs:
https://bugs.php.net/70287
Changed paths:
M php.ini-development
M php.ini-production
Diff:
diff --git a/php.ini-development b/php.ini-development
index f350476..c5d1466 100644
--- a/php.ini-development
+++ b/php.ini-development
@@ -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"
diff --git a/php.ini-production b/php.ini-production
index e462003..dc483f7 100644
--- a/php.ini-production
+++ b/php.ini-production
@@ -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"