diff options
| author | LaMont Jones <lamont@debian.org> | 2009-03-20 08:27:32 -0600 |
|---|---|---|
| committer | LaMont Jones <lamont@debian.org> | 2009-03-20 08:27:32 -0600 |
| commit | 67a6c0e4a654adcfe2a6e5ac5dd9e0c26d8ef395 (patch) | |
| tree | 9f13ad3c7343b1f249ab09d4c90f956eb6c5e36c | |
| parent | a09d1c0c8e5881c7a0fb453d62fb59370180686c (diff) | |
| download | bind9-67a6c0e4a654adcfe2a6e5ac5dd9e0c26d8ef395.tar.gz | |
9.6.0
| -rw-r--r-- | CHANGES | 10 | ||||
| -rw-r--r-- | bin/named/statschannel.c | 4 | ||||
| -rw-r--r-- | version | 6 |
3 files changed, 15 insertions, 5 deletions
@@ -1,4 +1,10 @@ + --- 9.6.0 released --- + +2520. [bug] Update xml statistics version number to 2.0 as change + #2388 made the schema incompatible to the previous + version. [RT #19080] + --- 9.6.0rc2 released --- 2515. [port] win32: build dnssec-dsfromkey and dnssec-keyfromlabel. @@ -312,6 +318,10 @@ for select(). To enable this, set ISC_SOCKET_MAXSOCKETS at compilation time. [RT #18433] + Note: with changes #2469 and #2421 above, there is no + need to tweak ISC_SOCKET_MAXSOCKETS at compilation time + any more. + 2410. [bug] Correctly delete m_versionInfo. [RT #18432] 2409. [bug] Only log that we disabled EDNS processing if we were diff --git a/bin/named/statschannel.c b/bin/named/statschannel.c index 6dc4fc64..634a50de 100644 --- a/bin/named/statschannel.c +++ b/bin/named/statschannel.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: statschannel.c,v 1.14 2008/08/08 05:06:49 marka Exp $ */ +/* $Id: statschannel.c,v 1.14.64.1 2008/12/18 02:40:35 marka Exp $ */ /*! \file */ @@ -635,7 +635,7 @@ generatexml(ns_server_t *server, int *buflen, xmlChar **buf) { TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "bind")); TRY0(xmlTextWriterStartElement(writer, ISC_XMLCHAR "statistics")); TRY0(xmlTextWriterWriteAttribute(writer, ISC_XMLCHAR "version", - ISC_XMLCHAR "1.0")); + ISC_XMLCHAR "2.0")); /* Set common fields for statistics dump */ dumparg.type = statsformat_xml; @@ -1,4 +1,4 @@ -# $Id: version,v 1.43.12.1 2008/12/11 00:18:40 marka Exp $ +# $Id: version,v 1.43.12.2 2008/12/21 22:21:57 marka Exp $ # # This file must follow /bin/sh rules. It is imported directly via # configure. @@ -6,5 +6,5 @@ MAJORVER=9 MINORVER=6 PATCHVER=0 -RELEASETYPE=rc -RELEASEVER=2 +RELEASETYPE= +RELEASEVER= |