← Back to branch summary

~ubuntu-branches/debian/squeeze/erlang/squeeze

« back to all changes in this revision

Viewing changes to lib/ssh/src/ssh_transport.erl

  • Committer: Bazaar Package Importer
  • Author(s): Sergei Golovan
  • Date: 2009-08-05 20:54:29 UTC
  • mfrom: (6.1.2 sid)
  • Revision ID: james.westby@ubuntu.com-20090805205429-pm4pnwew8axraosl
Tags: 1:13.b.1-dfsg-5
http://bugs.debian.org/536891
* Fixed parentheses in Emacs mode (closes: #536891).
* Removed unnecessary conflicts with erlang-manpages package.
* Added workaround for #475459: disabled threads on sparc architecture.
  This breaks wxErlang, so it's only a temporary solution.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/ssh/src/ssh_transport.erl
685
685
pack(Data0, #ssh{encrypt_block_size = BlockSize, 
686
686
                 send_sequence = SeqNum, send_mac = MacAlg,
687
687
                 send_mac_key = MacKey} 
688
 
     = Ssh0) when binary(Data0) ->
 
688
     = Ssh0) when is_binary(Data0) ->
689
689
    {Ssh1, Data} = compress(Ssh0, Data0),
690
690
    PL = (BlockSize - ((4 + 1 + size(Data)) rem BlockSize)) rem BlockSize,
691
691
    PaddingLen = if PL <  4 -> PL + BlockSize;