[Commits] : Tuxbox-GIT: apps branch master updated. CVS-Final-527-g7a711c6

[GetAway <tux...@ne...>]

Project "Tuxbox-GIT: apps":

The branch, master has been updated
       via  7a711c6512f23b9dfed7138b54642e3c6add2b5e (commit)
      from  fc1c8084e15da61091391a06316945d9795c147d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 7a711c6512f23b9dfed7138b54642e3c6add2b5e
Author: GetAway <get...@t-...>
Date:   Wed Apr 15 20:51:58 2015 +0200

    Y_Live.yhtm: default http_caching is 1000ms
    
    Signed-off-by: GetAway <get...@t-...>

diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Live.yhtm b/tuxbox/neutrino/daemons/nhttpd/web/Y_Live.yhtm
index 97e63e0..5a1b6be 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Live.yhtm
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Live.yhtm
@@ -145,7 +145,7 @@ function view_transcode_mode()
 	ClientAddr = "{=func:get_request_data clientaddr=}";
 	insert_message_control("{=L:2520=}");
 	isDeinterlace = ("{=ini-get:/var/tuxbox/config/Y-Web.conf;deinterlace;true=}" == "true");
-	cachetime = {=ini-get:/var/tuxbox/config/Y-Web.conf;http_caching;0=};
+	cachetime = {=ini-get:/var/tuxbox/config/Y-Web.conf;http_caching;1000=};
 /*	{=if-equal:{=typ=}~popup~
 		always_on_top();
 	=}
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt b/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
index 19d5b54..4b4b186 100644
--- a/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
+++ b/tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt
@@ -1,4 +1,4 @@
-version=2.8.2.0
+version=2.8.2.1
 date=15.04.2015
 type=Release
 info=Tuxbox

-----------------------------------------------------------------------

Summary of changes:
 tuxbox/neutrino/daemons/nhttpd/web/Y_Live.yhtm   |    2 +-
 tuxbox/neutrino/daemons/nhttpd/web/Y_Version.txt |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


-- 
Tuxbox-GIT: apps