Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
23be5dfb
S
spring-framework
项目概览
爱吃血肠
/
spring-framework
通知
1
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,发现更多精彩内容 >>
提交
23be5dfb
编写于
9月 12, 2019
作者:
R
Rossen Stoyanchev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Handle invalid MediaType in Jetty/Tomcat adapters
See: gh-23553
上级
b7eaab4c
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
35 addition
and
5 deletion
+35
-5
spring-web/src/main/java/org/springframework/http/server/reactive/AbstractServerHttpResponse.java
...work/http/server/reactive/AbstractServerHttpResponse.java
+7
-2
spring-web/src/main/java/org/springframework/http/server/reactive/JettyHttpHandlerAdapter.java
...amework/http/server/reactive/JettyHttpHandlerAdapter.java
+8
-1
spring-web/src/main/java/org/springframework/http/server/reactive/ServletServerHttpResponse.java
...ework/http/server/reactive/ServletServerHttpResponse.java
+12
-1
spring-web/src/main/java/org/springframework/http/server/reactive/TomcatHttpHandlerAdapter.java
...mework/http/server/reactive/TomcatHttpHandlerAdapter.java
+8
-1
未找到文件。
spring-web/src/main/java/org/springframework/http/server/reactive/AbstractServerHttpResponse.java
浏览文件 @
23be5dfb
...
...
@@ -262,8 +262,13 @@ public abstract class AbstractServerHttpResponse implements ServerHttpResponse {
protected
abstract
void
applyStatusCode
();
/**
* Apply header changes from {@link #getHeaders()} to the underlying response.
* This method is called once only.
* Invoked when the response is getting committed allowing sub-classes to
* make apply header values to the underlying response.
* <p>Note that most sub-classes use an {@link HttpHeaders} instance that
* wraps an adapter to the native response headers such that changes are
* propagated to the underlying response on the go. That means this callback
* is typically not used other than for specialized updates such as setting
* the contentType or characterEncoding fields in a Servlet response.
*/
protected
abstract
void
applyHeaders
();
...
...
spring-web/src/main/java/org/springframework/http/server/reactive/JettyHttpHandlerAdapter.java
浏览文件 @
23be5dfb
...
...
@@ -101,8 +101,15 @@ public class JettyHttpHandlerAdapter extends ServletHttpHandlerAdapter {
@Override
protected
void
applyHeaders
()
{
MediaType
contentType
=
getHeaders
().
getContentType
();
HttpServletResponse
response
=
getNativeResponse
();
MediaType
contentType
=
null
;
try
{
contentType
=
getHeaders
().
getContentType
();
}
catch
(
Exception
ex
)
{
String
rawContentType
=
getHeaders
().
getFirst
(
HttpHeaders
.
CONTENT_TYPE
);
response
.
setContentType
(
rawContentType
);
}
if
(
response
.
getContentType
()
==
null
&&
contentType
!=
null
)
{
response
.
setContentType
(
contentType
.
toString
());
}
...
...
spring-web/src/main/java/org/springframework/http/server/reactive/ServletServerHttpResponse.java
浏览文件 @
23be5dfb
...
...
@@ -118,7 +118,14 @@ class ServletServerHttpResponse extends AbstractListenerServerHttpResponse {
this
.
response
.
addHeader
(
headerName
,
headerValue
);
}
});
MediaType
contentType
=
getHeaders
().
getContentType
();
MediaType
contentType
=
null
;
try
{
contentType
=
getHeaders
().
getContentType
();
}
catch
(
Exception
ex
)
{
String
rawContentType
=
getHeaders
().
getFirst
(
HttpHeaders
.
CONTENT_TYPE
);
this
.
response
.
setContentType
(
rawContentType
);
}
if
(
this
.
response
.
getContentType
()
==
null
&&
contentType
!=
null
)
{
this
.
response
.
setContentType
(
contentType
.
toString
());
}
...
...
@@ -126,6 +133,10 @@ class ServletServerHttpResponse extends AbstractListenerServerHttpResponse {
if
(
this
.
response
.
getCharacterEncoding
()
==
null
&&
charset
!=
null
)
{
this
.
response
.
setCharacterEncoding
(
charset
.
name
());
}
long
contentLength
=
getHeaders
().
getContentLength
();
if
(
contentLength
!=
-
1
)
{
this
.
response
.
setContentLengthLong
(
contentLength
);
}
}
@Override
...
...
spring-web/src/main/java/org/springframework/http/server/reactive/TomcatHttpHandlerAdapter.java
浏览文件 @
23be5dfb
...
...
@@ -204,7 +204,14 @@ public class TomcatHttpHandlerAdapter extends ServletHttpHandlerAdapter {
@Override
protected
void
applyHeaders
()
{
HttpServletResponse
response
=
getNativeResponse
();
MediaType
contentType
=
getHeaders
().
getContentType
();
MediaType
contentType
=
null
;
try
{
contentType
=
getHeaders
().
getContentType
();
}
catch
(
Exception
ex
)
{
String
rawContentType
=
getHeaders
().
getFirst
(
HttpHeaders
.
CONTENT_TYPE
);
response
.
setContentType
(
rawContentType
);
}
if
(
response
.
getContentType
()
==
null
&&
contentType
!=
null
)
{
response
.
setContentType
(
contentType
.
toString
());
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录