From 7d781cb65ab5d22676edc746a93d6e8c2f57a150 Mon Sep 17 00:00:00 2001 From: Guus der Kinderen Date: Fri, 2 Feb 2018 18:15:45 +0100 Subject: [PATCH 1/6] XEP-0198: Stream should be closed when 'h' value is to high. --- xep-0198.xml | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/xep-0198.xml b/xep-0198.xml index e6bf26b1..4001718f 100644 --- a/xep-0198.xml +++ b/xep-0198.xml @@ -28,6 +28,12 @@ &fabio; &dcridland; &mwild; + + 1.5.5 + 2018-09-19 + gdk +

Specify error conditions.

 + 1.5.4 2018-07-19 @@ -270,6 +276,11 @@ ]]>

Note that a client SHALL only make at most one attempt to enable stream management. If a server receives a second <enable/> element it SHOULD respond with a stream error, thus terminating the client connection.

+ + + +]]> @@ -394,7 +405,13 @@ ]]>

In both of these failure cases, the server SHOULD allow the client to bind a resource at this point rather than forcing the client to restart the stream negotiation process and re-authenticate.

-

If the former stream is resumed and the server still has the stream for the previously-identified session open at this time, the old stream SHOULD be terminated.

+

If the former stream is resumed and the server still has the stream for the previously-identified session open at this time, the server SHOULD send a 'conflict' stream error and close that stream.

+ + + + +]]>

When a session is resumed, the parties proceed as follows:

  • The sequence values are carried over from the previous session and are not reset for the new stream.
    • @@ -415,6 +432,17 @@ ]]>

    Stream management errors SHOULD be considered recoverable; however, misuse of stream management MAY result in termination of the stream.

    +

    When a remote entity acknowledges that it has handled a number of stanzas that is higher than the amount of stanzas that it was sent (by sending an 'h' value that is to high), the local entity SHOULD generate a stream error and close the stream:

    + + + + + You acknowledged 10 stanzas, but I only send you 8 so far. + + + +]]> From 7a6e1d574d8112f65ca2cf391cc5414f8d31f83f Mon Sep 17 00:00:00 2001 From: Guus der Kinderen Date: Thu, 26 Jul 2018 10:41:53 +0200 Subject: [PATCH 2/6] XEP-0198: Fix spelling (/s/send/sent). --- xep-0198.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xep-0198.xml b/xep-0198.xml index 4001718f..edb269ef 100644 --- a/xep-0198.xml +++ b/xep-0198.xml @@ -438,7 +438,7 @@ - You acknowledged 10 stanzas, but I only send you 8 so far. + You acknowledged 10 stanzas, but I only sent you 8 so far. From 07268406f61068b362c384c7f5e8dbe64b6969b7 Mon Sep 17 00:00:00 2001 From: Guus der Kinderen Date: Thu, 26 Jul 2018 10:43:16 +0200 Subject: [PATCH 3/6] XEP-0198: Bump minor instead of patch level version number. --- xep-0198.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xep-0198.xml b/xep-0198.xml index edb269ef..a7af98a7 100644 --- a/xep-0198.xml +++ b/xep-0198.xml @@ -29,8 +29,8 @@ &dcridland; &mwild; - 1.5.5 - 2018-09-19 + 1.6 + 2018-07-25 gdk

    Specify error conditions.

         From d688a35e521229d3c02403e2b70e664bcba2371a Mon Sep 17 00:00:00 2001 From: Guus der Kinderen Date: Thu, 26 Jul 2018 22:29:39 +0200 Subject: [PATCH 4/6] XEP-0198: Add handled-count-to-high specification. --- xep-0198.xml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/xep-0198.xml b/xep-0198.xml index a7af98a7..894044c9 100644 --- a/xep-0198.xml +++ b/xep-0198.xml @@ -432,7 +432,7 @@ ]]>

    Stream management errors SHOULD be considered recoverable; however, misuse of stream management MAY result in termination of the stream.

    -

    When a remote entity acknowledges that it has handled a number of stanzas that is higher than the amount of stanzas that it was sent (by sending an 'h' value that is to high), the local entity SHOULD generate a stream error and close the stream:

    +

    When a remote entity acknowledges that it has handled a number of stanzas that is higher than the amount of stanzas that it was sent (by sending an 'h' value that is to high), the local entity SHOULD generate a undefined-condition stream error that includes a handled-count-to-high element, and close the stream:

    @@ -693,6 +693,17 @@ + + + + + + + ]]>     From e40792b25ae29bcf4b6928bfc689c1ab88b0a31d Mon Sep 17 00:00:00 2001 From: Guus der Kinderen Date: Wed, 19 Sep 2018 17:17:30 +0200 Subject: [PATCH 5/6] XEP-0198: Fixed spelling (too/to) --- xep-0198.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xep-0198.xml b/xep-0198.xml index 894044c9..6203d19c 100644 --- a/xep-0198.xml +++ b/xep-0198.xml @@ -436,7 +436,7 @@ - + You acknowledged 10 stanzas, but I only sent you 8 so far. @@ -693,7 +693,7 @@ - + Date: Wed, 19 Sep 2018 20:20:36 +0200 Subject: [PATCH 6/6] XEP-0198: Fix typoes s/handled-count-to-high/handled-count-too-high/, s/to/too/, and s/a( undefined-condition)/an\1/, as well as adding </> around handled-count-too-high in the text. --- xep-0198.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xep-0198.xml b/xep-0198.xml index 6203d19c..1f051897 100644 --- a/xep-0198.xml +++ b/xep-0198.xml @@ -432,11 +432,11 @@ ]]>

    Stream management errors SHOULD be considered recoverable; however, misuse of stream management MAY result in termination of the stream.

    -

    When a remote entity acknowledges that it has handled a number of stanzas that is higher than the amount of stanzas that it was sent (by sending an 'h' value that is to high), the local entity SHOULD generate a undefined-condition stream error that includes a handled-count-to-high element, and close the stream:

    +

    When a remote entity acknowledges that it has handled a number of stanzas that is higher than the amount of stanzas that it was sent (by sending an 'h' value that is too high), the local entity SHOULD generate an undefined-condition stream error that includes a <handled-count-too-high/> element, and close the stream:

    - + You acknowledged 10 stanzas, but I only sent you 8 so far. @@ -693,7 +693,7 @@ - +