diff options
| author | Simon Kelley <simon@thekelleys.org.uk> | 2015-07-30 20:59:07 +0100 |
|---|---|---|
| committer | Simon Kelley <simon@thekelleys.org.uk> | 2015-07-30 20:59:07 +0100 |
| commit | 63ec5d12643b6dbb7f0e9401d39debc21f6638ed (patch) | |
| tree | 9d8671632a9e517151084b810967ba9cf742d1dd | |
| parent | f6381cf482d7cae823e7bcd707fc7e24d6553797 (diff) | |
| download | dnsmasq-2.76test1.tar.gz | |
Fix new poll() code for helper pipe. Removed CPU-spin.v2.76test1v2.75
| -rw-r--r-- | CHANGELOG | 6 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | src/dnsmasq.c | 2 |
3 files changed, 13 insertions, 1 deletions
@@ -1,3 +1,9 @@ +version 2.75 + Fix reversion on 2.74 which caused 100% CPU use when a + dhcp-script is configured. Thanks to Adrian Davey for + reporting the bug and testing the fix. + + version 2.74 Fix reversion in 2.73 where --conf-file would attempt to read the default file, rather than no file. diff --git a/debian/changelog b/debian/changelog index 1355d46..90da2d6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dnsmasq (2.75-1) unstable; urgency=low + + * New upstream. (closes: #794095) + + -- Simon Kelley <simon@thekelleys.org.uk> Thur, 30 Jul 2015 20:58:31 +0000 + dnsmasq (2.74-1) unstable; urgency=low * New upstream. (LP: #1468611) diff --git a/src/dnsmasq.c b/src/dnsmasq.c index 04d5758..81254f6 100644 --- a/src/dnsmasq.c +++ b/src/dnsmasq.c @@ -1025,7 +1025,7 @@ int main (int argc, char **argv) #endif # ifdef HAVE_SCRIPT - if (daemon->helperfd != -1 && poll_check(daemon->helperfd, POLLIN)) + if (daemon->helperfd != -1 && poll_check(daemon->helperfd, POLLOUT)) helper_write(); # endif #endif |