diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/login.get.desc.xml b/config/alfresco/templates/webscripts/org/alfresco/repository/login.get.desc.xml
index a14ee93d98..2c11d1b687 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/login.get.desc.xml
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/login.get.desc.xml
@@ -20,7 +20,7 @@
/api/login?u={username}&pw={password?}
none
- required
+ required
public_api
Authentication
\ No newline at end of file
diff --git a/source/java/org/alfresco/repo/webdav/AbstractMoveOrCopyMethod.java b/source/java/org/alfresco/repo/webdav/AbstractMoveOrCopyMethod.java
index 9c04931f25..4eb22194be 100644
--- a/source/java/org/alfresco/repo/webdav/AbstractMoveOrCopyMethod.java
+++ b/source/java/org/alfresco/repo/webdav/AbstractMoveOrCopyMethod.java
@@ -178,5 +178,9 @@ public abstract class AbstractMoveOrCopyMethod extends HierarchicalMethod
return shuffleOperation;
}
-
+ protected void parseRequestHeaders() throws WebDAVServerException
+ {
+ super.parseRequestHeaders();
+ parseIfHeader();
+ }
}
diff --git a/source/java/org/alfresco/repo/webdav/MoveMethod.java b/source/java/org/alfresco/repo/webdav/MoveMethod.java
index 284e7d52cd..e206000319 100644
--- a/source/java/org/alfresco/repo/webdav/MoveMethod.java
+++ b/source/java/org/alfresco/repo/webdav/MoveMethod.java
@@ -96,6 +96,8 @@ public class MoveMethod extends AbstractMoveOrCopyMethod
try
{
fileFolderService.rename(sourceNodeRef, name);
+ // As per the WebDAV spec, we make sure the node is unlocked once moved
+ getDAVHelper().getLockService().unlock(sourceNodeRef);
}
catch (AccessDeniedException e)
{
@@ -135,6 +137,8 @@ public class MoveMethod extends AbstractMoveOrCopyMethod
// It is a simple move operation
fileFolderService.moveFrom(sourceNodeRef, sourceParentNodeRef, destParentNodeRef, name);
}
+ // As per the WebDAV spec, we make sure the node is unlocked once moved
+ getDAVHelper().getLockService().unlock(sourceNodeRef);
}
private void copyOnlyContent(NodeRef sourceNodeRef, FileInfo destFileInfo, FileFolderService fileFolderService)