diff --git a/CHANGES.txt b/CHANGES.txt index 98a1419d59b..f5ad14f7b92 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -425,6 +425,7 @@ Bug Fixes 50. SOLR-1242: Human readable JVM info from system handler does integer cutoff rounding, even when dealing with GB. Fixed to round to one decimal place. (Jay Hill, Mark Miller) +51. SOLR-1243: Admin RequestHandlers should not be cached over HTTP. (Mark Miller) Other Changes ---------------------- diff --git a/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java b/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java index 7c7e00d889f..018cae7ff8d 100644 --- a/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java +++ b/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java @@ -166,6 +166,7 @@ public class CoreAdminHandler extends RequestHandlerBase { cores.persist(); rsp.add("saved", cores.getConfigFile().getAbsolutePath()); } + rsp.setHttpCaching(false); } protected boolean handleMergeAction(SolrQueryRequest req, SolrQueryResponse rsp) throws IOException { diff --git a/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java b/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java index 1551d2f457f..4ad864ef152 100644 --- a/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java +++ b/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java @@ -149,6 +149,7 @@ public class LukeRequestHandler extends RequestHandlerBase info.add( "key", getFieldFlagsKey() ); info.add( "NOTE", "Document Frequency (df) is not updated when a document is marked for deletion. df values include deleted documents." ); rsp.add( "info", info ); + rsp.setHttpCaching(false); } diff --git a/src/java/org/apache/solr/handler/admin/PluginInfoHandler.java b/src/java/org/apache/solr/handler/admin/PluginInfoHandler.java index b40f2b81e46..e345439b52c 100644 --- a/src/java/org/apache/solr/handler/admin/PluginInfoHandler.java +++ b/src/java/org/apache/solr/handler/admin/PluginInfoHandler.java @@ -49,6 +49,7 @@ public class PluginInfoHandler extends RequestHandlerBase boolean stats = params.getBool( "stats", false ); rsp.add( "plugins", getSolrInfoBeans( req.getCore(), stats ) ); + rsp.setHttpCaching(false); } private static SimpleOrderedMap getSolrInfoBeans( SolrCore core, boolean stats ) diff --git a/src/java/org/apache/solr/handler/admin/PropertiesRequestHandler.java b/src/java/org/apache/solr/handler/admin/PropertiesRequestHandler.java index 85f35e59384..4bb1199824a 100644 --- a/src/java/org/apache/solr/handler/admin/PropertiesRequestHandler.java +++ b/src/java/org/apache/solr/handler/admin/PropertiesRequestHandler.java @@ -44,6 +44,7 @@ public class PropertiesRequestHandler extends RequestHandlerBase props = System.getProperties(); } rsp.add( "system.properties", props ); + rsp.setHttpCaching(false); } //////////////////////// SolrInfoMBeans methods ////////////////////// diff --git a/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java b/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java index 53f127bb0b6..1b75469bc79 100644 --- a/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java +++ b/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java @@ -183,6 +183,7 @@ public class ShowFileRequestHandler extends RequestHandlerBase rsp.add( RawResponseWriter.CONTENT, content ); } + rsp.setHttpCaching(false); } /** diff --git a/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java b/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java index 453347ae05c..e43d0654db5 100644 --- a/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java +++ b/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java @@ -64,6 +64,7 @@ public class SystemInfoHandler extends RequestHandlerBase rsp.add( "lucene", getLuceneInfo() ); rsp.add( "jvm", getJvmInfo() ); rsp.add( "system", getSystemInfo() ); + rsp.setHttpCaching(false); } /** diff --git a/src/java/org/apache/solr/handler/admin/ThreadDumpHandler.java b/src/java/org/apache/solr/handler/admin/ThreadDumpHandler.java index 7ad0d655259..b6d4be131d1 100644 --- a/src/java/org/apache/solr/handler/admin/ThreadDumpHandler.java +++ b/src/java/org/apache/solr/handler/admin/ThreadDumpHandler.java @@ -76,6 +76,7 @@ public class ThreadDumpHandler extends RequestHandlerBase lst.add( "thread", getThreadInfo( ti, tmbean ) ); } system.add( "threadDump", lst ); + rsp.setHttpCaching(false); } //--------------------------------------------------------------------------------