Ignoring some bad network errors re Robby

This commit is contained in:
Jay McCarthy 2013-04-29 13:20:24 -06:00
parent bbd24edb54
commit 4b84fc7b48

View File

@ -73,40 +73,48 @@
(define conn
(new-connection config:initial-connection-timeout
ip op (current-custodian) #f))
;; HTTP/1.1 allows any number of requests to come from this input
;; port. However, there is no explicit cancellation of a
;; connection---the browser will just close the port. This leaves
;; the Web server in the unfortunate state of config:read-request
;; trying to read an HTTP and failing---with an ugly error
;; message. This call to peek here will block until at least one
;; character is available and then transfer to read-request. At
;; that point, an error message would be reasonable because the
;; request would be badly formatted or ended early. However, if
;; the connection is closed, then peek will get the EOF and the
;; connection will be closed. This shouldn't change any other
;; behavior: read-request is already blocking, peeking doesn't
;; consume a byte, etc.
(define the-evt
(choice-evt
(handle-evt
(port-closed-evt ip)
(λ (res)
(kill-connection! conn)))
(handle-evt
(peek-bytes-evt 1 0 #f ip)
(λ (res)
(cond
[(eof-object? res)
(kill-connection! conn)]
[else
(define-values
(req close?)
(config:read-request conn config:port port-addresses))
(set-connection-close?! conn close?)
(config:dispatch conn req)
(if (connection-close? conn)
(kill-connection! conn)
(connection-loop))])))))
(define (connection-loop)
(sync the-evt))
(connection-loop))
(with-handlers
([(λ (x)
;; This error is "Connection reset by peer" and doesn't
;; really indicate a problem with the server.
(and (exn:fail:network:errno? x)
(= 54 (exn:fail:network:errno-errno x))))
(λ (x)
(kill-connection! conn))])
;; HTTP/1.1 allows any number of requests to come from this input
;; port. However, there is no explicit cancellation of a
;; connection---the browser will just close the port. This leaves
;; the Web server in the unfortunate state of config:read-request
;; trying to read an HTTP and failing---with an ugly error
;; message. This call to peek here will block until at least one
;; character is available and then transfer to read-request. At
;; that point, an error message would be reasonable because the
;; request would be badly formatted or ended early. However, if
;; the connection is closed, then peek will get the EOF and the
;; connection will be closed. This shouldn't change any other
;; behavior: read-request is already blocking, peeking doesn't
;; consume a byte, etc.
(define the-evt
(choice-evt
(handle-evt
(port-closed-evt ip)
(λ (res)
(kill-connection! conn)))
(handle-evt
(peek-bytes-evt 1 0 #f ip)
(λ (res)
(cond
[(eof-object? res)
(kill-connection! conn)]
[else
(define-values
(req close?)
(config:read-request conn config:port port-addresses))
(set-connection-close?! conn close?)
(config:dispatch conn req)
(if (connection-close? conn)
(kill-connection! conn)
(connection-loop))])))))
(define (connection-loop)
(sync the-evt))
(connection-loop)))