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

Merge pull request #19219 from ktoso/wip-sslconfig-ktoso

Browse source 
Apply ssl-config and include hostname validation
This commit is contained in:
Konrad Malawski 2015-12-21 14:41:40 +01:00
commit 59a079d1f2
12 changed files with 189 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

3
akka-http-tests/src/test/scala/akka/http/scaladsl/server/directives/FileUploadDirectivesSpec.scala
View file

@ -5,7 +5,6 @@
package akka.http.scaladsl.server.directives
import java.io.{ FileInputStream, File }
import java.nio.charset.StandardCharsets
import akka.http.scaladsl.model._
import akka.http.scaladsl.server.{ MissingFormFieldRejection, RoutingSpec }
import akka.util.ByteString
@ -145,7 +144,7 @@ class FileUploadDirectivesSpec extends RoutingSpec {
try {
val buffer = new Array[Byte](1024)
in.read(buffer)
new String(buffer, StandardCharsets.UTF_8)
new String(buffer, "UTF-8")
} finally {
in.close()
}