Clean clack-handler-fcgi up.

fukamachi · Mar 25, 2015 · eb2aa0706c680f171d7b9b219c60d8271a678fd0 · eb2aa07
1 parent 0e37159
commit eb2aa0706c680f171d7b9b219c60d8271a678fd0
Unified Split

Showing with 58 additions and 97 deletions.

+1 −6 clack-handler-fcgi.asd

+0 −1 clack.asd

+57 −26 src/handler/fcgi.lisp

+0 −64 src/http-status.lisp
diff --git a/clack-handler-fcgi.asd b/clack-handler-fcgi.asd
@@ -21,14 +21,9 @@
  :version "0.3.1"
  :author "Eitaro Fukamachi"
  :license "LLGPL"
-  :depends-on (:clack
-               :cl-syntax
-               :cl-syntax-annot
-               :cl-fastcgi
+  :depends-on (:cl-fastcgi
               :alexandria
               :flexi-streams
-               :cl-ppcre
-               :split-sequence
               :usocket
               :quri)
  :components ((:file "src/handler/fcgi"))
diff --git a/clack.asd b/clack.asd
@@ -29,7 +29,6 @@
                :components
                ((:file "clack" :depends-on ("handler"))
                 (:file "handler" :depends-on ("util"))
-                 (:file "http-status")
                 (:file "util"))))
  :description "Web application environment for Common Lisp"
  :long-description
diff --git a/src/handler/fcgi.lisp b/src/handler/fcgi.lisp
@@ -1,38 +1,23 @@
-#|
-  This file is a part of Clack package.
-  URL: http://github.com/fukamachi/clack
-  Copyright (c) 2011 Eitaro Fukamachi <e.arrows@gmail.com>
-
-  Clack is freely distributable under the LLGPL License.
-|#
-
 (in-package :cl-user)
 (defpackage clack.handler.fcgi
  (:use :cl
        :cl-fastcgi)
-  (:import-from :clack.http-status
-                :http-status-reason)
  (:import-from :quri
-                :url-decode)
-  (:import-from :alexandria
-                :make-keyword
-                :when-let)
+                :url-decode
+                :uri-malformed-string)
  (:import-from :flexi-streams
-                :make-flexi-stream
                :make-in-memory-input-stream
                :string-to-octets)
-  (:import-from :cl-ppcre
-                :regex-replace-all)
  (:import-from :usocket
                :stream-server-usocket
                :socket-listen
                :socket-close)
-  (:import-from :split-sequence
-                :split-sequence))
+  (:import-from :alexandria
+                :make-keyword
+                :when-let)
+  (:export :run))
 (in-package :clack.handler.fcgi)

-(cl-syntax:use-syntax :annot)
-
 (defclass <fcgi-acceptor> ()
  ((port :type integer
         :initarg :port
@@ -58,7 +43,6 @@
      (setf (acceptor-file-descriptor acceptor)
            (cl-fastcgi::usocket-to-fd socket)))))

-@export
 (defun run (app &key (debug t) (port 9000) fd)
  "Start FastCGI server."
  (flet ((main-loop (req)
@@ -83,7 +67,6 @@
        (stop acceptor))
      acceptor)))

-@export
 (defun stop (acceptor)
  (when-let (socket (acceptor-socket acceptor))
    (usocket:socket-close socket)))
@@ -217,7 +200,55 @@ before passing to Clack application."
                                                       do (vector-push val buf))
                                              finally
                                                 (return
-                                                   (flex:make-flexi-stream
-                                                    (flex:make-in-memory-input-stream buf)
-                                                    :external-format :utf-8)))
+                                                   (flex:make-in-memory-input-stream buf)))
                              :clack.streaming t)))))))
+
+(defvar *http-status* (make-hash-table :test #'eql))
+
+(macrolet ((def-http-status (code phrase)
+             `(setf (gethash ,code *http-status*) ,phrase)))
+  (def-http-status 100 "Continue")
+  (def-http-status 101 "Switching Protocols")
+  (def-http-status 200 "OK")
+  (def-http-status 201 "Created")
+  (def-http-status 202 "Accepted")
+  (def-http-status 203 "Non-Authoritative Information")
+  (def-http-status 204 "No Content")
+  (def-http-status 205 "Reset Content")
+  (def-http-status 206 "Partial Content")
+  (def-http-status 207 "Multi-Status")
+  (def-http-status 300 "Multiple Choices")
+  (def-http-status 301 "Moved Permanently")
+  (def-http-status 302 "Moved Temporarily")
+  (def-http-status 303 "See Other")
+  (def-http-status 304 "Not Modified")
+  (def-http-status 305 "Use Proxy")
+  (def-http-status 307 "Temporary Redirect")
+  (def-http-status 400 "Bad Request")
+  (def-http-status 401 "Authorization Required")
+  (def-http-status 402 "Payment Required")
+  (def-http-status 403 "Forbidden")
+  (def-http-status 404 "Not Found")
+  (def-http-status 405 "Method Not Allowed")
+  (def-http-status 406 "Not Acceptable")
+  (def-http-status 407 "Proxy Authentication Required")
+  (def-http-status 408 "Request Time-out")
+  (def-http-status 409 "Conflict")
+  (def-http-status 410 "Gone")
+  (def-http-status 411 "Length Required")
+  (def-http-status 412 "Precondition Failed")
+  (def-http-status 413 "Request Entity Too Large")
+  (def-http-status 414 "Request-URI Too Large")
+  (def-http-status 415 "Unsupported Media Type")
+  (def-http-status 416 "Requested range not satisfiable")
+  (def-http-status 417 "Expectation Failed")
+  (def-http-status 424 "Failed Dependency")
+  (def-http-status 500 "Internal Server Error")
+  (def-http-status 501 "Not Implemented")
+  (def-http-status 502 "Bad Gateway")
+  (def-http-status 503 "Service Unavailable")
+  (def-http-status 504 "Gateway Time-out")
+  (def-http-status 505 "Version not supported"))
+
+(defun http-status-reason (code)
+  (gethash code *http-status*))
diff --git a/src/http-status.lisp b/src/http-status.lisp
@@ -1,64 +0,0 @@
-#|
-  This file is a part of Clack package.
-  URL: http://github.com/fukamachi/clack
-  Copyright (c) 2011 Eitaro Fukamachi <e.arrows@gmail.com>
-
-  Clack is freely distributable under the LLGPL License.
-|#
-
-(in-package :cl-user)
-(defpackage clack.http-status
-  (:use :cl)
-  (:export :*http-status*
-           :http-status-reason))
-(in-package :clack.http-status)
-
-(defvar *http-status* (make-hash-table :test #'eql))
-
-(macrolet ((def-http-status (code phrase)
-             `(setf (gethash ,code *http-status*) ,phrase)))
-  (def-http-status 100 "Continue")
-  (def-http-status 101 "Switching Protocols")
-  (def-http-status 200 "OK")
-  (def-http-status 201 "Created")
-  (def-http-status 202 "Accepted")
-  (def-http-status 203 "Non-Authoritative Information")
-  (def-http-status 204 "No Content")
-  (def-http-status 205 "Reset Content")
-  (def-http-status 206 "Partial Content")
-  (def-http-status 207 "Multi-Status")
-  (def-http-status 300 "Multiple Choices")
-  (def-http-status 301 "Moved Permanently")
-  (def-http-status 302 "Moved Temporarily")
-  (def-http-status 303 "See Other")
-  (def-http-status 304 "Not Modified")
-  (def-http-status 305 "Use Proxy")
-  (def-http-status 307 "Temporary Redirect")
-  (def-http-status 400 "Bad Request")
-  (def-http-status 401 "Authorization Required")
-  (def-http-status 402 "Payment Required")
-  (def-http-status 403 "Forbidden")
-  (def-http-status 404 "Not Found")
-  (def-http-status 405 "Method Not Allowed")
-  (def-http-status 406 "Not Acceptable")
-  (def-http-status 407 "Proxy Authentication Required")
-  (def-http-status 408 "Request Time-out")
-  (def-http-status 409 "Conflict")
-  (def-http-status 410 "Gone")
-  (def-http-status 411 "Length Required")
-  (def-http-status 412 "Precondition Failed")
-  (def-http-status 413 "Request Entity Too Large")
-  (def-http-status 414 "Request-URI Too Large")
-  (def-http-status 415 "Unsupported Media Type")
-  (def-http-status 416 "Requested range not satisfiable")
-  (def-http-status 417 "Expectation Failed")
-  (def-http-status 424 "Failed Dependency")
-  (def-http-status 500 "Internal Server Error")
-  (def-http-status 501 "Not Implemented")
-  (def-http-status 502 "Bad Gateway")
-  (def-http-status 503 "Service Unavailable")
-  (def-http-status 504 "Gateway Time-out")
-  (def-http-status 505 "Version not supported"))
-
-(defun http-status-reason (code)
-  (gethash code *http-status*))