1
0
mirror of https://github.com/moparisthebest/xeps synced 2024-11-25 02:32:18 -05:00

Merge branch 'merge/xep-0363'

This commit is contained in:
Jonas Wielicki 2018-05-31 08:44:26 +02:00
commit c3fe5e4dba

View File

@ -11,6 +11,7 @@
&LEGALNOTICE; &LEGALNOTICE;
<number>0363</number> <number>0363</number>
<status>Proposed</status> <status>Proposed</status>
<lastcall>2018-06-14</lastcall>
<lastcall>2017-12-12</lastcall> <lastcall>2017-12-12</lastcall>
<type>Standards Track</type> <type>Standards Track</type>
<sig>Standards</sig> <sig>Standards</sig>
@ -29,6 +30,16 @@
<email>daniel@gultsch.de</email> <email>daniel@gultsch.de</email>
<jid>daniel@gultsch.de</jid> <jid>daniel@gultsch.de</jid>
</author> </author>
<revision>
<version>0.7.0</version>
<date>2018-05-30</date>
<initials>dg</initials>
<remark>
<ul>
<li>Changed not-allowed error to forbidden as this is more appropriate according to &rfc6120;</li>
</ul>
</remark>
</revision>
<revision> <revision>
<version>0.6.0</version> <version>0.6.0</version>
<date>2018-04-21</date> <date>2018-04-21</date>
@ -225,7 +236,7 @@
</iq>]]></example> </iq>]]></example>
</section1> </section1>
<section1 topic='Error conditions' anchor='errors'> <section1 topic='Error conditions' anchor='errors'>
<p>Instead of providing the client with a slot the service MAY respond with an error if the requested file size is too large.</p> <p>Instead of providing the client with a slot the service MAY respond with an error if the requested file size is too large. In addition the entity MAY inform the requester about the maximum file size.</p>
<example caption='Alternative response by the upload service if the file size was too large'><![CDATA[ <example caption='Alternative response by the upload service if the file size was too large'><![CDATA[
<iq from='upload.montague.tld' <iq from='upload.montague.tld'
id='step_03' id='step_03'
@ -261,7 +272,7 @@
stamp='2017-12-03T23:42:05Z' /> stamp='2017-12-03T23:42:05Z' />
</error> </error>
</iq>]]></example> </iq>]]></example>
<example caption='Alternative response by the upload service to indicate a permanent error to a client that is not allowed to upload files'><![CDATA[ <example caption='Alternative response by the upload service to indicate an auth error to a client that is not allowed to upload files'><![CDATA[
<iq from='upload.montague.tld' <iq from='upload.montague.tld'
id='step_03' id='step_03'
to='romeo@montague.tld/garden' to='romeo@montague.tld/garden'
@ -270,8 +281,8 @@
filename='très cool.jpg' filename='très cool.jpg'
size='23456' size='23456'
content-type='image/jpeg' /> content-type='image/jpeg' />
<error type='cancel'> <error type='auth'>
<not-allowed xmlns='urn:ietf:params:xml:ns:xmpp-stanzas' /> <forbidden xmlns='urn:ietf:params:xml:ns:xmpp-stanzas' />
<text xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'>Only premium members are allowed to upload files</text> <text xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'>Only premium members are allowed to upload files</text>
</error> </error>
</iq>]]></example> </iq>]]></example>