Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
dbce3731
Commit
dbce3731
authored
Jan 31, 2019
by
ayudovin
Committed by
Andy Wilkinson
Feb 11, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Set NO_REQUEST_TIMEOUT as a server option not a socket option
See gh-15822
parent
93a6dfd7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
1 deletion
+15
-1
UndertowWebServerFactoryCustomizer.java
...gure/web/embedded/UndertowWebServerFactoryCustomizer.java
+2
-1
UndertowWebServerFactoryCustomizerTests.java
...web/embedded/UndertowWebServerFactoryCustomizerTests.java
+13
-0
No files found.
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/embedded/UndertowWebServerFactoryCustomizer.java
View file @
dbce3731
...
@@ -37,6 +37,7 @@ import org.springframework.util.unit.DataSize;
...
@@ -37,6 +37,7 @@ import org.springframework.util.unit.DataSize;
* @author Yulin Qin
* @author Yulin Qin
* @author Stephane Nicoll
* @author Stephane Nicoll
* @author Phillip Webb
* @author Phillip Webb
* @author Arstiom Yudovin
* @since 2.0.0
* @since 2.0.0
*/
*/
public
class
UndertowWebServerFactoryCustomizer
implements
public
class
UndertowWebServerFactoryCustomizer
implements
...
@@ -106,7 +107,7 @@ public class UndertowWebServerFactoryCustomizer implements
...
@@ -106,7 +107,7 @@ public class UndertowWebServerFactoryCustomizer implements
private
void
customizeConnectionTimeout
(
ConfigurableUndertowWebServerFactory
factory
,
private
void
customizeConnectionTimeout
(
ConfigurableUndertowWebServerFactory
factory
,
Duration
connectionTimeout
)
{
Duration
connectionTimeout
)
{
factory
.
addBuilderCustomizers
((
builder
)
->
builder
.
setS
ocket
Option
(
factory
.
addBuilderCustomizers
((
builder
)
->
builder
.
setS
erver
Option
(
UndertowOptions
.
NO_REQUEST_TIMEOUT
,
(
int
)
connectionTimeout
.
toMillis
()));
UndertowOptions
.
NO_REQUEST_TIMEOUT
,
(
int
)
connectionTimeout
.
toMillis
()));
}
}
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/embedded/UndertowWebServerFactoryCustomizerTests.java
View file @
dbce3731
...
@@ -47,6 +47,7 @@ import static org.mockito.Mockito.verify;
...
@@ -47,6 +47,7 @@ import static org.mockito.Mockito.verify;
*
*
* @author Brian Clozel
* @author Brian Clozel
* @author Phillip Webb
* @author Phillip Webb
* @author Artsiom Yudovin
*/
*/
public
class
UndertowWebServerFactoryCustomizerTests
{
public
class
UndertowWebServerFactoryCustomizerTests
{
...
@@ -143,6 +144,18 @@ public class UndertowWebServerFactoryCustomizerTests {
...
@@ -143,6 +144,18 @@ public class UndertowWebServerFactoryCustomizerTests {
assertThat
(
map
.
contains
(
UndertowOptions
.
MAX_HEADER_SIZE
)).
isFalse
();
assertThat
(
map
.
contains
(
UndertowOptions
.
MAX_HEADER_SIZE
)).
isFalse
();
}
}
@Test
public
void
customConnectionTimeout
()
{
bind
(
"server.connection-timeout=100"
);
Builder
builder
=
Undertow
.
builder
();
ConfigurableUndertowWebServerFactory
factory
=
mockFactory
(
builder
);
this
.
customizer
.
customize
(
factory
);
OptionMap
map
=
((
OptionMap
.
Builder
)
ReflectionTestUtils
.
getField
(
builder
,
"serverOptions"
)).
getMap
();
assertThat
(
map
.
contains
(
UndertowOptions
.
NO_REQUEST_TIMEOUT
)).
isTrue
();
assertThat
(
map
.
get
(
UndertowOptions
.
NO_REQUEST_TIMEOUT
)).
isEqualTo
(
100
);
}
private
ConfigurableUndertowWebServerFactory
mockFactory
(
Builder
builder
)
{
private
ConfigurableUndertowWebServerFactory
mockFactory
(
Builder
builder
)
{
ConfigurableUndertowWebServerFactory
factory
=
mock
(
ConfigurableUndertowWebServerFactory
factory
=
mock
(
ConfigurableUndertowWebServerFactory
.
class
);
ConfigurableUndertowWebServerFactory
.
class
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment