rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'jerry-sandbox' of https://github.com/synergy/synergy into jerry-sandbox

This commit is contained in:
Jerry (Xinyu Hou) 2015-05-26 17:13:09 -07:00
parent f063b094ec dba46707b2
commit 3788084e43
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/lib/server/ClientProxy1_6.cpp
View File

@ -62,19 +62,10 @@ ClientProxy1_6::setClipboard(ClipboardID id, const IClipboard* clipboard)
size_t size = data.size(); size_t size = data.size();
LOG((CLOG_DEBUG "sending clipboard %d to \"%s\"", id, getName().c_str())); LOG((CLOG_DEBUG "sending clipboard %d to \"%s\"", id, getName().c_str()));
// HACK: if using SSL, don't send large clipboards (#4601)
bool send = true;
if (getServer()->isSecure() && (size > kSslClipboardMaxSize)) {
send = false;
LOG((CLOG_WARN "large clipboards not supported with ssl, size=%d", size));
}
if (send) {
StreamChunker::sendClipboard(data, size, id, 0, m_events, this); StreamChunker::sendClipboard(data, size, id, 0, m_events, this);
LOG((CLOG_DEBUG "sent clipboard size=%d", size)); LOG((CLOG_DEBUG "sent clipboard size=%d", size));
} }
} }
}
void void
ClientProxy1_6::handleClipboardSendingEvent(const Event& event, void*) ClientProxy1_6::handleClipboardSendingEvent(const Event& event, void*)