[Zope-Checkins] CVS: Zope/lib/python/webdav - NullResource.py:1.38.4.1 Resource.py:1.52.4.1

[Chris McDonough]

Update of /cvs-repository/Zope/lib/python/webdav
In directory cvs.zope.org:/tmp/cvs-serv3114/lib/python/webdav

Modified Files:
      Tag: chrism-install-branch
	NullResource.py Resource.py 
Log Message:
Merge of head into installer-branch.  Sorry.  :-(


=== Zope/lib/python/webdav/NullResource.py 1.38 => 1.38.4.1 ===
--- Zope/lib/python/webdav/NullResource.py:1.38	Wed Aug 14 18:11:40 2002
+++ Zope/lib/python/webdav/NullResource.py	Tue Sep  3 03:43:49 2002
@@ -203,8 +203,9 @@
         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())
 
 


=== Zope/lib/python/webdav/Resource.py 1.52 => 1.52.4.1 ===
--- Zope/lib/python/webdav/Resource.py:1.52	Wed Aug 14 18:11:40 2002
+++ Zope/lib/python/webdav/Resource.py	Tue Sep  3 03:43:49 2002
@@ -499,6 +499,7 @@
                 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