← Back to branch summary

~ubuntu-branches/ubuntu/wily/maradns/wily-proposed

« back to all changes in this revision

Viewing changes to deadwood-3.2.07/update/2.9.03/deadwood-2.9.02-timeout_tweak.patch

  • Committer: Package Import Robot
  • Author(s): Dariusz Dwornikowski, Tomasz Buchert, Dariusz Dwornikowski
  • Date: 2015-03-27 18:34:08 UTC
  • mfrom: (1.2.12)
  • Revision ID: package-import@ubuntu.com-20150327183408-wnfachdkdjt96yu6
Tags: 2.0.11-1
http://bugs.debian.org/785536
http://bugs.debian.org/785535
[ Tomasz Buchert ]
* Imported Upstream version 2.0.11

[ Dariusz Dwornikowski ]
* d/patches: 
  - refreshed all patches for new deadwood version
  - removed generating of random prime on build (Closes: #785536) 
* d/rules: date taken from changelog (Closes: #785535)

Show diffs side-by-side

added added

removed removed

Lines of Context:
deadwood-3.2.07/update/2.9.03/deadwood-2.9.02-timeout_tweak.patch
 
1
This tweaks the timeout for parent queries when they spawn a child query
 
2
to solve a glueless NS or incomplete CNAME; I'm increasing it to get fewer
 
3
SERVER FAILs when resolving complex names.
 
4
 
 
5
--- deadwood-2.9.03/src/DwRecurse.c.orig        2010-08-03 15:19:47.000000000 -0700
 
6
+++ deadwood-2.9.03/src/DwRecurse.c     2010-08-03 15:20:09.000000000 -0700
 
7
@@ -2667,7 +2667,7 @@
 
8
         }
 
9
         make_remote_connection(new_conn_num,(unsigned char *)packet->str,
 
10
                         packet->len,rem[new_conn_num].query,INVALID_SOCKET);
 
11
-        rem[conn_number].die = get_time() + ((int64_t)timeout_seconds << 10);
 
12
+        rem[conn_number].die = get_time() + ((int64_t)timeout_seconds << 12);
 
13
         rem[conn_number].child_id = new_conn_num;
 
14
         /* Set new connection parameters */
 
15
         rem[new_conn_num].die = get_time() + ((int64_t)timeout_seconds << 8);