Index: openacs-4/packages/oacs-dav/tcl/oacs-dav-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/oacs-dav/tcl/oacs-dav-procs.tcl,v
diff -u -r1.4.2.19 -r1.4.2.20
--- openacs-4/packages/oacs-dav/tcl/oacs-dav-procs.tcl	27 Sep 2004 19:12:40 -0000	1.4.2.19
+++ openacs-4/packages/oacs-dav/tcl/oacs-dav-procs.tcl	25 Oct 2004 16:28:03 -0000	1.4.2.20
@@ -92,6 +92,13 @@
     the URI
 } {
     ns_log debug "\nOACS-DAV running oacs_dav::authorize"
+
+    # Restrict to SSL if required
+    if { [security::RestrictLoginToSSLP]  && ![security::secure_conn_p] } {
+	ns_returnunauthorized
+	return filter_return
+    }
+
     # set common data for all requests 
     oacs_dav::conn_setup
    
@@ -287,7 +294,8 @@
     Setup oacs_dav::conn, authenticate user
 } {
     ad_conn -reset
-    set uri [ns_conn url]
+    set uri [ns_urldecode [ns_conn url]]
+
     ns_log debug "\nconn_setp uri \"$uri\" "
     set dav_url_regexp "^[oacs_dav::uri_prefix]"
     regsub $dav_url_regexp $uri {} uri
@@ -716,7 +724,7 @@
     	lappend encoded_uri [oacs_dav::urlencode $fragment]
     }   
 
-    set folder_uri "[ad_url][join $encoded_uri "/"]"
+    set folder_uri "[ad_conn location][join $encoded_uri "/"]"
     
     # this is wacky, but MS Web Folders usually (but not always)
     # requests a collection without a trailing slash