From 3dcbd6162eff57e6bf447724cd46cc03e1c6ea95 Mon Sep 17 00:00:00 2001 From: Peter Saint-Andre Date: Tue, 21 Apr 2009 16:13:57 +0000 Subject: [PATCH] 1.8rc3: schema corrections git-svn-id: file:///home/ksmith/gitmigration/svn/xmpp/trunk@3062 4b5297f7-1745-476d-ba37-a9c6900126ab --- xep-0124.xml | 52 +++++++++++++++++----------------------------------- 1 file changed, 17 insertions(+), 35 deletions(-) diff --git a/xep-0124.xml b/xep-0124.xml index 5c456cb1..46381fa1 100644 --- a/xep-0124.xml +++ b/xep-0124.xml @@ -29,10 +29,10 @@ &stpeter; &metajack; - 1.8rc2 - in progress, last updated 2009-03-24 + 1.8rc3 + in progress, last updated 2009-04-21 psa/jm -

Removed 'secure' attribute; added security consideration regarding link between connection manager and application server; changed "stanza" to "payload" for disambiguation with XMPP; clarified design objectives and relationship to similar technologies.

 +

Removed 'secure' attribute because it did not solve the problem it was intended to solve; added security consideration regarding link between connection manager and application server; changed "stanza" to "payload" for disambiguation with XMPP; clarified design objectives and relationship to similar technologies; corrected several errors in the schema.

 1.7 @@ -248,7 +248,6 @@ Content-Length: 104 rid='1573741820' to='jabber.org' route='xmpp:jabber.org:9999' - secure='true' ver='1.6' wait='60' ack='1' @@ -292,7 +291,6 @@ Content-Length: 128 charsets='ISO_8859-1 ISO-2022-JP' ver='1.6' from='jabber.org' - secure='true' xmlns='http://jabber.org/protocol/httpbind'/>]]> @@ -302,7 +300,6 @@ Content-Type: text/xml; charset=utf-8 Content-Length: 128 ]]> @@ -656,7 +653,6 @@ Content-Length: 128 charsets='ISO_8859-1 ISO-2022-JP' ver='1.6' from='jabber.org' - secure='true' xmlns='http://jabber.org/protocol/httpbind'/>]]> @@ -672,7 +668,6 @@ Content-Length: 104 rid='1573741820' to='jabber.org' route='xmpp:jabber.org:9999' - secure='true' xml:lang='en' xmlns='http://jabber.org/protocol/httpbind'/>]]>

If the connection manager did not indicate its support for multiple streams at the start of the session, then it MUST ignore the extra attributes and treat the request as a normal empty request for payloads (see Sending and Receiving XML Payloads). This helps to ensure backwards-compatibility with older implementations. Otherwise it MUST open a new stream with the specified server (see Session Creation Response), generate a new stream name, and respond to the client with the name. The response MAY also include 'from' and 'secure' attributes, but it SHOULD NOT include 'sid', 'requests', 'polling', 'hold', 'inactivity', 'maxpause', 'accept', 'charsets', 'ver' or 'wait' attributes.

@@ -683,7 +678,6 @@ Content-Length: 128 ]]>

Note: If the response did not include either 'from' or 'secure' attributes then they MAY be sent in a subsequent response instead (see Session Creation Response). In that case the 'stream' attribute MUST also be specified.

 @@ -993,30 +987,12 @@ Content-Length: 68 - - - - - - - - + + @@ -1045,17 +1022,21 @@ Content-Length: 68 - - + + + + - - + + + + - + @@ -1065,7 +1046,8 @@ Content-Length: 68 - + + @@ -1075,6 +1057,6 @@ Content-Length: 68 ]]> -

Thanks to Tomas Karasek, Tobias Markmann, Jack Moffitt, Safa Sofuoğlu, Stefan Strigler, Matthew Wild, and Christopher Zorn for their feedback.

+

Thanks to Mike Cumings, Tomas Karasek, Tobias Markmann, Safa Sofuoğlu, Stefan Strigler, Matthew Wild, Kevin Winters, and Christopher Zorn for their feedback.