mod_http_files: send valid ETag header

[prosody.git] / util / termcolours.lua

diff --git a/util/termcolours.lua b/util/termcolours.lua
index a0fee7ce56cc1090bd7a9d1c9818a4c5baed3813..53633b45b1b5744d5fbe94b1d47078e77b6da62b 100644 (file)
--- a/util/termcolours.lua
+++ b/util/termcolours.lua
@@ -15,6 +15,9 @@ local tonumber = tonumber;
 local ipairs = ipairs;
 local io_write = io.write;
 local m_floor = math.floor;
+local type = type;
+local setmetatable = setmetatable;
+local pairs = pairs;
 
 local windows;
 if os.getenv("WINDIR") then
@@ -76,8 +79,10 @@ local function hex2rgb(hex)
 end
 
 setmetatable(stylemap, { __index = function(_, style)
-       local g = style:sub(7) == " background" and "48;5;" or "38;5;";
-       return g .. color(hex2rgb(style));
+       if type(style) == "string" and style:find("%x%x%x%x%x%x") == 1 then
+               local g = style:sub(7) == " background" and "48;5;" or "38;5;";
+               return g .. color(hex2rgb(style));
+       end
 end } );
 
 local csscolors = {
@@ -86,10 +91,10 @@ local csscolors = {
        aqua = "00ffff"; olive  = "808000"; black  = "000000"; navy = "000080";
        teal = "008080"; silver = "c0c0c0"; maroon = "800000"; gray = "808080";
 }
-for color, rgb in pairs(csscolors) do
-       stylemap[color] = stylemap[color] or stylemap[rgb];
-       color, rgb = color .. " background", rgb .. " background"
-       stylemap[color] = stylemap[color] or stylemap[rgb];
+for colorname, rgb in pairs(csscolors) do
+       stylemap[colorname] = stylemap[colorname] or stylemap[rgb];
+       colorname, rgb = colorname .. " background", rgb .. " background"
+       stylemap[colorname] = stylemap[colorname] or stylemap[rgb];
 end
 
 local function getstyle(...)