Merge pull request #578 from spray/ticket/567

Ticket/567
spray · Oct 8, 2013 · 5ac8b64 · 5ac8b64
2 parents 0f0fdd2 + 09834d6
commit 5ac8b64
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/spray-can-tests/src/test/scala/spray/can/rendering/HttpDataRenderingSpec.scala b/spray-can-tests/src/test/scala/spray/can/rendering/HttpDataRenderingSpec.scala
@@ -9,7 +9,7 @@ import java.io.{ FileOutputStream, File }
 class HttpDataRenderingSpec extends Specification {
   val bytes = ByteString(Array.fill(10)('a'.toByte))
   val file = {
-    val res = File.createTempFile("test", "dat")
+    val res = File.createTempFile("test", "dat").getCanonicalFile
     val os = new FileOutputStream(res)
     os.write(Array.fill(2000)('b'.toByte))
     os.close()

diff --git a/spray-can/src/main/scala/spray/can/server/ServerFrontend.scala b/spray-can/src/main/scala/spray/can/server/ServerFrontend.scala
@@ -16,6 +16,7 @@
 
 package spray.can.server
 
+import scala.annotation.tailrec
 import scala.util.control.NonFatal
 import scala.concurrent.duration.Duration
 import akka.actor.ActorRef
@@ -124,7 +125,7 @@ private object ServerFrontend {
             case x: AckEventWithReceiver ⇒
               firstUnconfirmed = firstUnconfirmed handleSentAckAndReturnNextUnconfirmed x
 
-            case Tcp.CommandFailed(Tcp.Write(_, Tcp.NoAck(PartAndSender(part, responseSender)))) ⇒
+            case Tcp.CommandFailed(WriteCommandWithLastAck(Tcp.NoAck(PartAndSender(part, responseSender)))) ⇒
               // TODO: implement automatic checkpoint buffering and write resuming
               context.log.error("Could not write response part {}, closing connection", part)
               commandPL(Pipeline.Tell(responseSender, Http.SendFailed(part), context.self))
@@ -159,4 +160,16 @@ private object ServerFrontend {
         }
     }
   }
+
+  private object WriteCommandWithLastAck {
+    def unapply(cmd: Tcp.Command): Option[Event] = {
+      @tailrec def lastAck(c: Tcp.Command): Option[Event] =
+        c match {
+          case x: Tcp.SimpleWriteCommand  ⇒ Some(x.ack)
+          case Tcp.CompoundWrite(_, tail) ⇒ lastAck(tail)
+          case _                          ⇒ None
+        }
+      lastAck(cmd)
+    }
+  }
 }