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

Merge branch 'ticket-812'

Browse source
This commit is contained in:
Viktor Klang 2011-04-28 16:01:23 +02:00
commit e916c98075
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
akka-http/src/main/scala/akka/security/Security.scala
View file

@ -182,7 +182,7 @@ trait AuthenticationActor[C <: Credentials] extends Actor {
* Responsible for the execution flow of authentication
*
* Credentials are extracted and verified from the request,
* and a se3curity context is created for the ContainerRequest
* and a security context is created for the ContainerRequest
* this should ensure good integration with current Jersey security
*/
protected val authenticate: Receive = {

2
akka-http/src/test/scala/config/ConfigSpec.scala
View file

@ -19,7 +19,7 @@ class ConfigSpec extends WordSpec with MustMatchers {
getString("akka.http.authenticator") must equal(Some("N/A"))
getBool("akka.http.connection-close") must equal(Some(true))
getString("akka.http.expired-header-name") must equal(Some("Async-Timeout"))
getList("akka.http.filters") must equal(List("se.scalablesolutions.akka.security.AkkaSecurityFilterFactory"))
getList("akka.http.filters") must equal(List("akka.security.AkkaSecurityFilterFactory"))
getList("akka.http.resource-packages") must equal(Nil)
getString("akka.http.hostname") must equal(Some("localhost"))
getString("akka.http.expired-header-value") must equal(Some("expired"))