luci-0.9: merge r4868

diff --git a/modules/admin-full/luasrc/controller/admin/system.lua b/modules/admin-full/luasrc/controller/admin/system.lua
index 9f66f17d305492a1dcf374a6b1befa333891a3b2..39fe16a7f3569d4ba2c4a07e3e750a279ce016ac 100644 (file)
--- a/modules/admin-full/luasrc/controller/admin/system.lua
+++ b/modules/admin-full/luasrc/controller/admin/system.lua
@@ -266,6 +266,9 @@ function action_upgrade()
        -- previous pages should arrange the stuff as required.
        if step == 4 then
                if has_platform and has_image and has_support then
+                       -- Mimetype text/plain
+                       luci.http.prepare_content("text/plain")
+
                        -- Now invoke sysupgrade
                        local keepcfg = keep_avail and luci.http.formvalue("keepcfg") == "1"
                        local fd = io.popen("/sbin/luci-flash %s %q" %{

diff --git a/modules/admin-mini/luasrc/controller/mini/system.lua b/modules/admin-mini/luasrc/controller/mini/system.lua
index 3aae6fa2f7b6a0d0efbf8225a4be7b7bff053a9a..c7bacb2489f144f2382caef4ef591368990c2ee2 100644 (file)
--- a/modules/admin-mini/luasrc/controller/mini/system.lua
+++ b/modules/admin-mini/luasrc/controller/mini/system.lua
@@ -149,6 +149,9 @@ function action_upgrade()
        -- previous pages should arrange the stuff as required.
        if step == 4 then
                if has_platform and has_image and has_support then
+                       -- Mimetype text/plain
+                       luci.http.prepare_content("text/plain")
+
                        -- Now invoke sysupgrade
                        local keepcfg = keep_avail and luci.http.formvalue("keepcfg") == "1"
                        local fd = io.popen("/sbin/luci-flash %s %q" %{