aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2010-03-25 16:14:14 +0000
committerJo-Philipp Wich <jow@openwrt.org>2010-03-25 16:14:14 +0000
commit32cadb4a08e9dfa554cf8e15aac23c42eab495db (patch)
tree362a027ae84ad5901954465bf3b415bb85e36261
parent006567eafbd60833f98ace4373a80726c33598d8 (diff)
downloadupstream-32cadb4a08e9dfa554cf8e15aac23c42eab495db.tar.gz
upstream-32cadb4a08e9dfa554cf8e15aac23c42eab495db.tar.bz2
upstream-32cadb4a08e9dfa554cf8e15aac23c42eab495db.zip
[package] busybox: disable httpd applet
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20432 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/busybox/config/networking/Config.in20
-rwxr-xr-xpackage/busybox/files/httpd54
2 files changed, 10 insertions, 64 deletions
diff --git a/package/busybox/config/networking/Config.in b/package/busybox/config/networking/Config.in
index 35dae5f593..77a7b07c31 100644
--- a/package/busybox/config/networking/Config.in
+++ b/package/busybox/config/networking/Config.in
@@ -144,13 +144,13 @@ config BUSYBOX_CONFIG_HOSTNAME
config BUSYBOX_CONFIG_HTTPD
bool "httpd"
- default y
+ default n
help
Serve web pages via an HTTP server.
config BUSYBOX_CONFIG_FEATURE_HTTPD_RANGES
bool "Support 'Ranges:' header"
- default y
+ default n
depends on BUSYBOX_CONFIG_HTTPD
help
Makes httpd emit "Accept-Ranges: bytes" header and understand
@@ -177,7 +177,7 @@ config BUSYBOX_CONFIG_FEATURE_HTTPD_SETUID
config BUSYBOX_CONFIG_FEATURE_HTTPD_BASIC_AUTH
bool "Enable Basic http Authentication"
- default y
+ default n
depends on BUSYBOX_CONFIG_HTTPD
help
Utilizes password settings from /etc/httpd.conf for basic
@@ -185,7 +185,7 @@ config BUSYBOX_CONFIG_FEATURE_HTTPD_BASIC_AUTH
config BUSYBOX_CONFIG_FEATURE_HTTPD_AUTH_MD5
bool "Support MD5 crypted passwords for http Authentication"
- default y
+ default n
depends on BUSYBOX_CONFIG_FEATURE_HTTPD_BASIC_AUTH
help
Enables basic per URL authentication from /etc/httpd.conf
@@ -193,7 +193,7 @@ config BUSYBOX_CONFIG_FEATURE_HTTPD_AUTH_MD5
config BUSYBOX_CONFIG_FEATURE_HTTPD_CGI
bool "Support Common Gateway Interface (CGI)"
- default y
+ default n
depends on BUSYBOX_CONFIG_HTTPD
help
This option allows scripts and executables to be invoked
@@ -201,7 +201,7 @@ config BUSYBOX_CONFIG_FEATURE_HTTPD_CGI
config BUSYBOX_CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR
bool "Support for running scripts through an interpreter"
- default y
+ default n
depends on BUSYBOX_CONFIG_FEATURE_HTTPD_CGI
help
This option enables support for running scripts through an
@@ -212,7 +212,7 @@ config BUSYBOX_CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR
config BUSYBOX_CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV
bool "Set REMOTE_PORT environment variable for CGI"
- default y
+ default n
depends on BUSYBOX_CONFIG_FEATURE_HTTPD_CGI
help
Use of this option can assist scripts in generating
@@ -220,7 +220,7 @@ config BUSYBOX_CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV
config BUSYBOX_CONFIG_FEATURE_HTTPD_ENCODE_URL_STR
bool "Enable -e option (useful for CGIs written as shell scripts)"
- default y
+ default n
depends on BUSYBOX_CONFIG_HTTPD
help
This option allows html encoding of arbitrary strings for display
@@ -230,7 +230,7 @@ config BUSYBOX_CONFIG_FEATURE_HTTPD_ENCODE_URL_STR
config BUSYBOX_CONFIG_FEATURE_HTTPD_ERROR_PAGES
bool "Support for custom error pages"
- default y
+ default n
depends on BUSYBOX_CONFIG_HTTPD
help
This option allows you to define custom error pages in
@@ -243,7 +243,7 @@ config BUSYBOX_CONFIG_FEATURE_HTTPD_ERROR_PAGES
config BUSYBOX_CONFIG_FEATURE_HTTPD_PROXY
bool "Support for reverse proxy"
- default y
+ default n
depends on BUSYBOX_CONFIG_HTTPD
help
This option allows you to define URLs that will be forwarded
diff --git a/package/busybox/files/httpd b/package/busybox/files/httpd
deleted file mode 100755
index 3714a02de5..0000000000
--- a/package/busybox/files/httpd
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2006 OpenWrt.org
-
-START=50
-HTTPD_BIN="/usr/sbin/httpd"
-
-system_config() {
- local cfg="$1"
-
- config_get hostname "$cfg" hostname
-}
-
-httpd_config() {
- local cfg="$1"
- local c_file port realm home args
-
- config_get c_file "$cfg" c_file
- [ -n "$c_file" -a -f "$c_file" ] && append args "-c \"$c_file\""
- config_get port "$cfg" port
- append args "-p ${port:-80}"
- config_get home "$cfg" home
- home="${home:-/www}"
- [ -d "$home" ] || return 1
- append args "-h \"$home\""
- config_get realm "$cfg" realm
- realm="${realm:-$hostname}"
- append args "-r \"$realm\""
- eval "$HTTPD_BIN $args"
-}
-
-start() {
- [ -x "$HTTPD_BIN" ] || return 1
-
- unset hostname
- config_load system
- config_foreach system_config system
- hostname="${hostname:-OpenWrt}"
-
- unset args
- config_load httpd
- [ "$?" != "0" ] && {
- uci_set_default httpd <<EOF
-config 'httpd'
- option 'port' '80'
- option 'home' '/www'
-EOF
- config_load httpd
- }
- config_foreach httpd_config httpd
-}
-
-stop() {
- killall httpd
-}