646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
27 lines
954 B
Diff
27 lines
954 B
Diff
From Ingo Hadan <ingo.hadan@sdm.de> Fri, 02 Apr 2010 21:08:50 +0200
|
|
From: Julien Moutinho <julm+tsocks@autogeree.net>
|
|
Date: Fri, 26 Apr 2013 01:57:26 +0200
|
|
Subject: tsocks fails if socksified application uses poll(2) (e.g. subversion-1.5)
|
|
|
|
---
|
|
diff --git a/tsocks.c b/tsocks.c
|
|
index 9cfdfff..470babd 100644
|
|
--- a/tsocks.c
|
|
+++ b/tsocks.c
|
|
@@ -657,10 +657,11 @@ int poll(POLL_SIGNATURE) {
|
|
* be ready for writing), otherwise we'll just let the select loop
|
|
* come around again (since we can't flag it for read, we don't know
|
|
* if there is any data to be read and can't be bothered checking) */
|
|
- if (conn->selectevents & WRITE) {
|
|
- setevents |= POLLOUT;
|
|
+ if (conn->selectevents & POLLOUT) {
|
|
+ ufds[i].revents |= POLLOUT;
|
|
nevents++;
|
|
}
|
|
+ ufds[i].events = conn->selectevents;
|
|
}
|
|
}
|
|
} while (nevents == 0);
|
|
|
|
|