[Commits] : Tuxbox-GIT: apps branch master updated. CVS-Final-508-g227b75a

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

Project "Tuxbox-GIT: apps":

The branch, master has been updated
       via  227b75aa77f5f76ce922ce275ecb6f31e8142c95 (commit)
      from  2ba317faaa70bc1e874164dc90bf082516df6e8e (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 227b75aa77f5f76ce922ce275ecb6f31e8142c95
Author: GetAway <get...@t-...>
Date:   Fri Apr 3 16:43:40 2015 +0200

    nhttpd: fix init of configfile.version
    
    it has never worked
    
    Signed-off-by: GetAway <get...@t-...>

diff --git a/tuxbox/neutrino/daemons/nhttpd/yconfig.h b/tuxbox/neutrino/daemons/nhttpd/yconfig.h
index 0a780b3..ccd4656 100644
--- a/tuxbox/neutrino/daemons/nhttpd/yconfig.h
+++ b/tuxbox/neutrino/daemons/nhttpd/yconfig.h
@@ -38,7 +38,7 @@
 #define HTTPD_NAME 		"yhttpd"			// Webserver name (can be overloaded)
 #define YHTTPD_NAME 		"yhttpd_core"			// Webserver name (Name of yhttpd-core!)
 #define AUTH_NAME_MSG		"yhhtpd"			// Name in Authentication Dialogue
-#define CONF_VERSION            4                               // Version of yhttpd-conf file
+#define CONF_VERSION		4					// Version of yhttpd-conf file
 
 #define HTTPD_KEEPALIVE_TIMEOUT	500000				// Timeout for Keep-Alive in mircoseconds
 //=============================================================================
diff --git a/tuxbox/neutrino/daemons/nhttpd/yhttpd.cpp b/tuxbox/neutrino/daemons/nhttpd/yhttpd.cpp
index 652d939..a8e6b9b 100644
--- a/tuxbox/neutrino/daemons/nhttpd/yhttpd.cpp
+++ b/tuxbox/neutrino/daemons/nhttpd/yhttpd.cpp
@@ -479,7 +479,7 @@ void Cyhttpd::ReadConfig(void)
 	// informational use
 	ConfigList["WebsiteMain.port"]= itoa(Config->getInt32("WebsiteMain.port", HTTPD_STANDARD_PORT));
 	ConfigList["webserver.threading"]= Config->getString("webserver.threading", "true");
-	ConfigList["configfile.version"]= Config->getInt32("configfile.version", CONF_VERSION);
+	ConfigList["configfile.version"]= itoa(Config->getInt32("configfile.version", CONF_VERSION));
 	ConfigList["server.log.loglevel"]= itoa(Config->getInt32("server.log.loglevel", 0));
 	ConfigList["server.no_keep-alive_ips"]= Config->getString("server.no_keep-alive_ips", "");
 	webserver->conf_no_keep_alive_ips = Config->getStringVector("server.no_keep-alive_ips");

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

Summary of changes:
 tuxbox/neutrino/daemons/nhttpd/yconfig.h  |    2 +-
 tuxbox/neutrino/daemons/nhttpd/yhttpd.cpp |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


-- 
Tuxbox-GIT: apps