mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix a possible error purging orphaned storage server files if WebDAV server strips trailing slash

Browse source
This commit is contained in:
Dan Stillman 2009-03-15 16:07:52 +00:00
parent d5de9c7a4a
commit 6dbcc678c8
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
chrome/content/zotero/xpcom/storage.js
View file

@ -853,7 +853,7 @@ Zotero.Sync.Storage = new function () {
var lastSyncDate = new Date(Zotero.Sync.Server.lastLocalSyncTime * 1000); var lastSyncDate = new Date(Zotero.Sync.Server.lastLocalSyncTime * 1000);
Zotero.Utilities.HTTP.WebDAV.doProp("PROPFIND", uri, xmlstr, function (req) { Zotero.Utilities.HTTP.WebDAV.doProp("PROPFIND", uri, xmlstr, function (req) {
Zotero.debug(req.responseText); Zotero.debug(req.responseText);
var funcName = "Zotero.Sync.Storage.purgeOrphanedStorageFiles()"; var funcName = "Zotero.Sync.Storage.purgeOrphanedStorageFiles()";
@ -861,9 +861,15 @@ Zotero.Sync.Storage = new function () {
var xml = new XML(req.responseText.replace(/<\?xml.*\?>/, '')); var xml = new XML(req.responseText.replace(/<\?xml.*\?>/, ''));
var deleteFiles = []; var deleteFiles = [];
var trailingSlash = !!path.match(/\/$/);
for each(var response in xml.D::response) { for each(var response in xml.D::response) {
var href = response.D::href.toString(); var href = response.D::href.toString();
// Strip trailing slash if there isn't one on the root path
if (!trailingSlash) {
href = href.replace(/\/$/, "")
}
// Absolute // Absolute
if (href.match(/^https?:\/\//)) { if (href.match(/^https?:\/\//)) {
var ios = Components.classes["@mozilla.org/network/io-service;1"]. var ios = Components.classes["@mozilla.org/network/io-service;1"].