← Back to branch summary

~jtaylor/ubuntu/oneiric/gajim/multiple-CVE

« back to all changes in this revision

Viewing changes to src/common/xmpp/filetransfer.py

  • Committer: Bazaar Package Importer
  • Author(s): Nafallo Bjälevik
  • Date: 2008-11-16 00:26:27 UTC
  • mfrom: (1.1.10 upstream)
  • Revision ID: james.westby@ubuntu.com-20081116002627-4olie99o2rqc7001
Tags: 0.12~beta1-0ubuntu1
* New upstream beta release:
  + Security improvements: End-to-End encryption, SSL certificat verification
  + Ability to minimize groupchats in roster
  + Chat to groupchat transformation
  + Block/Unblock contacts directly from roster
  + Single window mode
  + PEP support (User activity, mood and tune)
  + Security improvements: Kerberos (GSSAPI) SASL Authentication mechanism
  + Improve GUI of some windows
  + Fix handling of invalid XML
  + Fix freeze on connection
* Dropped all changes, patches and backports.
* src/common/passwords.py:
  - Change keyring to 'login', which is what gets unlocked at login.
* debian/copyright:
  - Updated for the GPL-3 change and for the amount of upstream authors.
* debian/control:
  - Update Standards-Version and drop XS for Vcs-Bzr.
  - Add Homepage and use ${shlibs:Depends}.
* debian/rules:
  - Update to not ignore errors from make clean.
  - Update with dh_shlibdeps.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/common/xmpp/filetransfer.py
147
147
        else:
148
148
            stream=self._streams[sid]
149
149
            if not data: err=ERR_BAD_REQUEST
150
 
            elif seq<>stream['seq']: err=ERR_UNEXPECTED_REQUEST
 
150
            elif seq!=stream['seq']: err=ERR_UNEXPECTED_REQUEST
151
151
            else:
152
152
                self.DEBUG('Successfull receive sid->%s %s+%s bytes'%(sid,stream['fp'].tell(),len(data)),'ok')
153
153
                stream['seq']+=1
197
197
                        stream['direction']=stream['direction'][1:]
198
198
                        conn.Event(self.DBG_LINE,'STREAM COMMITTED',stream)
199
199
                    else: conn.send(Error(stanza,ERR_UNEXPECTED_REQUEST))
 
200
 
 
201
# vim: se ts=3:
 
 
b'\\ No newline at end of file'