[Guile-commits] GNU Guile branch, master, updated. release_1-9-13-182-gec3c757

[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=ec3c7570d86bedfa52e4c3c0628dfe11b63f8d51

The branch, master has been updated
       via  ec3c7570d86bedfa52e4c3c0628dfe11b63f8d51 (commit)
      from  c7857da63ada7449ab18834b8f2f17e07bd6d728 (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 ec3c7570d86bedfa52e4c3c0628dfe11b63f8d51
Author: Andy Wingo <address@hidden>
Date:   Sun Dec 12 21:59:29 2010 +0100

    http-read robustness
    
    * module/web/server/http.scm (http-read): Record the client index in
      more cases in which code could throw an error.

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

Summary of changes:
 module/web/server/http.scm |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/module/web/server/http.scm b/module/web/server/http.scm
index 0cbf43b..e9d612b 100644
--- a/module/web/server/http.scm
+++ b/module/web/server/http.scm
@@ -84,6 +84,7 @@
             (lp (1- (poll-set-nfds poll-set))))
            ((not (zero? (logand revents *error-events*)))
             ;; An error.
+            (set-http-poll-idx! server idx)
             (throw 'interrupt))
            (else
             ;; A new client. Add to set, poll, and loop.
@@ -104,6 +105,9 @@
          ;; it. Remove it from the poll set.
          (else
           (let ((port (poll-set-remove! poll-set idx)))
+            ;; Record the next index in all cases, in case the EOF check
+            ;; throws an error.
+            (set-http-poll-idx! server (1- idx))
             (cond
              ((eof-object? (peek-char port))
               ;; EOF.
@@ -111,8 +115,6 @@
               (lp (1- idx)))
              (else
               ;; Otherwise, try to read a request from this port.
-              ;; Record the next index.
-              (set-http-poll-idx! server (1- idx))
               (with-throw-handler
                #t
                (lambda ()


hooks/post-receive
-- 
GNU Guile