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
72f74d0b
Commit
72f74d0b
authored
Jul 09, 2018
by
Brian Clozel
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #13728 from dreis2211:fix-netty-reactive-tests
* pr/13728: Fix API adaptation changes for Reactor Netty
parents
60457f1d
d1acf9a2
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
1 deletion
+3
-1
SslServerCustomizer.java
...ramework/boot/web/embedded/netty/SslServerCustomizer.java
+3
-1
No files found.
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/netty/SslServerCustomizer.java
View file @
72f74d0b
...
...
@@ -26,6 +26,7 @@ import javax.net.ssl.TrustManagerFactory;
import
io.netty.handler.ssl.ClientAuth
;
import
io.netty.handler.ssl.SslContextBuilder
;
import
reactor.netty.http.server.HttpServer
;
import
reactor.netty.tcp.SslProvider.DefaultConfigurationType
;
import
org.springframework.boot.web.server.Ssl
;
import
org.springframework.boot.web.server.SslStoreProvider
;
...
...
@@ -52,7 +53,8 @@ public class SslServerCustomizer implements NettyServerCustomizer {
public
HttpServer
apply
(
HttpServer
server
)
{
try
{
return
server
.
secure
((
contextSpec
)
->
contextSpec
.
sslContext
(
getContextBuilder
()));
.
secure
((
contextSpec
)
->
contextSpec
.
sslContext
(
getContextBuilder
())
.
defaultConfiguration
(
DefaultConfigurationType
.
NONE
));
}
catch
(
Exception
ex
)
{
throw
new
IllegalStateException
(
ex
);
...
...
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