Commit 28357ea8 authored by Dave Cooper's avatar Dave Cooper

reverted external-format for aserve startup to :utf8-base for allegro, :utf-8 otherwise

parent d7a9bd04
...@@ -417,9 +417,9 @@ ...@@ -417,9 +417,9 @@
(setq mac-option-modifier nil) (setq mac-option-modifier nil)
(setq mac-command-modifier 'meta)))) (setq mac-command-modifier 'meta))))
;;(when (eql system-type 'darwin) (when (eql system-type 'darwin)
;; (mac-switch-meta) (mac-switch-meta)
;; (mac-switch-meta)) (mac-switch-meta))
;; A. REFERENCES ;; A. REFERENCES
......
...@@ -237,6 +237,9 @@ ...@@ -237,6 +237,9 @@
(with-http-response ((the req) (the ent) :content-type "text/xml") (with-http-response ((the req) (the ent) :content-type "text/xml")
(with-http-body ((the req) (the ent)) (with-http-body ((the req) (the ent))
(with-html-output (*html-stream* nil) (with-html-output (*html-stream* nil)
(when *debug?* (print-variables (socket:remote-host (net.aserve:request-socket (the req)))))
(:document (:document
(mapc #'(lambda(replace-pair js-to-eval-status) (mapc #'(lambda(replace-pair js-to-eval-status)
(declare (ignore js-to-eval-status)) ;; this can play into the flag (declare (ignore js-to-eval-status)) ;; this can play into the flag
......
...@@ -104,7 +104,9 @@ ...@@ -104,7 +104,9 @@
(with-http-body (req ent) (with-http-body (req ent)
(when (null (getf header-plist :location)) (when (null (getf header-plist :location))
(let ((*req* req) (*ent* ent) (*skin* skin)) (let ((*req* req) (*ent* ent) (*skin* skin))
(when *debug?* (print-variables (socket:remote-host (net.aserve:request-socket req))))
(the-object respondent (:before-present!)) (the-object respondent (:before-present!))
(let ((*stream* *html-stream*)) (let ((*stream* *html-stream*))
(the-object respondent (:write-html-sheet))) (the-object respondent (:write-html-sheet)))
......
...@@ -105,8 +105,8 @@ Perhaps a zombie process is holding port ~a?~%" port port)) ...@@ -105,8 +105,8 @@ Perhaps a zombie process is holding port ~a?~%" port port))
(handler-case (handler-case
(let ((sock (usocket:socket-listen "localhost" port))) (let ((sock (usocket:socket-listen "localhost" port)))
(usocket:socket-close sock)) (usocket:socket-close sock))
(usocket:address-in-use-error (e) :in-use) (usocket:address-in-use-error (e) (declare (ignore e)) :in-use)
(t (e) :unknown)))) (t (e) (declare (ignore e)) :unknown))))
(unless (member result '(:in-use :unknown)) port))) (unless (member result '(:in-use :unknown)) port)))
...@@ -114,7 +114,7 @@ Perhaps a zombie process is holding port ~a?~%" port port)) ...@@ -114,7 +114,7 @@ Perhaps a zombie process is holding port ~a?~%" port port))
;; ;;
;; FLAG -- figure out external-format for the other Lisps. ;; FLAG -- figure out external-format for the other Lisps.
;; ;;
(external-format :utf-8) aserve-start-args) (external-format #+allegro :utf8-base #-allegro :utf8) aserve-start-args)
(net.aserve:shutdown) (net.aserve:shutdown)
(let ((wait-time 1)) (let ((wait-time 1))
(block :outer (block :outer
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment