Pi-Hole/dnsmasq
1
0
Fork 0
mirror of https://github.com/pi-hole/dnsmasq.git synced 2025-12-19 18:28:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix new poll() code for helper pipe. Removed CPU-spin.

Browse Source
This commit is contained in:
Simon Kelley
2015-07-30 20:59:07 +01:00
parent f6381cf482
commit 63ec5d1264
3 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG
View File

@@ -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 version 2.74
Fix reversion in 2.73 where --conf-file would attempt to Fix reversion in 2.73 where --conf-file would attempt to
read the default file, rather than no file. read the default file, rather than no file.

6
debian/changelog vendored
View File

@@ -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 dnsmasq (2.74-1) unstable; urgency=low
* New upstream. (LP: #1468611) * New upstream. (LP: #1468611)

2
src/dnsmasq.c
View File

@@ -1025,7 +1025,7 @@ int main (int argc, char **argv)
#endif #endif
# ifdef HAVE_SCRIPT # ifdef HAVE_SCRIPT
if (daemon->helperfd != -1 && poll_check(daemon->helperfd, POLLIN)) if (daemon->helperfd != -1 && poll_check(daemon->helperfd, POLLOUT))
helper_write(); helper_write();
# endif # endif
#endif #endif