Mercurial > pidgin.yaz
comparison 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 |
comparison
equal
deleted
inserted
replaced
31448:9a705087d64e | 31449:1c660ba17ba1 |
---|---|
91 } else { | 91 } else { |
92 g_free(attrib); | 92 g_free(attrib); |
93 } | 93 } |
94 } | 94 } |
95 | 95 |
96 if (js->stream_id == NULL) | 96 if (js->stream_id == NULL) { |
97 #if 0 | |
98 /* This was underspecified in rfc3920 as only being a SHOULD, so | |
99 * we cannot rely on it. See #12331 and Oracle's server. | |
100 */ | |
97 purple_connection_error_reason(js->gc, | 101 purple_connection_error_reason(js->gc, |
98 PURPLE_CONNECTION_ERROR_AUTHENTICATION_IMPOSSIBLE, | 102 PURPLE_CONNECTION_ERROR_AUTHENTICATION_IMPOSSIBLE, |
99 _("XMPP stream missing ID")); | 103 _("XMPP stream missing ID")); |
104 #else | |
105 /* Instead, let's make up a placeholder stream ID, which we need | |
106 * to do because we flag on it being NULL as a special case | |
107 * in this parsing code. | |
108 */ | |
109 js->stream_id = g_strdup(""); | |
110 purple_debug_info("jabber", "Server failed to specify a stream " | |
111 "ID (underspecified in rfc3920, but intended " | |
112 "to be a MUST; digest legacy auth may fail.\n"); | |
113 #endif | |
114 } | |
100 } else { | 115 } else { |
101 | 116 |
102 if(js->current) | 117 if(js->current) |
103 node = xmlnode_new_child(js->current, (const char*) element_name); | 118 node = xmlnode_new_child(js->current, (const char*) element_name); |
104 else | 119 else |