2
0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 22:15:20 +00:00

3011. [func] Change the default query timeout from 30 seconds

to 10.  Allow setting this in named.conf using the new
                        'resolver-query-timeout' option, which specifies a max
                        time in seconds.  0 means 'default' and anything longer
                        than 30 will be silently set to 30. [RT #22852]
This commit is contained in:
Mark Andrews
2011-02-03 05:41:55 +00:00
parent da6fe5c101
commit 000a8970f8
18 changed files with 423 additions and 37 deletions

View File

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: task.c,v 1.115 2010/12/22 05:19:01 marka Exp $ */
/* $Id: task.c,v 1.116 2011/02/03 05:41:54 marka Exp $ */
/*! \file
* \author Principal Author: Bob Halley
@@ -1210,6 +1210,8 @@ isc__taskmgr_create(isc_mem_t *mctx, unsigned int workers,
#ifdef USE_SHARED_MANAGER
if (taskmgr != NULL) {
if (taskmgr->refs == 0)
return (ISC_R_SHUTTINGDOWN);
taskmgr->refs++;
*managerp = (isc_taskmgr_t *)taskmgr;
return (ISC_R_SUCCESS);
@@ -1325,8 +1327,8 @@ isc__taskmgr_destroy(isc_taskmgr_t **managerp) {
#endif /* USE_WORKER_THREADS */
#ifdef USE_SHARED_MANAGER
if (manager->refs > 1) {
manager->refs--;
manager->refs--;
if (manager->refs > 0) {
*managerp = NULL;
return;
}
@@ -1396,6 +1398,9 @@ isc__taskmgr_destroy(isc_taskmgr_t **managerp) {
isc_mem_printallactive(stderr);
#endif
INSIST(ISC_LIST_EMPTY(manager->tasks));
#ifdef USE_SHARED_MANAGER
taskmgr = NULL;
#endif
#endif /* USE_WORKER_THREADS */
manager_free(manager);