← Back to branch summary

~prateek.karandikar/ubuntu/precise/pidgin/add_quicklist

« back to all changes in this revision

Viewing changes to libpurple/protocols/jabber/parser.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2010-11-05 19:44:21 UTC
  • mfrom: (62.1.1 maverick-security) (2.3.12 sid)
  • Revision ID: james.westby@ubuntu.com-20101105194421-8r8o4pzw2m5j4hiy
Tags: 1:2.7.5-1ubuntu1
Resync on Debian

Show diffs side-by-side

added added

removed removed

Lines of Context:
libpurple/protocols/jabber/parser.c
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
101
                        purple_connection_error_reason(js->gc,
98
102
                                        PURPLE_CONNECTION_ERROR_AUTHENTICATION_IMPOSSIBLE,
99
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
115
        } else {
101
116
 
102
117
                if(js->current)