service: remove accidental 'resetServer' call in sync (\!); dav: lock a file called 'lock', instead of the entire collection (workaround for bug 421610)

services/sync/modules/dav.js

@@ -354,7 +354,7 @@ DAVCollection.prototype = {
       yield;
     }
 
-    this.LOCK("",
+    this.LOCK("lock",
               "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n" +
               "<D:lockinfo xmlns:D=\"DAV:\">\n" +
               "  <D:locktype><D:write/></D:locktype>\n" +
@@ -398,7 +398,7 @@ DAVCollection.prototype = {
       yield;
     }
 
-    this.UNLOCK("", self.cb);
+    this.UNLOCK("lock", self.cb);
     let resp = yield;
 
     if (this._authProvider._authFailed ||

services/sync/modules/service.js

@@ -493,7 +493,6 @@ WeaveSvc.prototype = {
       if (engines[i].enabled) {
         this._notify(engines[i].name + "-engine:sync",
                      this._syncEngine, engines[i]).async(this, self.cb);
-        engines[i].resetServer(self.cb);
         yield;
         if (engines[i].name == "bookmarks") { // FIXME
           Engines.get("bookmarks").syncMounts(self.cb);