[Commits] : Tuxbox-GIT: apps branch master updated. CVS-Final-548-g17875b7

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

Project "Tuxbox-GIT: apps":

The branch, master has been updated
       via  17875b740770903ec906f159a1bbb016256d50b1 (commit)
      from  5e284d6b1c1f3f4be4995e9e420f1f65912d7806 (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 17875b740770903ec906f159a1bbb016256d50b1
Author: Stefan Seyfried <se...@tu...>
Date:   Sun May 10 21:16:33 2015 +0200

    ywebserver: try to use port 8080 if port 80 is not available
    
    Signed-off-by: GetAway <get...@t-...>

diff --git a/tuxbox/neutrino/daemons/nhttpd/yhttpd_core/ywebserver.cpp b/tuxbox/neutrino/daemons/nhttpd/yhttpd_core/ywebserver.cpp
index 4b44757..dcd4d07 100644
--- a/tuxbox/neutrino/daemons/nhttpd/yhttpd_core/ywebserver.cpp
+++ b/tuxbox/neutrino/daemons/nhttpd/yhttpd_core/ywebserver.cpp
@@ -119,10 +119,17 @@ CWebserver::~CWebserver()
 #define MAX_TIMEOUTS_TO_TEST 100
 bool CWebserver::run(void)
 {
-	if(!listenSocket.listen(port, HTTPD_MAX_CONNECTIONS))
-	{
-		dperror("Socket cannot bind and listen. Abort.\n");
-		return false;
+	if (!listenSocket.listen(port, HTTPD_MAX_CONNECTIONS)) {
+		if (port != 80) {
+			fprintf(stderr, "[yhttpd] Socket cannot bind and listen on port %d Abort.\n", port);
+			return false;
+		}
+		fprintf(stderr, "[yhttpd] cannot bind and listen on port 80, retrying on port 8080.\n");
+		port = 8080;
+		if (!listenSocket.listen(port, HTTPD_MAX_CONNECTIONS)) {
+			fprintf(stderr, "[yhttpd] Socket cannot bind and listen on port %d Abort.\n", port);
+			return false;
+		}
 	}
 #ifdef Y_CONFIG_FEATURE_KEEP_ALIVE
 

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

Summary of changes:
 .../daemons/nhttpd/yhttpd_core/ywebserver.cpp      |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)


-- 
Tuxbox-GIT: apps