Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

merge from trunk to acl61 branch

  • Loading branch information...
commit e429166f2e9754f4884630f91581061b7672cd96 1 parent c7d3167
layer authored
Showing with 16 additions and 5 deletions.
  1. +9 −0 ChangeLog
  2. +2 −1  doc/aserve.html
  3. +5 −4 publish.cl
View
9 ChangeLog
@@ -1,5 +1,8 @@
*******************************************************************************
merge from trunk to acl61 branch
+cmd: ../../join.sh trunk trunk_to_acl61_merge9 trunk_to_acl61_merge10 aserve
+*******************************************************************************
+merge from trunk to acl61 branch
command: ../../join.sh trunk trunk_to_acl61_merge8 trunk_to_acl61_merge9 aserve
*******************************************************************************
merge from trunk to acl61 branch
@@ -27,6 +30,12 @@ merge from trunk to acl61 branch
command: ../../join.sh trunk acl61 trunk_to_acl61_merge1 aserve
*******************************************************************************
+2001-10-08 John Foderaro <jkf@tiger.franz.com>
+
+ * publish.cl - publish-directory must pass on host info
+ to the publish-files that it does.
+ - unpublish takes a :server argument
+
2001-09-29 John Foderaro <jkf@tiger.franz.com>
* cgi.cl - fix bug where content-length was specified wrong
View
3  doc/aserve.html
@@ -311,7 +311,8 @@ <h2 align="left">In<a name="introduction"></a>troduction</h2>
<li><strong>host -- </strong>a string that must match (in a case insensitive manner) the
host part of the request.&nbsp;&nbsp; If this argument is not given then it will match the
host part of any request.&nbsp; If this argument is given and the request does not have a
- host part specified, then it will not match.</li>
+ host part specified, then it will not match.&nbsp; The host can also be a list of strings
+ to specify a list of hosts for this entity.</li>
<li><strong>port</strong> -- this argument is currently unused and will likely be removed in
future versions.</li>
<li><strong>file </strong>-- the name of the file to return when a request to this entity is
View
9 publish.cl
@@ -23,7 +23,7 @@
;; Suite 330, Boston, MA 02111-1307 USA
;;
;;
-;; $Id: publish.cl,v 1.33.6.4.2.1 2001/09/10 17:55:44 layer Exp $
+;; $Id: publish.cl,v 1.33.6.4.2.2 2001/10/08 23:56:31 layer Exp $
;; Description:
;; publishing urls
@@ -354,12 +354,12 @@
(build-mime-types-table) ;; build the table now
-(defun unpublish (&key all)
+
+(defun unpublish (&key all (server *wserver*))
(if* all
- then (dolist (locator (wserver-locators *wserver*))
+ then (dolist (locator (wserver-locators server))
(unpublish-locator locator))
else (error "not done yet")))
-
;; methods on entity objects
@@ -1069,6 +1069,7 @@
(process-entity req
(publish-file :path (uri-path
(request-uri req))
+ :host (host ent)
:file realname
:authorizer (entity-authorizer ent))))
t))
Please sign in to comment.
Something went wrong with that request. Please try again.