aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Wielicki <j.wielicki@sotecware.net>2017-09-17 17:15:04 +0200
committerJonas Wielicki <j.wielicki@sotecware.net>2017-09-17 17:15:04 +0200
commit89a5974fa1c0caefc0e6bc8939ccce412d9a6422 (patch)
treeba82037646d6c70d0e0e41c161abf108d43059c2
parent43c9cab5e46bfde9e49792bbb82fa0ab365843ad (diff)
parent31356f8071fc4266e6a935f85ad44a501a813cf8 (diff)
Merge branch 'csi-state-after-sm-resumption' of https://github.com/Flowdalic/xeps-xsf into feature/xep-0352
-rw-r--r--xep-0352.xml17
1 files changed, 17 insertions, 0 deletions
diff --git a/xep-0352.xml b/xep-0352.xml
index 41909b3..b7a41c8 100644
--- a/xep-0352.xml
+++ b/xep-0352.xml
@@ -26,6 +26,12 @@
<shortname>csi</shortname>
&mwild;
<revision>
+ <version>0.2.1</version>
+ <date>2017-02-18</date>
+ <initials>fs</initials>
+ <remark><p>Clarify that the CSI state is not restored when the stream is resumed.</p></remark>
+ </revision>
+ <revision>
<version>0.2</version>
<date>2015-10-02</date>
<initials>XEP Editor (mam)</initials>
@@ -148,6 +154,14 @@ and responds to the ping with a pong -->
<iq to='juliet@capulet.lit/baclony' from='capulet.lit' id='ping1' type='result'/>
<!-- Stream state is now 'active' -->]]></example>
</section2>
+ <section2 topic='Interaction with Stream Resumption' anchor='stream-resumption'>
+ <p>After a previous stream was resumed using mechanisms like
+ &xep0198;, the CSI state is <em>not</em> restored. That is, stream
+ resumption does not affect the current CSI state, which always
+ defaults to 'active' for new and resumed streams. Clients wishing
+ to immediately go to the inactive state should do so after stream
+ resumption.</p>
+ </section2>
</section1>
<section1 topic='Security Considerations' anchor='security'>
<p>To protect the privacy of users, servers MUST NOT reveal the clients active/inactive state to other
@@ -182,4 +196,7 @@ and responds to the ping with a pong -->
</xs:schema>
]]></code>
</section1>
+<section1 topic='Acknowledgements' anchor='acknowledgements'>
+ <p>Thanks to Florian Schmaus for his feedback.</p>
+</section1>
</xep>