720253 - Zimbra uses different conflict code 409 instead of 412

Status: RESOLVED FIXED

(Calendar :: Provider: CalDAV, defect)

Description

[Philipp Kewisch [:Fallen] [:📆][:🧩]]

Attachment: Fix - v1

This means with the cache enabled you can't really edit events after a conflict. This simple patch fixes...

Comment 1

[Philipp Kewisch [:Fallen] [:📆][:🧩]]

I'm going to push this since it makes things better for zimbra and its low risk, I'd still appreciate a review though.

Comment 2

[Philipp Kewisch [:Fallen] [:📆][:🧩]]

Pushed to comm-central changeset 3ce3754f549d

Comment 3

[Philipp Kewisch [:Fallen] [:📆][:🧩]]

Backported to releases/comm-aurora changeset ee492eaff0e3

Comment 4

[Philipp Kewisch [:Fallen] [:📆][:🧩]]

Backported to releases/comm-beta changeset 02f161ec50f5

Comment 5

[Mohit Kanwal [:redDragon]]

Comment on attachment 590587 [details] [diff] [review]
Fix - v1

Review of attachment 590587 [details] [diff] [review]:
-----------------------------------------------------------------

Setting + but I think we would require the comment documenting this issue.

::: calendar/providers/caldav/calDavCalendar.js
@@ +742,4 @@
>                  if (wasInboxItem && thisCalendar.mShouldPollInbox) {
>                      thisCalendar.doDeleteItemOrUseCache(aNewItem, true, null, true, true, null);
>                  }
> +            } else if (status == 412 || status == 409) {

Maybe a comment about this particular issue can be added, to the file, so that if Zimbra changes the code in the future we don't need to hunt down too much :)

Comment 6

[Philipp Kewisch [:Fallen] [:📆][:🧩]]

409 is the right code for a conflict, 412 is "just" the code for when the conditions sent via If/If-Match headers fail, so I think its safe to just allow 409 in all cases without an extra comment. See <http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html>

Thanks for looking in to this though!