Commit b239c829 authored by Michael Graff's avatar Michael Graff
Browse files

commit lruttl to the mainline. A tag was set called...

commit lruttl to the mainline.  A tag was set called skan_lruttl-mainline-base, and I will tag this as skan_lruttl-mainline-merge after this commit
parent 9578f883
......@@ -137,6 +137,9 @@
--- 9.5.0a6 released ---
2213. [func] "max-cache-size" defaults to 32M.
"max-acache-size" defaults to 16M.
2206. [security] "allow-query-cache" and "allow-recursion" now
cross inherit from each other.
......
......@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: config.c,v 1.81 2007/09/18 00:22:30 marka Exp $ */
/* $Id: config.c,v 1.82 2007/10/19 17:15:53 explorer Exp $ */
/*! \file */
......@@ -129,14 +129,14 @@ options {\n\
max-ncache-ttl 10800; /* 3 hours */\n\
max-cache-ttl 604800; /* 1 week */\n\
transfer-format many-answers;\n\
max-cache-size 0;\n\
max-cache-size 32M;\n\
check-names master fail;\n\
check-names slave warn;\n\
check-names response ignore;\n\
check-mx warn;\n\
acache-enable no;\n\
acache-cleaning-interval 60;\n\
max-acache-size 0;\n\
max-acache-size 16M;\n\
dnssec-enable yes;\n\
dnssec-validation no; /* Make yes for 9.5. */ \n\
dnssec-accept-expired no;\n\
......
......@@ -17,7 +17,7 @@
- PERFORMANCE OF THIS SOFTWARE.
-->
<!-- $Id: named.conf.docbook,v 1.33 2007/09/18 00:22:30 marka Exp $ -->
<!-- $Id: named.conf.docbook,v 1.34 2007/10/19 17:15:53 explorer Exp $ -->
<refentry>
<refentryinfo>
<date>Aug 13, 2004</date>
......@@ -245,8 +245,8 @@ options {
max-ncache-ttl <replaceable>integer</replaceable>;
max-cache-ttl <replaceable>integer</replaceable>;
transfer-format ( many-answers | one-answer );
max-cache-size <replaceable>size_no_default</replaceable>;
max-acache-size <replaceable>size_no_default</replaceable>;
max-cache-size <replaceable>size</replaceable>;
max-acache-size <replaceable>size</replaceable>;
clients-per-query <replaceable>number</replaceable>;
max-clients-per-query <replaceable>number</replaceable>;
check-names ( master | slave | response )
......@@ -402,8 +402,8 @@ view <replaceable>string</replaceable> <replaceable>optional_class</replaceable>
max-ncache-ttl <replaceable>integer</replaceable>;
max-cache-ttl <replaceable>integer</replaceable>;
transfer-format ( many-answers | one-answer );
max-cache-size <replaceable>size_no_default</replaceable>;
max-acache-size <replaceable>size_no_default</replaceable>;
max-cache-size <replaceable>size</replaceable>;
max-acache-size <replaceable>size</replaceable>;
clients-per-query <replaceable>number</replaceable>;
max-clients-per-query <replaceable>number</replaceable>;
check-names ( master | slave | response )
......
......@@ -18,7 +18,7 @@
- PERFORMANCE OF THIS SOFTWARE.
-->
<!-- File: $Id: Bv9ARM-book.xml,v 1.338 2007/09/26 03:22:44 marka Exp $ -->
<!-- File: $Id: Bv9ARM-book.xml,v 1.339 2007/10/19 17:15:53 explorer Exp $ -->
<book xmlns:xi="http://www.w3.org/2001/XInclude">
<title>BIND 9 Administrator Reference Manual</title>
......@@ -6812,9 +6812,7 @@ query-source-v6 address * port *;
with
multiple views, the limit applies separately to the cache of
each
view. The default is <literal>unlimited</literal>, meaning that
records are purged from the cache only when their TTLs
expire.
view. The default is <literal>32M</literal>.
</para>
</listitem>
</varlistentry>
......@@ -7858,10 +7856,7 @@ query-source-v6 address * port *;
In a server with multiple views, the limit applies
separately to the
acache of each view.
The default is <literal>unlimited</literal>,
meaning that
entries are purged from the acache only at the
periodic cleaning time.
The default is <literal>16M</literal>.
</para>
</listitem>
</varlistentry>
......
This is a summary of the named.conf options supported by
This is a summary of the named.conf options supported by
this version of BIND 9.
acl <string> { <address_match_element>; ... };
......@@ -122,8 +122,8 @@ options {
maintain-ixfr-base <boolean>; // obsolete
masterfile-format ( text | raw );
match-mapped-addresses <boolean>;
max-acache-size <size_no_default>;
max-cache-size <size_no_default>;
max-acache-size <size>;
max-cache-size <size>;
max-cache-ttl <integer>;
max-clients-per-query <integer>;
max-ixfr-log-size <size>; // obsolete
......@@ -292,8 +292,8 @@ view <string> <optional_class> {
match-clients { <address_match_element>; ... };
match-destinations { <address_match_element>; ... };
match-recursive-only <boolean>;
max-acache-size <size_no_default>;
max-cache-size <size_no_default>;
max-acache-size <size>;
max-cache-size <size>;
max-cache-ttl <integer>;
max-clients-per-query <integer>;
max-ixfr-log-size <size>; // obsolete
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: heap.c,v 1.36 2007/06/19 23:47:17 tbox Exp $ */
/* $Id: heap.c,v 1.37 2007/10/19 17:15:53 explorer Exp $ */
/*! \file
* Heap implementation of priority queues adapted from the following:
......@@ -208,9 +208,13 @@ isc_heap_delete(isc_heap_t *heap, unsigned int index) {
REQUIRE(index >= 1 && index <= heap->last);
if (index == heap->last) {
heap->array[heap->last] = NULL;
heap->last--;
} else {
elt = heap->array[heap->last--];
elt = heap->array[heap->last];
heap->array[heap->last] = NULL;
heap->last--;
less = heap->compare(elt, heap->array[index]);
heap->array[index] = elt;
if (less)
......@@ -239,9 +243,11 @@ isc_heap_decreased(isc_heap_t *heap, unsigned int index) {
void *
isc_heap_element(isc_heap_t *heap, unsigned int index) {
REQUIRE(VALID_HEAP(heap));
REQUIRE(index >= 1 && index <= heap->last);
REQUIRE(index >= 1);
return (heap->array[index]);
if (index <= heap->last)
return (heap->array[index]);
return (NULL);
}
void
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment