mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-14 17:03:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

nhttpd: remove obsolete CONFIG_SYSTEM_TUXBOX_COOLSTREAM switch

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: f53335d533
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-05 (Tue, 05 Sep 2017)

Origin message was:
------------------
- nhttpd: remove obsolete CONFIG_SYSTEM_TUXBOX_COOLSTREAM switch

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-09-05 08:49:02 +02:00
parent b06ccc3719
commit 4c90ce863f
2 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/nhttpd/yconfig.h
View File

@@ -22,8 +22,7 @@
// System Choice <configure!> ONE choice // System Choice <configure!> ONE choice
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#ifndef CONFIG_SYSTEM_BY_COMPILER // use Compiler directive to set CONFIG_SYSTEM #ifndef CONFIG_SYSTEM_BY_COMPILER // use Compiler directive to set CONFIG_SYSTEM
//#define CONFIG_SYSTEM_TUXBOX y // Tuxbox project #define CONFIG_SYSTEM_TUXBOX y // Tuxbox project
#define CONFIG_SYSTEM_TUXBOX_COOLSTREAM y // Tuxbox project for coolstream
#endif #endif
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// General central Definitions <configure!> // General central Definitions <configure!>
@@ -70,11 +69,12 @@
//#undef Y_CONFIG_HAVE_SENDFILE // Sendfile does not work for SSL, but we'll fallback to send //#undef Y_CONFIG_HAVE_SENDFILE // Sendfile does not work for SSL, but we'll fallback to send
//#endif //#endif
#if defined(CONFIG_SYSTEM_TUXBOX) || defined(CONFIG_SYSTEM_TUXBOX_COOLSTREAM) #ifdef CONFIG_SYSTEM_TUXBOX
#define Y_CONFIG_FEATURE_UPLOAD y #define Y_CONFIG_FEATURE_UPLOAD y
#define Y_CONFIG_USE_YPARSER y #define Y_CONFIG_USE_YPARSER y
#define Y_CONFIG_USE_AUTHHOOK y #define Y_CONFIG_USE_AUTHHOOK y
#endif #endif
#ifdef Y_CONFIG_FEATURE_KEEP_ALIVE #ifdef Y_CONFIG_FEATURE_KEEP_ALIVE
#define HTTP_PROTOCOL "HTTP/1.1" #define HTTP_PROTOCOL "HTTP/1.1"
#else #else
@@ -102,12 +102,15 @@
#define HTTPD_SENDFILE_ALL "true" #define HTTPD_SENDFILE_ALL "true"
#define HTTPD_LANGUAGEDIR "languages" #define HTTPD_LANGUAGEDIR "languages"
#define HTTPD_DEFAULT_LANGUAGE "Deutsch" #define HTTPD_DEFAULT_LANGUAGE "Deutsch"
#define AUTHUSER "root" #define AUTHUSER "root"
#define AUTHPASSWORD "ni"
#define HTTPD_CONFIGDIR CONFIGDIR #define HTTPD_CONFIGDIR CONFIGDIR
#define HTTPD_CONFIGFILE HTTPD_CONFIGDIR"/nhttpd.conf" #define HTTPD_CONFIGFILE HTTPD_CONFIGDIR"/nhttpd.conf"
#define YWEB_CONFIGFILE HTTPD_CONFIGDIR"/Y-Web.conf" #define YWEB_CONFIGFILE HTTPD_CONFIGDIR"/Y-Web.conf"
#define PUBLICDOCUMENTROOT PUBLIC_HTTPDDIR #define PUBLICDOCUMENTROOT PUBLIC_HTTPDDIR
#define PRIVATEDOCUMENTROOT PRIVATE_HTTPDDIR
#define NEUTRINO_CONFIGFILE CONFIGDIR"/neutrino.conf" #define NEUTRINO_CONFIGFILE CONFIGDIR"/neutrino.conf"
#define MOVIEBROWSER_CONFIGFILE CONFIGDIR"/moviebrowser.conf" #define MOVIEBROWSER_CONFIGFILE CONFIGDIR"/moviebrowser.conf"
#define HOSTEDDOCUMENTROOT HOSTED_HTTPDDIR #define HOSTEDDOCUMENTROOT HOSTED_HTTPDDIR
@@ -117,16 +120,6 @@
#define ZAPITXMLPATH CONFIGDIR"/zapit" #define ZAPITXMLPATH CONFIGDIR"/zapit"
#define TUXBOX_LOGOS_URL LOGODIR //NI #define TUXBOX_LOGOS_URL LOGODIR //NI
// switch for Box differences
#ifdef CONFIG_SYSTEM_TUXBOX
#define AUTHPASSWORD "dbox2"
#define PRIVATEDOCUMENTROOT DATADIR "/neutrino/httpd-y"
#endif
#ifdef CONFIG_SYSTEM_TUXBOX_COOLSTREAM
#define AUTHPASSWORD "ni"
#define PRIVATEDOCUMENTROOT PRIVATE_HTTPDDIR
#endif
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Aggregated definitions // Aggregated definitions
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

7
src/nhttpd/yhttpd.cpp
View File

@@ -56,7 +56,8 @@ static CmodCache mod_cache; // static instance
#endif #endif
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#if defined(CONFIG_SYSTEM_TUXBOX) || defined(CONFIG_SYSTEM_TUXBOX_COOLSTREAM)
#ifdef CONFIG_SYSTEM_TUXBOX
#include "neutrinoapi.h" #include "neutrinoapi.h"
#include <config.h> #include <config.h>
static CNeutrinoAPI *NeutrinoAPI; static CNeutrinoAPI *NeutrinoAPI;
@@ -254,7 +255,7 @@ void Cyhttpd::hooks_attach() {
CyhookHandler::attach(testhook); CyhookHandler::attach(testhook);
#endif #endif
#if defined(CONFIG_SYSTEM_TUXBOX) || defined(CONFIG_SYSTEM_TUXBOX_COOLSTREAM) #ifdef CONFIG_SYSTEM_TUXBOX
NeutrinoAPI = new CNeutrinoAPI(); NeutrinoAPI = new CNeutrinoAPI();
CyhookHandler::attach(NeutrinoAPI->NeutrinoYParser); CyhookHandler::attach(NeutrinoAPI->NeutrinoYParser);
CyhookHandler::attach(NeutrinoAPI->ControlAPI); CyhookHandler::attach(NeutrinoAPI->ControlAPI);
@@ -292,7 +293,7 @@ void Cyhttpd::hooks_detach() {
delete testhook; delete testhook;
#endif #endif
#if defined(CONFIG_SYSTEM_TUXBOX) || defined(CONFIG_SYSTEM_TUXBOX_COOLSTREAM) #ifdef CONFIG_SYSTEM_TUXBOX
CyhookHandler::detach(NeutrinoAPI->NeutrinoYParser); CyhookHandler::detach(NeutrinoAPI->NeutrinoYParser);
#else #else
#ifdef Y_CONFIG_USE_YPARSER #ifdef Y_CONFIG_USE_YPARSER