From 4bde059d083661516a368b2c55bbc96fe8aaa02f Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Fri, 2 Sep 2016 12:24:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9BRequest=E7=B1=BB=E7=9A=84type?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                 | 3 ++-
 library/think/Request.php | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index ecbb33c9..b0828892 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@ ThinkPHP5在保持快速开发和大道至简的核心理念不变的同时，PH
  + 方便的自动生成定义
  + 真正惰性加载
  + 分布式环境支持
- + 更多的社交类库
+ + 支持Composer
 
 > ThinkPHP5的运行环境要求PHP5.4以上。
 
@@ -53,6 +53,7 @@ www  WEB部署目录（或者子目录）
 │  ├─common.php         公共函数文件
 │  ├─config.php         公共配置文件
 │  ├─route.php          路由配置文件
+│  ├─tags.php           应用行为扩展定义文件
 │  └─database.php       数据库配置文件
 │
 ├─public                WEB目录（对外访问目录）
diff --git a/library/think/Request.php b/library/think/Request.php
index ccae2842..5b588cde 100644
--- a/library/think/Request.php
+++ b/library/think/Request.php
@@ -93,7 +93,6 @@ class Request
      * @var array 资源类型
      */
     protected $mimeType = [
-        'html' => 'text/html,application/xhtml+xml,*/*',
         'xml'  => 'application/xml,text/xml,application/x-xml',
         'json' => 'application/json,text/x-json,application/jsonrequest,text/json',
         'js'   => 'text/javascript,application/javascript,application/x-javascript',
@@ -107,6 +106,7 @@ class Request
         'jpg'  => 'image/jpg,image/jpeg,image/pjpeg',
         'gif'  => 'image/gif',
         'csv'  => 'text/csv',
+        'html' => 'text/html,application/xhtml+xml,*/*',
     ];
 
     protected $content;