From c39337adfecd65656e50cb2156874185f6920e57 Mon Sep 17 00:00:00 2001
From: helge <helge@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Date: Thu, 30 Sep 2004 10:48:27 +0000
Subject: [PATCH] improved WebDAV locking (send lock-token header)

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@203 e4a50df8-12e2-0310-a44c-efbce7f8a7e3
---
 sope-appserver/NGObjWeb/ChangeLog                 | 5 +++++
 sope-appserver/NGObjWeb/Version                   | 2 +-
 sope-appserver/NGObjWeb/WebDAV/SoDAVLockManager.m | 6 +++---
 sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m | 6 +++---
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog
index 8df01720..0f6ae560 100644
--- a/sope-appserver/NGObjWeb/ChangeLog
+++ b/sope-appserver/NGObjWeb/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-30  Helge Hess  <helge.hess@skyrix.com>
+
+	* WebDAV/SoWebDAVRenderer.m: set lock-token header on LOCK requests
+	  (v4.3.49)
+
 2004-09-27  Helge Hess  <helge.hess@opengroupware.org>
 
 	* DynamicElements/WONestedList.m: minor code cleanups (v4.3.48)
diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version
index a9be7723..9f28f6ad 100644
--- a/sope-appserver/NGObjWeb/Version
+++ b/sope-appserver/NGObjWeb/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=48
+SUBMINOR_VERSION:=49
 
 # v4.3.42  requires libNGExtensions v4.3.116
 # v4.3.40  requires libNGExtensions v4.3.115
diff --git a/sope-appserver/NGObjWeb/WebDAV/SoDAVLockManager.m b/sope-appserver/NGObjWeb/WebDAV/SoDAVLockManager.m
index 08eced3c..b538a0cc 100644
--- a/sope-appserver/NGObjWeb/WebDAV/SoDAVLockManager.m
+++ b/sope-appserver/NGObjWeb/WebDAV/SoDAVLockManager.m
@@ -1,7 +1,7 @@
 /*
-  Copyright (C) 2000-2003 SKYRIX Software AG
+  Copyright (C) 2000-2004 SKYRIX Software AG
 
-  This file is part of OGo
+  This file is part of OpenGroupware.org.
 
   OGo is free software; you can redistribute it and/or modify it under
   the terms of the GNU Lesser General Public License as published by the
@@ -18,7 +18,6 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
 
 #include "SoDAVLockManager.h"
 #include "common.h"
@@ -58,6 +57,7 @@
   scope:(NSString *)_scope type:(NSString *)_lockType
   owner:(NSString *)_ownerURL
 {
+  /* returns the lock token */
   SoDAVLockInfo *lockInfo;
   
   if ((lockInfo = [self->uriToLockInfo objectForKey:_uri])) {
diff --git a/sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m b/sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m
index e78060bd..5fc01c2d 100644
--- a/sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m
+++ b/sope-appserver/NGObjWeb/WebDAV/SoWebDAVRenderer.m
@@ -1,7 +1,7 @@
 /*
-  Copyright (C) 2000-2003 SKYRIX Software AG
+  Copyright (C) 2000-2004 SKYRIX Software AG
 
-  This file is part of OGo
+  This file is part of OpenGroupware.org.
 
   OGo is free software; you can redistribute it and/or modify it under
   the terms of the GNU Lesser General Public License as published by the
@@ -18,7 +18,6 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id$
 
 #include "SoWebDAVRenderer.h"
 #include "SoWebDAVValue.h"
@@ -766,6 +765,7 @@ static BOOL         formatOutput = NO;
   [r setStatus:200];
   [r setContentEncoding:NSUTF8StringEncoding];
   [r setHeader:@"text/xml; charset=\"utf-8\"" forKey:@"content-type"];
+  [r setHeader:[_object stringValue]          forKey:@"lock-token"];
   [r appendContentString:@"<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"];
   [r appendContentString:@"<D:prop xmlns:D=\"DAV:\">"];
   [r appendContentString:@"<D:lockdiscovery>"];
-- 
2.39.5