v1.3.18 - fix compression with logical pathnames

The code checking for a compressed version of a file did not handle the case where a logical pathname namestring was used to describe the file's location. This is now fixed. In response to spr39802 Change-Id: I1b44124444fb2fb76c69d9b4cfda1fd8bbac0c19
franzinc · Dec 11, 2012 · 9c1b3ae · 9c1b3ae
1 parent e5acce3
commit 9c1b3ae
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/main.cl b/main.cl
@@ -38,7 +38,7 @@
 #+ignore
 (check-smp-consistency)
 
-(defparameter *aserve-version* '(1 3 17))
+(defparameter *aserve-version* '(1 3 18))
 
 (eval-when (eval load)
     (require :sock)

diff --git a/publish.cl b/publish.cl
@@ -1466,7 +1466,9 @@
 			  (setq accepts (compute-accepted-encodings 
 					 req :as-keywords t))
 			  (setq compressed-file-comp
-			    (find-compressed-version (file ent) accepts)))
+			    (find-compressed-version 
+			     (excl::merge-to-physical (file ent)) 
+			     accepts)))
 		   then (send-file-back req 
 					ent
 					(car compressed-file-comp) ; name