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 -N -r1.6 -r1.7 --- openacs-4/packages/oacs-dav/tcl/tDAV-procs.tcl 23 Jul 2004 13:56:58 -0000 1.6 +++ openacs-4/packages/oacs-dav/tcl/tDAV-procs.tcl 13 Jan 2005 13:58:35 -0000 1.7 @@ -388,7 +388,7 @@ set token "" # add ? in the token re in case there is a conditional () # in the header - regexp {(]+)>\s+)?\(<([^>]+)>\)} $hdr nil maybe hdr_uri token + regexp {(]+)>\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]