mirror of
https://github.com/rakshasa/rtorrent.git
synced 2026-08-14 14:12:31 +00:00
Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 4463bf418e | |||
| 8bd7c79755 | |||
| f2b83d50e8 | |||
| ab40059891 | |||
| b9d880dea3 | |||
| b4c59d2c7a |
@@ -14,6 +14,8 @@ jobs:
|
|||||||
- name: Fetch libtorrent
|
- name: Fetch libtorrent
|
||||||
run: |
|
run: |
|
||||||
git clone https://github.com/rakshasa/libtorrent
|
git clone https://github.com/rakshasa/libtorrent
|
||||||
|
cd libtorrent
|
||||||
|
git checkout stable-0.15
|
||||||
- name: Build libtorrent
|
- name: Build libtorrent
|
||||||
run: |
|
run: |
|
||||||
cd libtorrent
|
cd libtorrent
|
||||||
|
|||||||
@@ -14,6 +14,8 @@ jobs:
|
|||||||
- name: Fetch libtorrent
|
- name: Fetch libtorrent
|
||||||
run: |
|
run: |
|
||||||
git clone https://github.com/rakshasa/libtorrent
|
git clone https://github.com/rakshasa/libtorrent
|
||||||
|
cd libtorrent
|
||||||
|
git checkout stable-0.15
|
||||||
- name: Build libtorrent
|
- name: Build libtorrent
|
||||||
run: |
|
run: |
|
||||||
cd libtorrent
|
cd libtorrent
|
||||||
|
|||||||
+2
-2
@@ -1,6 +1,6 @@
|
|||||||
m4_pattern_allow([PKG_CHECK_EXISTS])
|
m4_pattern_allow([PKG_CHECK_EXISTS])
|
||||||
|
|
||||||
AC_INIT([rtorrent],[0.15.4],[sundell.software@gmail.com])
|
AC_INIT([rtorrent],[0.15.5],[sundell.software@gmail.com])
|
||||||
|
|
||||||
AC_CONFIG_HEADERS([config.h])
|
AC_CONFIG_HEADERS([config.h])
|
||||||
AC_CONFIG_MACRO_DIRS([scripts])
|
AC_CONFIG_MACRO_DIRS([scripts])
|
||||||
@@ -54,7 +54,7 @@ fi
|
|||||||
|
|
||||||
PKG_CHECK_MODULES([LIBCURL], [libcurl],, [LIBCURL_CHECK_CONFIG])
|
PKG_CHECK_MODULES([LIBCURL], [libcurl],, [LIBCURL_CHECK_CONFIG])
|
||||||
PKG_CHECK_MODULES([CPPUNIT], [cppunit],, [no_cppunit="yes"])
|
PKG_CHECK_MODULES([CPPUNIT], [cppunit],, [no_cppunit="yes"])
|
||||||
PKG_CHECK_MODULES([DEPENDENCIES], [libtorrent >= 0.15.4])
|
PKG_CHECK_MODULES([DEPENDENCIES], [libtorrent >= 0.15.5])
|
||||||
|
|
||||||
AC_LANG_PUSH(C++)
|
AC_LANG_PUSH(C++)
|
||||||
TORRENT_WITH_XMLRPC_C
|
TORRENT_WITH_XMLRPC_C
|
||||||
|
|||||||
@@ -233,10 +233,14 @@ CurlStack::global_cleanup() {
|
|||||||
// TODO: Is this function supposed to set a per-handle timeout, or is
|
// TODO: Is this function supposed to set a per-handle timeout, or is
|
||||||
// it the shortest timeout amongst all handles?
|
// it the shortest timeout amongst all handles?
|
||||||
int
|
int
|
||||||
CurlStack::set_timeout([[maybe_unused]] void* handle, std::chrono::microseconds timeout, void* userp) {
|
CurlStack::set_timeout(void*, long timeout_ms, void* userp) {
|
||||||
CurlStack* stack = (CurlStack*)userp;
|
CurlStack* stack = (CurlStack*)userp;
|
||||||
|
|
||||||
torrent::this_thread::scheduler()->update_wait_for_ceil_seconds(&stack->m_task_timeout, timeout);
|
if (timeout_ms == -1)
|
||||||
|
torrent::this_thread::scheduler()->erase(&stack->m_task_timeout);
|
||||||
|
else
|
||||||
|
torrent::this_thread::scheduler()->update_wait_for_ceil_seconds(&stack->m_task_timeout, std::chrono::milliseconds(timeout_ms));
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -79,7 +79,7 @@ public:
|
|||||||
|
|
||||||
void receive_action(CurlSocket* socket, int type);
|
void receive_action(CurlSocket* socket, int type);
|
||||||
|
|
||||||
static int set_timeout(void* handle, std::chrono::microseconds timeout, void* userp);
|
static int set_timeout(void*, long timeout_ms, void* userp);
|
||||||
|
|
||||||
void transfer_done(void* handle, const char* msg);
|
void transfer_done(void* handle, const char* msg);
|
||||||
|
|
||||||
|
|||||||
@@ -100,9 +100,10 @@ DownloadStore::write_bencode(const std::string& filename, const torrent::Object&
|
|||||||
#else
|
#else
|
||||||
fdatasync(fd);
|
fdatasync(fd);
|
||||||
#endif
|
#endif
|
||||||
::close(fd);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
::close(fd);
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
download_store_save_error:
|
download_store_save_error:
|
||||||
|
|||||||
Reference in New Issue
Block a user