Index: openacs-4/packages/file-storage/tcl/file-storage-dav-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/tcl/file-storage-dav-procs.tcl,v
diff -u -r1.3.2.6 -r1.3.2.7
--- openacs-4/packages/file-storage/tcl/file-storage-dav-procs.tcl	7 May 2004 02:51:11 -0000	1.3.2.6
+++ openacs-4/packages/file-storage/tcl/file-storage-dav-procs.tcl	25 Oct 2004 16:28:04 -0000	1.3.2.7
@@ -53,6 +53,7 @@
         fs::add_file \
         -package_id $package_id \
         -name $name \
+        -title $name \
 	-item_id $item_id \
 	-parent_id $parent_id \
 	-tmp_filename $tmp_filename \
@@ -68,9 +69,9 @@
     } else {
 	fs::add_version \
 	    -name $name\
+            -title $name \
 	    -tmp_filename $tmp_filename\
 	    -item_id $item_id \
-	    -parent_id $parent_id \
 	    -creation_user $user_id \
 	    -package_id $package_id
 	
Index: openacs-4/packages/file-storage/tcl/file-storage-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/tcl/file-storage-procs.tcl,v
diff -u -r1.42.2.18 -r1.42.2.19
--- openacs-4/packages/file-storage/tcl/file-storage-procs.tcl	8 Oct 2004 22:21:08 -0000	1.42.2.18
+++ openacs-4/packages/file-storage/tcl/file-storage-procs.tcl	25 Oct 2004 16:28:05 -0000	1.42.2.19
@@ -847,7 +847,11 @@
 
 	set webdav_prefix [oacs_dav::uri_prefix]
 
-	return "[ad_url]${webdav_prefix}${package_url}${url_stub}"
+	if { [security::RestrictLoginToSSLP] } {
+	    return "[security::get_secure_location]${webdav_prefix}${package_url}${url_stub}"
+	} else {
+	    return "[ad_url]${webdav_prefix}${package_url}${url_stub}"
+	}
 
     } else {
 
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
Index: openacs-4/packages/oacs-dav/tcl/tDAV-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/oacs-dav/tcl/tDAV-procs.tcl,v
diff -u -r1.2.2.11 -r1.2.2.12
--- openacs-4/packages/oacs-dav/tcl/tDAV-procs.tcl	23 Jul 2004 13:30:14 -0000	1.2.2.11
+++ openacs-4/packages/oacs-dav/tcl/tDAV-procs.tcl	25 Oct 2004 16:28:03 -0000	1.2.2.12
@@ -388,7 +388,7 @@
 	    set token ""
 	    # add ? in the token re in case there is a conditional () 
 	    # in the header
-	    regexp {(<http://[^/]+([^>]+)>\s+)?\(<([^>]+)>\)} $hdr nil maybe hdr_uri token
+	    regexp {(<https?://[^/]+([^>]+)>\s+)?\(<([^>]+)>\)} $hdr nil maybe hdr_uri token
 	    
 	    set ftk [lindex $lockinfo 3]
 	    if {![info exists token] || ![string equal $token $ftk]} {
@@ -961,7 +961,7 @@
 proc tdav::filter_webdav_copy {args} {
     set overwrite [tdav::conn -set overwrite [ns_set iget [ns_conn headers] Overwrite]]
     set destination [encoding convertto utf-8 [ns_urldecode [ns_set iget [ns_conn headers] Destination]]]
-    regsub {http://[^/]+/} $destination {/} dest
+    regsub {https?://[^/]+/} $destination {/} dest
     tdav::conn -set destination $dest
     return filter_ok
     
@@ -1019,7 +1019,7 @@
     set overwrite [tdav::conn -set overwrite [ns_set iget [ns_conn headers] Overwrite]]
     set destination [encoding convertto utf-8 [ns_urldecode [ns_set iget [ns_conn headers] Destination]]]
 
-    regsub {http://[^/]+/} $destination {/} dest
+    regsub {https?://[^/]+/} $destination {/} dest
 
     tdav::conn -set destination $dest
 
@@ -1419,7 +1419,7 @@
 	$prop appendChild $supportedlock
 
 	set lockdiscovery [$d createElement D:lockdiscovery]
-	regsub {http://[^/]+/} $href {/} local_uri
+	regsub {https?://[^/]+/} $href {/} local_uri
 	if {[file exists [tdav::get_lock_file $local_uri]]} {
 	    # check for timeout
 	    set lockinfo [tdav::read_lock $local_uri]