diff --git a/src/net/streamsocket.cpp b/src/net/streamsocket.cpp
index befd491..3f8eb31 100644
--- a/src/net/streamsocket.cpp
+++ b/src/net/streamsocket.cpp
@@ -1,87 +1,89 @@
 /***************************************************************************
  *   Copyright (C) 2011 by Joris Guisson                                   *
  *   joris.guisson@gmail.com                                               *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.          *
  ***************************************************************************/
 
 
 #include "streamsocket.h"
 #include "socketmonitor.h"
 
 namespace net
 {
 	StreamSocket::StreamSocket(bool tcp, int ip_version, StreamSocketListener* listener)
 		: TrafficShapedSocket(tcp, ip_version), 
 		listener(listener)
 	{
 	}
 	
 	StreamSocket::~StreamSocket()
 	{
 	}
 	
 	void StreamSocket::addData(const QByteArray& data)
 	{
 		QMutexLocker lock(&mutex);
 		buffer.append(data);
 		net::SocketMonitor::instance().signalPacketReady();
 	}
 
 
 	bool StreamSocket::bytesReadyToWrite() const
 	{
 		QMutexLocker lock(&mutex);
 		return !buffer.isEmpty() || sock->state() == net::SocketDevice::CONNECTING;
 	}
 
 	bt::Uint32 StreamSocket::write(bt::Uint32 max, bt::TimeStamp now)
 	{
 		Q_UNUSED(now);
 		
 		QMutexLocker lock(&mutex);
 		if (sock->state() == net::SocketDevice::CONNECTING)
 		{
 			bool ok = sock->connectSuccesFull();
 			if (listener)
 				listener->connectFinished(ok);
 			if (!ok)
 				return 0;
 		}
 		
 		if (buffer.isEmpty())
 			return 0;
 		
-		int to_send = qMin<int>(buffer.size(), max);
+
+		// max 0 means unlimited transfer, try to send the entire buffer then
+		int to_send = (max == 0) ? buffer.size() : qMin<int>(buffer.size(), max);
 		int ret = sock->send((const bt::Uint8*)buffer.data(), to_send);
 		if (ret == to_send)
 		{
 			buffer.clear();
 			if (listener)
 				listener->dataSent();
 			return ret;
 		}
 		else if (ret > 0)
 		{
 			buffer = buffer.mid(ret);
 			return ret;
 		}
 		else 
 		{
 			return 0;
 		}
 	}
 }
\ No newline at end of file