From 06d024f18b954e66cf823f468d8cdbed4a021e4b Mon Sep 17 00:00:00 2001 From: Peter Saint-Andre Date: Tue, 21 Apr 2009 21:54:13 +0000 Subject: [PATCH] text tweak git-svn-id: file:///home/ksmith/gitmigration/svn/xmpp/trunk@3069 4b5297f7-1745-476d-ba37-a9c6900126ab --- xep-0166.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xep-0166.xml b/xep-0166.xml index 6a4b44b4..577ff298 100644 --- a/xep-0166.xml +++ b/xep-0166.xml @@ -1205,7 +1205,7 @@ PENDING o-----------------------+ |
No existing session
-
If there is no existing session and both parties simultaneously send a Jingle session-initiate message, the action with the lower of the two session IDs MUST overrule the other action, where by "lower" is meant the session ID that is sorted first using "i;octet" collation as specified in Section 9.3 of &rfc4790;. The party that receives the session-initiate action with the lower of the two session IDs MUST acknowledge the action or return an error condition that would normally be returned when receiving a session-initiate message, and the party that receives the session-initiate action with the higher of the two session IDs MUST return a &conflict; error to the other party, which SHOULD include a Jingle-specific condition of <tie-break/>.
+
If there is no existing session and both parties simultaneously send a Jingle session-initiate message with a content-type that is roughly equivalent (e.g., each message requests initiation of a voice call), the action with the lower of the two session IDs MUST overrule the other action, where by "lower" is meant the session ID that is sorted first using "i;octet" collation as specified in Section 9.3 of &rfc4790;. The party that receives the session-initiate action with the lower of the two session IDs MUST acknowledge the action or return an error condition that would normally be returned when receiving a session-initiate message, and the party that receives the session-initiate action with the higher of the two session IDs MUST return a &conflict; error to the other party, which SHOULD include a Jingle-specific condition of <tie-break/>.
Existing session