[Guile-commits] GNU Guile branch, master, updated. v2.1.0-14-ge4c785f

[Andy Wingo]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".

http://git.savannah.gnu.org/cgit/guile.git/commit/?id=e4c785f5df307d7119af8ec28160faf479ffcda0

The branch, master has been updated
       via  e4c785f5df307d7119af8ec28160faf479ffcda0 (commit)
       via  2263ccb53e6017cc89ccb69556a69d3ae7c2ff3b (commit)
      from  a41bed83ab2d2f0bf93c06115c695280d04d13e6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e4c785f5df307d7119af8ec28160faf479ffcda0
Merge: a41bed8 2263ccb
Author: Andy Wingo <address@hidden>
Date:   Sat Feb 11 18:28:37 2012 +0100

    Merge remote-tracking branch 'origin/stable-2.0'

-----------------------------------------------------------------------

Summary of changes:
 module/web/server.scm |   24 ++++++++----------------
 1 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/module/web/server.scm b/module/web/server.scm
index ef6879e..b9bdef2 100644
--- a/module/web/server.scm
+++ b/module/web/server.scm
@@ -1,6 +1,6 @@
 ;;; Web server
 
-;; Copyright (C)  2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C)  2010, 2011, 2012 Free Software Foundation, Inc.
 
 ;; This library is free software; you can redistribute it and/or
 ;; modify it under the terms of the GNU Lesser General Public
@@ -159,11 +159,8 @@ values."
    (lambda ()
      ((server-impl-read impl) server))
    #:pass-keys '(quit interrupt)
-   #:on-error (if (batch-mode?) 'pass 'debug)
-   #:post-error
-   (lambda (k . args)
-     (warn "Error while accepting client" k args)
-     (values #f #f #f))))
+   #:on-error (if (batch-mode?) 'backtrace 'debug)
+   #:post-error (lambda _ (values #f #f #f))))
 
 ;; like call-with-output-string, but actually closes the port (doh)
 (define (call-with-output-string* proc)
@@ -306,11 +303,9 @@ in, allowing the user's handler to explicitly manage its 
state."
              (debug-elapsed 'sanitize)
              (values response body state))))))
    #:pass-keys '(quit interrupt)
-   #:on-error (if (batch-mode?) 'pass 'debug)
-   #:post-error
-   (lambda (k . args)
-     (warn "Error handling request" k args)
-     (values (build-response #:code 500) #f state))))
+   #:on-error (if (batch-mode?) 'backtrace 'debug)
+   #:post-error (lambda _
+                  (values (build-response #:code 500) #f state))))
 
 ;; -> unspecified values
 (define (write-client impl server client response body)
@@ -322,11 +317,8 @@ attaching it to the @var{server} argument somehow."
    (lambda ()
      ((server-impl-write impl) server client response body))
    #:pass-keys '(quit interrupt)
-   #:on-error (if (batch-mode?) 'pass 'debug)
-   #:post-error
-   (lambda (k . args)
-     (warn "Error while writing response" k args)
-     (values))))
+   #:on-error (if (batch-mode?) 'backtrace 'debug)
+   #:post-error (lambda _ (values))))
 
 ;; -> unspecified values
 (define (close-server impl server)


hooks/post-receive
-- 
GNU Guile