From 0f4458c999f611631f3b521d9a04de17d8f953c4 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 29 Mar 2012 16:40:40 +0200 Subject: [PATCH] SF Bug Tracker id 3512833 - Miniserver is wrongly disabled Submitted: Fabrice Fontaine ( ffontaine ) - 2012-03-29 07:36:34 PDT Miniserver is disabled if ECXLUDE_GENA, EXCLUDE_SOAP and EXCLUDE_WEBSERVER are set. However, SSDP needs the Miniserver to answer to M-SEARCH requests. So, MiniServer should not be disabled if EXCLUDE_SSDP is not also set. (cherry picked from commit 9a33782ab54a456611c40251d366b3b58a70f6b5) --- ChangeLog | 11 +++++++++++ upnp/src/inc/config.h | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d6931eb..ca380b7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -332,6 +332,17 @@ Version 1.8.0 Version 1.6.17 ******************************************************************************* +2012-03-29 Fabrice Fontaine + + SF Bug Tracker id 3512833 - Miniserver is wrongly disabled + + Submitted: Fabrice Fontaine ( ffontaine ) - 2012-03-29 07:36:34 PDT + + Miniserver is disabled if ECXLUDE_GENA, EXCLUDE_SOAP and + EXCLUDE_WEBSERVER are set. + However, SSDP needs the Miniserver to answer to M-SEARCH requests. + So, MiniServer should not be disabled if EXCLUDE_SSDP is not also set. + 2012-03-26 Yoichi NAKAYAMA SF Bug Tracker id 3510693 - build fail with --disable-device diff --git a/upnp/src/inc/config.h b/upnp/src/inc/config.h index f54193d..58a34d7 100644 --- a/upnp/src/inc/config.h +++ b/upnp/src/inc/config.h @@ -476,7 +476,7 @@ #endif -#if EXCLUDE_GENA == 1 && EXCLUDE_SOAP == 1 && EXCLUDE_WEB_SERVER == 1 +#if EXCLUDE_SSDP == 1 && EXCLUDE_GENA == 1 && EXCLUDE_SOAP == 1 && EXCLUDE_WEB_SERVER == 1 # undef EXCLUDE_MINISERVER # define EXCLUDE_MINISERVER 1 # if INTERNAL_WEB_SERVER @@ -485,7 +485,7 @@ #endif -#if EXCLUDE_GENA == 0 || EXCLUDE_SOAP == 0 || EXCLUDE_WEB_SERVER == 0 +#if EXCLUDE_SSDP == 0 || EXCLUDE_GENA == 0 || EXCLUDE_SOAP == 0 || EXCLUDE_WEB_SERVER == 0 # undef EXCLUDE_MINISERVER # define EXCLUDE_MINISERVER 0 # if EXCLUDE_WEB_SERVER == 0 && !defined INTERNAL_WEB_SERVER