cachemgr: Enable per-report Content-Type header

The default for all reports is plain text in UTF-8.

NOTE: UTF-8 selected because although current reports limit themselves
to ASCII character ranges, some reports may contain text pulled from the
protocol transferred and UTF-8 display covers most unexpected cases.

diff --git a/src/mgr/Action.cc b/src/mgr/Action.cc
index 4e1d2e643700b8f88d72fc5e049a14dec238257e..f350e5ef764d45b00d6654ab561e1e0b9f1d6c78 100644 (file)
--- a/src/mgr/Action.cc
+++ b/src/mgr/Action.cc
@@ -98,7 +98,7 @@ Mgr::Action::fillEntry(StoreEntry* entry, bool writeHttpHeader)
 
     if (writeHttpHeader) {
         HttpReply *rep = new HttpReply;
-        rep->setHeaders(Http::scOkay, NULL, "text/plain", -1, squid_curtime, squid_curtime);
+        rep->setHeaders(Http::scOkay, NULL, contentType(), -1, squid_curtime, squid_curtime);
         // Allow cachemgr and other XHR scripts access to our version string
         const ActionParams &params = command().params;
         if (params.httpOrigin.size() > 0) {

diff --git a/src/mgr/Action.h b/src/mgr/Action.h
index fbc6ff1009ee26cbbd1e145c342e8db3a8dafe9f..799810afcdea85c3e41f598421d162f4aeedac75 100644 (file)
--- a/src/mgr/Action.h
+++ b/src/mgr/Action.h
@@ -63,6 +63,9 @@ public:
 
     StoreEntry *createStoreEntry() const; ///< creates store entry from params
 
+    ///< Content-Type: header value for this report
+    virtual const char *contentType() const {return "text/plain;charset=utf-8";}
+
 protected:
     /// calculate and keep local action-specific information
     virtual void collect() {}