~ chicken-core (chicken-5) 6ad1eccabb26e93c2129efe9979f3797497acba2

commit 6ad1eccabb26e93c2129efe9979f3797497acba2
Merge: d5f7ef25 2a2656ca
Author:     felix <felix@call-with-current-continuation.org>
AuthorDate: Sat Apr 30 22:38:56 2011 +0200
Commit:     felix <felix@call-with-current-continuation.org>
CommitDate: Sat Apr 30 22:38:56 2011 +0200

    resolved conflicts

diff --cc setup-download.scm
index ca1c171e,ba31bafe..4edf6044
--- a/setup-download.scm
+++ b/setup-download.scm
@@@ -360,10 -360,11 +360,16 @@@
  
    (define (read-chunks in)
      (let get-chunks ([data '()])
-       (let ((size (string->number (read-line in) 16)))
 +	(cond ((not size)
 +	       (error "invalid response from server - please try again"))
 +              ((zero? size)
+       (let* ((szln (read-line in))
+ 	     ;;XXX workaround for "read-line" dropping the "\n" in certain situations
+ 	     ;;    (#568)
+ 	     (size (string->number (string-chomp szln "\r") 16)))
 -	(cond ((zero? size)
++	(cond ((not size)
++	       (error "invalid response from server - please try again"))
++	      ((zero? size)
  	       (d "~%")
  	       (string-concatenate-reverse data))
  	      (else