Merge remote-tracking branch 'purple/master'

This commit is contained in:
Jeff Becker 2016-07-25 10:29:10 -04:00
commit 0d854c6ea6
No known key found for this signature in database
GPG key ID: AB950234D6EA286B

View file

@ -70,7 +70,7 @@ namespace client
if (eol) if (eol)
{ {
*eol = 0; *eol = 0;
if (eol != receiver->buffer && eol[-1] == '\r') eol[-1] = 0; // workaround for Transmission, it sends '\r\n' terminated address
receiver->data = (uint8_t *)eol + 1; receiver->data = (uint8_t *)eol + 1;
receiver->dataLen = receiver->bufferOffset - (eol - receiver->buffer + 1); receiver->dataLen = receiver->bufferOffset - (eol - receiver->buffer + 1);
i2p::data::IdentHash ident; i2p::data::IdentHash ident;