Merge commit 'a5cbbaa66a'

THANKS

@@ -192,6 +192,7 @@ For fixes or providing information which led to a fix:
            Andy Wingo
           Keith Wright
         William Xu
+         Atom X Zane
 
 
 ;; Local Variables:

doc/ref/api-evaluation.texi

@@ -238,7 +238,7 @@ comments as specified by R6RS and
 @url{http://srfi.schemers.org/srfi-30/srfi-30.html, SRFI-30}:
 
 @lisp
-(+  #| this is a #| nested |# block comment |# 2)
+(+ 1 #| this is a #| nested |# block comment |# 2)
 @result{} 3
 @end lisp
 

module/system/repl/server.scm

@@ -67,27 +67,10 @@
     (bind sock AF_UNIX path)
     sock))
 
-(define call-with-sigint
-  (if (not (provided? 'posix))
-      (lambda (thunk) (thunk))
-      (lambda (thunk)
-        (let ((handler #f))
-          (dynamic-wind
-            (lambda ()
-              (set! handler
-                    (sigaction SIGINT (lambda (sig) (throw 'interrupt)))))
-            thunk
-            (lambda ()
-              (if handler
-                  ;; restore Scheme handler, SIG_IGN or SIG_DFL.
-                  (sigaction SIGINT (car handler) (cdr handler))
-                  ;; restore original C handler.
-                  (sigaction SIGINT #f))))))))
-
 (define* (run-server #:optional (server-socket (make-tcp-server-socket)))
   (define (accept-new-client)
     (catch #t
-      (lambda () (call-with-sigint (lambda () (accept server-socket))))
+      (lambda () (accept server-socket))
       (lambda (k . args)
         (cond
          ((port-closed? server-socket)

module/web/http.scm

@@ -918,10 +918,10 @@ as an ordered alist."
 
 (define (write-credentials val port)
   (display (car val) port)
-  (if (pair? (cdr val))
-      (begin
   (display #\space port)
-        (write-key-value-list (cdr val) port))))
+  (case (car val)
+    ((basic) (display (cdr val) port))
+    (else (write-key-value-list (cdr val) port))))
 
 ;; challenges = 1#challenge
 ;; challenge = auth-scheme 1*SP 1#auth-param

test-suite/tests/web-http.test

@@ -49,14 +49,14 @@
 (define-syntax pass-if-round-trip
   (syntax-rules ()
     ((_ str)
-     (pass-if (format #f "~s round trip" str)
+     (pass-if-equal (format #f "~s round trip" str)
-       (equal? (call-with-output-string
+         str
+       (call-with-output-string
         (lambda (port)
           (call-with-values
               (lambda () (read-header (open-input-string str)))
             (lambda (sym val)
-                      (write-header sym val port)))))
+              (write-header sym val port)))))))))
-               str)))))
 
 (define-syntax pass-if-any-error
   (syntax-rules ()
@@ -292,6 +292,9 @@
   (pass-if-parse authorization "Digest foooo" '(digest foooo))
   (pass-if-parse authorization "Digest foo=bar,baz=qux"
                  '(digest (foo . "bar") (baz . "qux")))
+  (pass-if-round-trip "Authorization: basic foooo\r\n")
+  (pass-if-round-trip "Authorization: digest foooo\r\n")
+  (pass-if-round-trip "Authorization: digest foo=bar, baz=qux\r\n")
   (pass-if-parse expect "100-continue, foo" '((100-continue) (foo)))
   (pass-if-parse from "foo@bar" "foo@bar")
   (pass-if-parse host "qux" '("qux" . #f))