backport of webdav compatibility fixes from 2.5 (lock-token header

missing when locking objects)

lib/python/webdav/NullResource.py

@@ -13,7 +13,7 @@
 
 """WebDAV support - null resource objects."""
 
-__version__='$Revision: 1.38 $'[11:-2]
+__version__='$Revision: 1.39 $'[11:-2]
 
 import sys, os,  mimetypes, Globals, davcmds
 import Acquisition, OFS.content_types
@@ -203,8 +203,9 @@ class NullResource(Persistent, Acquisition.Implicit, Resource):
         else:
             # The command was succesful
             lock = locknull.wl_getLock(token)
-            RESPONSE.setStatus(200)
+            RESPONSE.setStatus(200)                         
             RESPONSE.setHeader('Content-Type', 'text/xml; charset="utf-8"')
+            RESPONSE.setHeader('Lock-Token', 'opaquelocktoken:' + token)
             RESPONSE.setBody(lock.asXML())
 
 

lib/python/webdav/Resource.py

@@ -13,7 +13,7 @@
 
 """WebDAV support - resource objects."""
 
-__version__='$Revision: 1.52 $'[11:-2]
+__version__='$Revision: 1.53 $'[11:-2]
 
 import sys, os,  mimetypes, davcmds, ExtensionClass, Lockable
 from common import absattr, aq_base, urlfix, rfc1123_date, tokenFinder, urlbase
@@ -499,6 +499,7 @@ class Resource(ExtensionClass.Base, Lockable.LockableItem):
                 lock = self.wl_getLock(token)
                 RESPONSE.setStatus(200)
                 RESPONSE.setHeader('Content-Type', 'text/xml; charset="utf-8"')
+                RESPONSE.setHeader('Lock-Token', 'opaquelocktoken:' + token)
                 RESPONSE.setBody(lock.asXML())
         else:
             # There's no body, so this likely to be a refresh request