Browse Source

Merge branch '5.2.x'

pull/25292/head
Brian Clozel 6 years ago
parent
commit
e0e1c12402
  1. 7
      spring-web/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpRequest.java

7
spring-web/src/main/java/org/springframework/http/server/reactive/ReactorServerHttpRequest.java

@ -23,6 +23,7 @@ import java.util.concurrent.atomic.AtomicLong; @@ -23,6 +23,7 @@ import java.util.concurrent.atomic.AtomicLong;
import javax.net.ssl.SSLSession;
import io.netty.channel.Channel;
import io.netty.handler.codec.http.HttpHeaderNames;
import io.netty.handler.codec.http.cookie.Cookie;
import io.netty.handler.ssl.SslHandler;
@ -160,7 +161,11 @@ class ReactorServerHttpRequest extends AbstractServerHttpRequest { @@ -160,7 +161,11 @@ class ReactorServerHttpRequest extends AbstractServerHttpRequest {
@Override
@Nullable
protected SslInfo initSslInfo() {
SslHandler sslHandler = ((Connection) this.request).channel().pipeline().get(SslHandler.class);
Channel channel = ((Connection) this.request).channel();
SslHandler sslHandler = channel.pipeline().get(SslHandler.class);
if (sslHandler == null && channel.parent() != null) { // HTTP/2
sslHandler = channel.parent().pipeline().get(SslHandler.class);
}
if (sslHandler != null) {
SSLSession session = sslHandler.engine().getSession();
return new DefaultSslInfo(session);

Loading…
Cancel
Save