Mercurial > pidgin.yaz
diff libpurple/protocols/jabber/parser.c @ 31449:1c660ba17ba1
propagate from branch 'im.pidgin.pidgin' (head 6f879669a6513a5c40335bbaefe842389a92b39e)
to branch 'im.pidgin.cpw.qulogic.cairo' (head 4ab0199887f74442673fd46dcbb662bc7f070bc4)
| author | Marcus Lundblad <ml@update.uu.se> |
|---|---|
| date | Sun, 21 Nov 2010 20:30:12 +0000 |
| parents | 63ce2608c2c0 |
| children | a8cc50c2279f |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/parser.c Sat Aug 21 06:04:13 2010 +0000 +++ b/libpurple/protocols/jabber/parser.c Sun Nov 21 20:30:12 2010 +0000 @@ -93,10 +93,25 @@ } } - if (js->stream_id == NULL) + if (js->stream_id == NULL) { +#if 0 + /* This was underspecified in rfc3920 as only being a SHOULD, so + * we cannot rely on it. See #12331 and Oracle's server. + */ purple_connection_error_reason(js->gc, PURPLE_CONNECTION_ERROR_AUTHENTICATION_IMPOSSIBLE, _("XMPP stream missing ID")); +#else + /* Instead, let's make up a placeholder stream ID, which we need + * to do because we flag on it being NULL as a special case + * in this parsing code. + */ + js->stream_id = g_strdup(""); + purple_debug_info("jabber", "Server failed to specify a stream " + "ID (underspecified in rfc3920, but intended " + "to be a MUST; digest legacy auth may fail.\n"); +#endif + } } else { if(js->current)