From a12d5a6f7dde9cce680b33d26d5438151c4bd9c9 Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fabrice.fontaine@orange.com>
Date: Fri, 9 Mar 2012 23:13:53 +0100
Subject: [PATCH] Optimisation of --disable-webserver

Do not compile webserver.c if --disable-webserver is used.
(cherry picked from commit 7aef73d7eb0206db0d07744ef258f7d04e206f0e)
---
 ChangeLog                            |  6 ++++++
 upnp/src/api/upnpapi.c               | 10 ++++++----
 upnp/src/genlib/net/http/webserver.c |  3 +++
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5df509d..cdcfbd8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -318,6 +318,12 @@ Version 1.8.0
 Version 1.6.16
 *******************************************************************************
 
+2012-03-09 Fabrice Fontaine <fabrice.fontaine(at)orange.com>
+
+	Optimisation of --disable-webserver
+
+	Do not compile webserver.c if --disable-webserver is used.
+
 2012-03-09 Fabrice Fontaine <fabrice.fontaine(at)orange.com>
 
 	Improve threadutil
diff --git a/upnp/src/api/upnpapi.c b/upnp/src/api/upnpapi.c
index 9051ebf..e26bcc8 100644
--- a/upnp/src/api/upnpapi.c
+++ b/upnp/src/api/upnpapi.c
@@ -649,8 +649,10 @@ int UpnpFinish(void)
 		UpnpUnRegisterClient(client_handle);
 #endif
 	TimerThreadShutdown(&gTimerThread);
-#if EXCLUDE_WEB_SERVER == 0
+#if EXCLUDE_MINISERVER == 0
 	StopMiniServer();
+#endif
+#if EXCLUDE_WEB_SERVER == 0
 	web_server_destroy();
 #endif
 	ThreadPoolShutdown(&gMiniServerThreadPool);
@@ -4084,7 +4086,7 @@ void UpnpRemoveAllVirtualDirs(void)
 
 int UpnpEnableWebserver(int enable)
 {
-    int retVal;
+    int retVal = UPNP_E_SUCCESS;
 
     if( UpnpSdkInit != 1 ) {
         return UPNP_E_FINISH;
@@ -4107,10 +4109,10 @@ int UpnpEnableWebserver(int enable)
             break;
 #endif /* INTERNAL_WEB_SERVER */
         default:
-            return UPNP_E_INVALID_PARAM;
+            retVal = UPNP_E_INVALID_PARAM;
     }
 
-    return UPNP_E_SUCCESS;
+    return retVal;
 }
 
 
diff --git a/upnp/src/genlib/net/http/webserver.c b/upnp/src/genlib/net/http/webserver.c
index 171c8c0..98b886a 100644
--- a/upnp/src/genlib/net/http/webserver.c
+++ b/upnp/src/genlib/net/http/webserver.c
@@ -39,6 +39,8 @@
 
 #include "config.h"
 
+#if EXCLUDE_WEB_SERVER == 0
+
 #include "webserver.h"
 
 
@@ -1534,4 +1536,5 @@ void web_server_callback(http_parser_t *parser, INOUT http_message_t *req,
 	membuffer_destroy(&headers);
 	membuffer_destroy(&filename);
 }
+#endif /* EXCLUDE_WEB_SERVER */