Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
hk581
spring-framework
提交
f7f2327f
S
spring-framework
项目概览
hk581
/
spring-framework
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
spring-framework
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
f7f2327f
编写于
5月 29, 2016
作者:
J
Juergen Hoeller
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ServletServerHttpRequest.getHeaders() ignores invalid content type
Issue: SPR-14309
上级
98eaf05c
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
26 addition
and
16 deletion
+26
-16
spring-web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java
...springframework/http/server/ServletServerHttpRequest.java
+26
-16
未找到文件。
spring-web/src/main/java/org/springframework/http/server/ServletServerHttpRequest.java
浏览文件 @
f7f2327f
...
...
@@ -37,6 +37,7 @@ import javax.servlet.http.HttpServletRequest;
import
org.springframework.http.HttpHeaders
;
import
org.springframework.http.HttpMethod
;
import
org.springframework.http.InvalidMediaTypeException
;
import
org.springframework.http.MediaType
;
import
org.springframework.util.Assert
;
import
org.springframework.util.LinkedCaseInsensitiveMap
;
...
...
@@ -104,6 +105,7 @@ public class ServletServerHttpRequest implements ServerHttpRequest {
public
HttpHeaders
getHeaders
()
{
if
(
this
.
headers
==
null
)
{
this
.
headers
=
new
HttpHeaders
();
for
(
Enumeration
<?>
headerNames
=
this
.
servletRequest
.
getHeaderNames
();
headerNames
.
hasMoreElements
();)
{
String
headerName
=
(
String
)
headerNames
.
nextElement
();
for
(
Enumeration
<?>
headerValues
=
this
.
servletRequest
.
getHeaders
(
headerName
);
...
...
@@ -112,26 +114,33 @@ public class ServletServerHttpRequest implements ServerHttpRequest {
this
.
headers
.
add
(
headerName
,
headerValue
);
}
}
// HttpServletRequest exposes some headers as properties: we should include those if not already present
MediaType
contentType
=
this
.
headers
.
getContentType
();
if
(
contentType
==
null
)
{
String
requestContentType
=
this
.
servletRequest
.
getContentType
();
if
(
StringUtils
.
hasLength
(
requestContentType
))
{
contentType
=
MediaType
.
parseMediaType
(
requestContentType
);
this
.
headers
.
setContentType
(
contentType
);
try
{
MediaType
contentType
=
this
.
headers
.
getContentType
();
if
(
contentType
==
null
)
{
String
requestContentType
=
this
.
servletRequest
.
getContentType
();
if
(
StringUtils
.
hasLength
(
requestContentType
))
{
contentType
=
MediaType
.
parseMediaType
(
requestContentType
);
this
.
headers
.
setContentType
(
contentType
);
}
}
}
if
(
contentType
!=
null
&&
contentType
.
getCharset
()
==
null
)
{
String
requestEncoding
=
this
.
servletRequest
.
getCharacterEncoding
();
if
(
StringUtils
.
hasLength
(
requestEncoding
))
{
Charset
charSet
=
Charset
.
forName
(
requestEncoding
);
Map
<
String
,
String
>
params
=
new
LinkedCaseInsensitiveMap
<
String
>(
);
params
.
putAll
(
contentType
.
getParameters
());
params
.
put
(
"charset"
,
charSet
.
toString
()
);
MediaType
newContentType
=
new
MediaType
(
contentType
.
getType
(),
contentType
.
getSubtype
(),
params
);
this
.
headers
.
setContentType
(
newContentType
);
if
(
contentType
!=
null
&&
contentType
.
getCharset
()
==
null
)
{
String
requestEncoding
=
this
.
servletRequest
.
getCharacterEncoding
();
if
(
StringUtils
.
hasLength
(
requestEncoding
))
{
Charset
charSet
=
Charset
.
forName
(
requestEncoding
);
Map
<
String
,
String
>
params
=
new
LinkedCaseInsensitiveMap
<
String
>(
);
params
.
putAll
(
contentType
.
getParameters
()
);
params
.
put
(
"charset"
,
charSet
.
toString
());
MediaType
newContentType
=
new
MediaType
(
contentType
.
getType
(),
contentType
.
getSubtype
(),
params
);
this
.
headers
.
setContentType
(
newContentType
);
}
}
}
catch
(
InvalidMediaTypeException
ex
)
{
// Ignore: simply not exposing an invalid content type in HttpHeaders...
}
if
(
this
.
headers
.
getContentLength
()
<
0
)
{
int
requestContentLength
=
this
.
servletRequest
.
getContentLength
();
if
(
requestContentLength
!=
-
1
)
{
...
...
@@ -139,6 +148,7 @@ public class ServletServerHttpRequest implements ServerHttpRequest {
}
}
}
return
this
.
headers
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录