[master] add xml/v2 and xml/v3 URIs

3527.	[compat]	Add a URI to allow applications to explicitly
			request a particular XML schema from the statistics
			channel, returning 404 if not supported. [RT #32481]

diff --git a/CHANGES b/CHANGES
index 8507723892fcf0a4821adc6c4e16cae4d6111111..4c987efd83177c85f5c2a2cb835a4bbc153ca7d1 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+3527.  [compat]        Add a URI to allow applications to explicitly
+                       request a particular XML schema from the statistics
+                       channel, returning 404 if not supported. [RT #32481]
+
 3526.  [cleanup]       Set up dependencies for unit tests correctly during
                        build. [RT #32803]
 

diff --git a/bin/named/statschannel.c b/bin/named/statschannel.c
index 0cee240fb79dcacbb3bcea72b4911b729db0b850..466fdc12a24293e9c7d0ed5b432085c23a767f44 100644 (file)
--- a/bin/named/statschannel.c
+++ b/bin/named/statschannel.c
@@ -1984,8 +1984,10 @@ add_listener(ns_server_t *server, ns_statschannel_t **listenerp,
                goto cleanup;
 
 #ifdef HAVE_LIBXML2
-       isc_httpdmgr_addurl(listener->httpdmgr, "/xml", render_index, server);
        isc_httpdmgr_addurl(listener->httpdmgr, "/", render_index, server);
+       isc_httpdmgr_addurl(listener->httpdmgr, "/xml", render_index, server);
+       isc_httpdmgr_addurl(listener->httpdmgr, "/xml/v3", render_index,
+                           server);
 #endif
 #ifdef HAVE_JSON
        isc_httpdmgr_addurl(listener->httpdmgr, "/json",

diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index 5eab36cfe589a4ce378baf5e9f5c13971b01c0fd..d1396487e1bbb608f346acbdcd37337e6e312cf1 100644 (file)
--- a/doc/arm/Bv9ARM-book.xml
+++ b/doc/arm/Bv9ARM-book.xml
@@ -10564,7 +10564,21 @@ ns.domain.com.rpz-nsdname   CNAME   .
                   >http://127.0.0.1:8888/xml</ulink>. A CSS file is
           included which can format the XML statistics into tables 
           when viewed with a stylesheet-capable browser, and into 
-          charts and graphs when using a javascript-capable browser.
+          charts and graphs using the Google Charts API when using a
+          javascript-capable browser.
+        </para>
+
+        <para>
+          Applications that depend on a particular XML schema
+          can request 
+          <ulink url="http://127.0.0.1:8888/xml/v2"
+                  >http://127.0.0.1:8888/xml/v2</ulink> for version 2
+          of the statistics XML schema or 
+          <ulink url="http://127.0.0.1:8888/xml/v3"
+                  >http://127.0.0.1:8888/xml/v3</ulink> for version 3.
+          If the requested schema is supported by the server, then
+          it will respond; if not, it will return a "page not found"
+          error.
         </para>
 
         <para>