Author: psmith Date: Wed Jan 3 23:10:39 2007 New Revision: 24
Modified: branches/home/psmith/restructure/src/io/async-fd.lisp branches/home/psmith/restructure/src/io/nio.asd branches/home/psmith/restructure/src/protocol/http/http-state-machine.lisp Log: Corrected packet defn
Modified: branches/home/psmith/restructure/src/io/async-fd.lisp ============================================================================== --- branches/home/psmith/restructure/src/io/async-fd.lisp (original) +++ branches/home/psmith/restructure/src/io/async-fd.lisp Wed Jan 3 23:10:39 2007 @@ -99,20 +99,8 @@ (with-slots (close-pending) async-fd (setf close-pending t)))
- -(defclass packet () - ((buffer :initarg :buffer :initform nil :documentation "Foreign array") - (size :initarg :size :initform 0) - (written :initarg :written :initform 0))) - - ;;; FUNCTIONS
- - - - - (define-condition read-error (error) ())
;; "Read more data from STATE-MACHINE."
Modified: branches/home/psmith/restructure/src/io/nio.asd ============================================================================== --- branches/home/psmith/restructure/src/io/nio.asd (original) +++ branches/home/psmith/restructure/src/io/nio.asd Wed Jan 3 23:10:39 2007 @@ -6,6 +6,7 @@
:components ((:file "nio-package") (:file "fd-helper" :depends-on ("nio-package")) + (:file "packet" :depends-on ("nio-package")) (:file "async-fd" :depends-on ("fd-helper")) (:file "async-socket" :depends-on ("async-fd")) (:file "nio-server" :depends-on ("async-socket"))
Modified: branches/home/psmith/restructure/src/protocol/http/http-state-machine.lisp ============================================================================== --- branches/home/psmith/restructure/src/protocol/http/http-state-machine.lisp (original) +++ branches/home/psmith/restructure/src/protocol/http/http-state-machine.lisp Wed Jan 3 23:10:39 2007 @@ -38,13 +38,10 @@ (defmethod process-read((sm http-state-machine)) (with-slots (foreign-read-buffer foreign-write-buffer) sm #+nio-debug (format t "process-read got: ~A~%" (get-string foreign-read-buffer)) -;;todo create packet and get-bytes (nio-buffer:map-to-foreign foreign-write-buffer (get-bytes (http-response :status :ok :html "<html> ock </html>"))) (close-sm sm)))
-;;end TODO - (defun page-not-found (client) (serve-content client :not-found "text/html" (string-to-octets "<html><body><h3>404 Page not found</h3>The requested URL was not found on this server.</body></html>")))