raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Revert "=str Remove manual hostname verifier support, used to be included only because Java 6 (#22320)"

Browse source 
Let's revert this until we have decided in #22345 what to do exactly
about it. We will still introduce an overload of TLS.apply that works
without specifying a `verifySession` function.

This reverts commit 021829e21e.

Conflicts:
	project/MiMa.scala
This commit is contained in:
Johannes Rudolph 2017-02-23 12:00:54 +01:00
parent b2759ab56a
commit e4491a05cf
6 changed files with 38 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

2
akka-stream/src/main/scala/akka/stream/impl/ActorMaterializerImpl.scala
View file

@ -197,7 +197,7 @@ private[akka] case class ActorMaterializerImpl(
case tls: TlsModule ⇒ // TODO solve this so TlsModule doesn't need special treatment here
val es = effectiveSettings(effectiveAttributes)
val props =
TLSActor.props(es, tls.createSSLEngine, tls.closing)
TLSActor.props(es, tls.createSSLEngine, tls.verifySession, tls.closing)
val impl = actorOf(props, stageName(effectiveAttributes), es.dispatcher)
def factory(id: Int) = new ActorPublisher[Any](impl) {
override val wakeUpMsg = FanOut.SubstreamSubscribePending(id)