mirror of
https://github.com/rakshasa/rtorrent.git
synced 2026-08-09 11:42:33 +00:00
* Fixed two instances of string includes where <strings.h> was used
instead of <string.h>.
* Fixes {stop,close}_on_ratio calling further commands even when the
"ignore commands" flag is set.
* Work-around for OpenBSD's broken sys/event.h, which fails to compile
if it's the first (or only) included header. (Ticket #1470)
* Fixes compilation with old libcurl versions. (Ticket #1471)
* Fix compile error on systems that lack mincore(2).
* Fixes a crash in epoll due to libcurl/c-ares bug:
PollEPoll::modify(...) epoll_ctl call failed.
All patches by Josef Drexler.
git-svn-id: svn://rakshasa.no/libtorrent/trunk/rtorrent@1072 e378c898-3ddf-0310-93e7-cc216c733640
This commit is contained in:
@@ -114,6 +114,9 @@ apply_on_ratio(int action, const torrent::Object& rawArgs) {
|
||||
(itr = std::find_if(itr, downloadList->end(), std::mem_fun(&core::Download::is_seeding))) != downloadList->end(); ) {
|
||||
core::Download* current = *itr++;
|
||||
|
||||
if (rpc::call_command_value("d.get_ignore_commands", rpc::make_target(current)) != 0)
|
||||
continue;
|
||||
|
||||
int64_t totalDone = current->download()->bytes_done();
|
||||
int64_t totalUpload = current->download()->up_rate()->total();
|
||||
|
||||
|
||||
@@ -55,11 +55,11 @@ CurlStack::CurlStack() :
|
||||
|
||||
m_taskTimeout.set_slot(rak::mem_fn(this, &CurlStack::receive_timeout));
|
||||
|
||||
curl_multi_setopt((CURLM*)m_handle, CURLMOPT_TIMERDATA, this);
|
||||
curl_multi_setopt((CURLM*)m_handle, CURLMOPT_SOCKETDATA, this);
|
||||
#if (LIBCURL_VERSION_NUM >= 0x071000)
|
||||
curl_multi_setopt((CURLM*)m_handle, CURLMOPT_TIMERDATA, this);
|
||||
curl_multi_setopt((CURLM*)m_handle, CURLMOPT_TIMERFUNCTION, &CurlStack::set_timeout);
|
||||
#endif
|
||||
curl_multi_setopt((CURLM*)m_handle, CURLMOPT_SOCKETDATA, this);
|
||||
curl_multi_setopt((CURLM*)m_handle, CURLMOPT_SOCKETFUNCTION, &CurlSocket::receive_socket);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user