From b43886ea36ab8caf5f66f28c7efb8842ddd5b47c Mon Sep 17 00:00:00 2001 From: Ian Paterson Date: Sat, 19 May 2007 11:35:13 +0000 Subject: [PATCH] v1.1 RC1 changes to content of remote-stream-error git-svn-id: file:///home/ksmith/gitmigration/svn/xmpp/trunk@849 4b5297f7-1745-476d-ba37-a9c6900126ab --- xep-0206.xml | 43 +++++++++++++++++++++++++++---------------- 1 file changed, 27 insertions(+), 16 deletions(-) diff --git a/xep-0206.xml b/xep-0206.xml index d37d0eef..5bba9fe6 100644 --- a/xep-0206.xml +++ b/xep-0206.xml @@ -25,6 +25,12 @@ http://www.xmpp.org/schemas/xbosh.xsd &ianpaterson; + + 1.1 + 2007-05-30 + ip +

remote-stream-error includes full <stream:error/> element (not just its content) and optional stanzas

 + 1.0 2007-02-28 @@ -40,8 +46,8 @@

Note: Many existing XMPP-specific implementations of BOSH clients and connection managers do not specify the namespace of <message/>, <presence/>, or <iq/> elements, since that allows them to forward stanzas without modification (the XMPP <stream:stream/> wrapper element used with TCP typically sets the default namespace to 'jabber:client'). They instead simply assume that the full content of the 'jabber:client' namespace is a subset of the 'http://jabber.org/protocol/httpbind' namespace.

Note: Inclusion of TLS negotiation elements is allowed but is NOT RECOMMENDED. The definition of how TLS might be implemented over BOSH is currently beyond the scope of this document.

@@ -65,8 +71,7 @@ Content-Length: 104 xml:lang='en' xmpp:version='1.0' xmlns='http://jabber.org/protocol/httpbind' - xmlns:xmpp='urn:xmpp:xbosh' - xmlns:stream='http://etherx.jabber.org/streams'/>]]> + xmlns:xmpp='urn:xmpp:xbosh'/>]]>

Note: Unlike the protocol defined in &xep0025;, an opening <stream:stream> tag is not sent to the connection manager (since BOSH <body/> elements MUST not contain partial XML elements). Any XML streams between the connection manager and an XMPP server are the responsibility of the connection manager (and beyond the scope of this document).

@@ -230,7 +235,8 @@ Content-Length: 240 Content-Type: text/xml; charset=utf-8 Content-Length: 221 - + @@ -303,7 +309,7 @@ Content-Length: 175 ]]> -

The content of the <body/> element is a copy of the content of the <stream:error/> element received from the XMPP server:

+

The content of the <body/> element is zero or more stanzas followed by a copy of the <stream:error/> element (qualified by the 'http://etherx.jabber.org/streams' namespace) received from the XMPP server:

- - - Some special application diagnostic information! - - + xmlns='http://jabber.org/protocol/httpbind' + xmlns:stream='http://etherx.jabber.org/streams'> + + Hi yourself! + + + + + Some special application diagnostic information! + + + ]]> @@ -366,15 +380,12 @@ Content-Length: 68 - -