mirror of https://github.com/moparisthebest/xeps
1.8rc3: schema corrections
git-svn-id: file:///home/ksmith/gitmigration/svn/xmpp/trunk@3062 4b5297f7-1745-476d-ba37-a9c6900126ab
This commit is contained in:
Peter Saint-Andre
parent
7334ab77df
commit
3dcbd6162e
52
xep-0124.xml
52
xep-0124.xml
|
|
@ -29,10 +29,10 @@
|
|||
&stpeter;
|
||||
&metajack;
|
||||
<revision>
|
||||
<version>1.8rc2</version>
|
||||
<date>in progress, last updated 2009-03-24</date>
|
||||
<version>1.8rc3</version>
|
||||
<date>in progress, last updated 2009-04-21</date>
|
||||
<initials>psa/jm</initials>
|
||||
<remark><p>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.</p></remark>
|
||||
<remark><p>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.</p></remark>
|
||||
</revision>
|
||||
<revision>
|
||||
<version>1.7</version>
|
||||
|
|
@ -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'/>]]></example>
|
||||
|
||||
|
||||
|
|
@ -302,7 +300,6 @@ Content-Type: text/xml; charset=utf-8
|
|||
Content-Length: 128
|
||||
|
||||
<body from='jabber.org'
|
||||
secure='true'
|
||||
xmlns='http://jabber.org/protocol/httpbind'/>]]></example>
|
||||
</section2>
|
||||
</section1>
|
||||
|
|
@ -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'/>]]></example>
|
||||
</section2>
|
||||
<section2 topic="Adding Streams To A Session" anchor='multi-add'>
|
||||
|
|
@ -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'/>]]></example>
|
||||
<p>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 <link url="#payloads">Sending and Receiving XML Payloads</link>). <note>This helps to ensure backwards-compatibility with older implementations.</note> Otherwise it MUST open a new stream with the specified server (see <link url="#session-create">Session Creation Response</link>), 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.</p>
|
||||
|
|
@ -683,7 +678,6 @@ Content-Length: 128
|
|||
|
||||
<body stream='secondStreamName'
|
||||
from='jabber.org'
|
||||
secure='true'
|
||||
xmlns='http://jabber.org/protocol/httpbind'/>]]></example>
|
||||
<p>Note: If the response did not include either 'from' or 'secure' attributes then they MAY be sent in a subsequent response instead (see <link url="#session-create">Session Creation Response</link>). In that case the 'stream' attribute MUST also be specified.</p>
|
||||
</section2>
|
||||
|
|
@ -993,30 +987,12 @@ Content-Length: 68
|
|||
</xs:documentation>
|
||||
</xs:annotation>
|
||||
|
||||
<xs:import namespace='http://etherx.jabber.org/streams'
|
||||
schemaLocation='http://www.xmpp.org/schemas/streams.xsd'/>
|
||||
|
||||
<xs:import namespace='http://www.w3.org/XML/1998/namespace'
|
||||
schemaLocation='http://www.w3.org/2001/03/xml.xsd'/>
|
||||
|
||||
<xs:element name='body'>
|
||||
<xs:complexType>
|
||||
<xs:choice xmlns:stream='http://etherx.jabber.org/streams'>
|
||||
<xs:element ref='stream:features'
|
||||
minOccurs='0'
|
||||
maxOccurs='1'/>
|
||||
<xs:any namespace='urn:ietf:params:xml:ns:xmpp-tls'
|
||||
minOccurs='0'
|
||||
maxOccurs='1'/>
|
||||
<xs:any namespace='urn:ietf:params:xml:ns:xmpp-sasl'
|
||||
minOccurs='0'
|
||||
maxOccurs='1'/>
|
||||
<xs:any namespace='urn:ietf:params:xml:ns:xmpp-streams'
|
||||
minOccurs='0'
|
||||
maxOccurs='1'/>
|
||||
<xs:any namespace='jabber:client'
|
||||
minOccurs='0'
|
||||
maxOccurs='unbounded'/>
|
||||
<xs:choice>
|
||||
<xs:element name='uri'
|
||||
minOccurs='0'
|
||||
maxOccurs='1'
|
||||
|
|
@ -1027,6 +1003,7 @@ Content-Length: 68
|
|||
processContents='lax'/>
|
||||
</xs:choice>
|
||||
<xs:attribute name='accept' type='xs:string' use='optional'/>
|
||||
<xs:attribute name='ack' type='xs:positiveInteger' use='optional'/>
|
||||
<xs:attribute name='authid' type='xs:string' use='optional'/>
|
||||
<xs:attribute name='charsets' type='xs:NMTOKENS' use='optional'/>
|
||||
<xs:attribute name='condition' use='optional'>
|
||||
|
|
@ -1045,17 +1022,21 @@ Content-Length: 68
|
|||
</xs:simpleType>
|
||||
</xs:attribute>
|
||||
<xs:attribute name='content' type='xs:string' use='optional'/>
|
||||
<xs:attribute name='hold' type='xs:byte' use='optional'/>
|
||||
<xs:attribute name='inactivity' type='xs:short' use='optional'/>
|
||||
<xs:attribute name='from' type='xs:string' use='optional'/>
|
||||
<xs:attribute name='hold' type='xs:unsignedByte' use='optional'/>
|
||||
<xs:attribute name='inactivity' type='xs:unsignedShort' use='optional'/>
|
||||
<xs:attribute name='key' type='xs:string' use='optional'/>
|
||||
<xs:attribute name='maxpause' type='xs:unsignedShort' use='optional'/>
|
||||
<xs:attribute name='newkey' type='xs:string' use='optional'/>
|
||||
<xs:attribute name='polling' type='xs:short' use='optional'/>
|
||||
<xs:attribute name='requests' type='xs:byte' use='optional'/>
|
||||
<xs:attribute name='pause' type='xs:unsignedShort' use='optional'/>
|
||||
<xs:attribute name='polling' type='xs:unsignedShort' use='optional'/>
|
||||
<xs:attribute name='report' type='xs:positiveInteger' use='optional'/>
|
||||
<xs:attribute name='requests' type='xs:unsignedByte' use='optional'/>
|
||||
<xs:attribute name='rid' type='xs:positiveInteger' use='optional'/>
|
||||
<xs:attribute name='route' type='xs:string' use='optional'/>
|
||||
<xs:attribute name='secure' type='xs:boolean' use='optional' default='false'/>
|
||||
<xs:attribute name='sid' type='xs:string' use='optional'/>
|
||||
<xs:attribute name='stream' type='xs:string' use='optional'/>
|
||||
<xs:attribute name='time' type='xs:unsignedShort' use='optional'/>
|
||||
<xs:attribute name='to' type='xs:string' use='optional'/>
|
||||
<xs:attribute name='type' use='optional'>
|
||||
<xs:simpleType>
|
||||
|
|
@ -1065,7 +1046,8 @@ Content-Length: 68
|
|||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
</xs:attribute>
|
||||
<xs:attribute name='wait' type='xs:short' use='optional'/>
|
||||
<xs:attribute name='ver' type='xs:string' use='optional'/>
|
||||
<xs:attribute name='wait' type='xs:unsignedShort' use='optional'/>
|
||||
<xs:attribute ref='xml:lang' use='optional'/>
|
||||
<xs:anyAttribute namespace='##other' processContents='lax'/>
|
||||
</xs:complexType>
|
||||
|
|
@ -1075,6 +1057,6 @@ Content-Length: 68
|
|||
]]></code>
|
||||
</section1>
|
||||
<section1 topic='Acknowledgements' anchor='ack'>
|
||||
<p>Thanks to Tomas Karasek, Tobias Markmann, Jack Moffitt, Safa Sofuoğlu, Stefan Strigler, Matthew Wild, and Christopher Zorn for their feedback.</p>
|
||||
<p>Thanks to Mike Cumings, Tomas Karasek, Tobias Markmann, Safa Sofuoğlu, Stefan Strigler, Matthew Wild, Kevin Winters, and Christopher Zorn for their feedback.</p>
|
||||
</section1>
|
||||
</xep>
|
||||
|
|
|
|||
Loading…
Reference in New Issue