Changeset a87e6ba


Ignore:
Timestamp:
2010-04-11T18:13:19Z (9 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
e00da63
Parents:
17a6ee9 (diff), 3ab1d31 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merging a Jabber ft bugfix.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • protocols/jabber/s5bytestream.c

    r17a6ee9 ra87e6ba  
    482482                        else if( ret < sizeof( struct socks5_message ) )
    483483                        {
    484                                 /* Either a buggy proxy or just one that doesnt regard the SHOULD in XEP-0065
    485                                  * saying the reply SHOULD contain the address */
    486 
    487                                 ASSERTSOCKOP( ret = recv( fd, &socks5_reply, ret, 0 ), "Dequeuing after MSG_PEEK" );
     484                                /* Either a buggy proxy or just one that doesnt regard
     485                                 * the SHOULD in XEP-0065 saying the reply SHOULD
     486                                 * contain the address. We'll take it, so make sure the
     487                                 * next jabber_bs_peek starts with an empty buffer. */
     488                                bt->peek_buf_len = 0;
    488489                        }
    489490
Note: See TracChangeset for help on using the changeset viewer.