Commit 9ed963b5 authored by Dave Cooper's avatar Dave Cooper

fixed client-test for gwl windows ccl 1.11

parent fc4eaa77
......@@ -876,6 +876,7 @@ If you are interested in this effort we would love to hear from you at open-sour
#:*jump-to-toplevel-on-set-self?*
#:*process-cookies?*
#:*static-home*
#:announce-server-port
#:encode-root-path
#:base-html-sheet
#:skeleton-ui-element
......
......@@ -109,7 +109,8 @@
(case system-type
(darwin "-*-Courier New-normal-normal-normal-*-%s-*-*-*-m-0-iso10646-1" ;; -apple-Courier_New-medium-normal-normal-*-%s-*-*-*-m-0-iso10646-1"
)
(windows-nt "-outline-Courier New-normal-normal-normal-mono-%s-*-*-*-c-*-iso8859-1")
;;(windows-nt "-outline-Courier New-normal-normal-normal-mono-%s-*-*-*-c-*-iso8859-1")
(windows-nt "-outline-Consolas-normal-r-normal-normal-14-97-96-96-c-*-utf8")
(gnu/linux "-bitstream-Courier 10 Pitch-normal-normal-normal-*-%s-*-*-*-m-0-iso10646-1"))
font-size))))
......@@ -216,7 +217,8 @@
(gendl-loaded? (funcall (symbol-function (read-from-string \"gendl:start-gendl!\"))))
(t (format t \"~%%~%%***~%%Gendl or GDL is not loaded and did not load successfully
from .load-gendl.lisp in your home directory.~%%***~%%~%%\"))))
(when (find-package :gendl) (in-package :gdl-user)))" *gendl-home*))
(when (find-package :gendl) (in-package :gdl-user))
(when (find-package :gwl) (funcall (read-from-string \"gwl:announce-server-port\"))))" *gendl-home*))
;;
......
......@@ -30,3 +30,8 @@ A warning is given if an error condition occurs with <b>body</b>.
(if timeout
`(,(glisp:with-timeout-sym) (,timeout ,timeout-body) ,code)
code)))))))
(defun announce-server-port ()
(let ((port (glisp:local-port (slot-value net.aserve:*wserver* 'net.aserve::socket))))
(when port
(format t "~&~%***** ~%Your Webserver is running on Port ~a.~%*****~%" port))))
......@@ -111,8 +111,11 @@ Perhaps a zombie process is holding port ~a?~%" port port))
(usocket:socket-close sock))
(usocket:address-in-use-error (e) (declare (ignore e)) :in-use)
(t (e) (declare (ignore e)) :unknown))))
(unless (member result '(:in-use :unknown)) port)))
(unless (or (member result '(:in-use :unknown))
#+windows-host
(ignore-errors
(net.aserve.client:do-http-request
(format nil "http://127.0.0.1:~a" port)))) port)))
(defun start-gwl (&key (port *aserve-port*) (listeners *aserve-listeners*)
;;
......
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