summaryrefslogtreecommitdiff
path: root/package/busybox/patches/350-httpd_redir.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2009-12-07 16:56:04 +0000
committerFlorian Fainelli <florian@openwrt.org>2009-12-07 16:56:04 +0000
commit6b306ba7b836261b2abcee6977ff27f909338282 (patch)
tree49c8e4e216c8e7316f5f746c0db3e58841345acf /package/busybox/patches/350-httpd_redir.patch
parenta653c7602e243dcc4e89f467d4c97576ddd7a77f (diff)
downloadmtk-20170518-6b306ba7b836261b2abcee6977ff27f909338282.zip
mtk-20170518-6b306ba7b836261b2abcee6977ff27f909338282.tar.gz
mtk-20170518-6b306ba7b836261b2abcee6977ff27f909338282.tar.bz2
update busybox to 1.15.2 (#5926)
SVN-Revision: 18684
Diffstat (limited to 'package/busybox/patches/350-httpd_redir.patch')
-rw-r--r--package/busybox/patches/350-httpd_redir.patch32
1 files changed, 15 insertions, 17 deletions
diff --git a/package/busybox/patches/350-httpd_redir.patch b/package/busybox/patches/350-httpd_redir.patch
index 912cb6d..3d3e041 100644
--- a/package/busybox/patches/350-httpd_redir.patch
+++ b/package/busybox/patches/350-httpd_redir.patch
@@ -1,24 +1,22 @@
--- a/include/usage.h
+++ b/include/usage.h
-@@ -1638,7 +1638,8 @@
- USE_FEATURE_HTTPD_BASIC_AUTH(" [-r realm]") \
- USE_FEATURE_HTTPD_AUTH_MD5(" [-m pass]") \
- " [-h home]" \
-- " [-d/-e string]"
-+ " [-d/-e string]" \
+@@ -1693,6 +1693,7 @@
+ IF_FEATURE_HTTPD_BASIC_AUTH(" [-r REALM]") \
+ " [-h HOME]\n" \
+ "or httpd -d/-e" IF_FEATURE_HTTPD_AUTH_MD5("/-m") " STRING"
+ " [-R <path> [-H <host>]]"
#define httpd_full_usage "\n\n" \
"Listen for incoming HTTP requests\n" \
"\nOptions:" \
-@@ -1656,6 +1657,8 @@
- "\n -h HOME Home directory (default .)" \
+@@ -1710,6 +1711,8 @@
+ "\n -m STRING MD5 crypt STRING") \
"\n -e STRING HTML encode STRING" \
"\n -d STRING URL decode STRING" \
+ "\n -R PATH Redirect target path" \
+ "\n -H HOST Redirect target host" \
#define hwclock_trivial_usage \
- USE_FEATURE_HWCLOCK_LONG_OPTIONS( \
+ IF_FEATURE_HWCLOCK_LONG_OPTIONS( \
--- a/networking/httpd.c
+++ b/networking/httpd.c
@@ -248,6 +248,8 @@ struct globals {
@@ -29,7 +27,7 @@
+ const char *redirect_host;
Htaccess_IP *ip_a_d; /* config allow/deny lines */
- USE_FEATURE_HTTPD_BASIC_AUTH(const char *g_realm;)
+ IF_FEATURE_HTTPD_BASIC_AUTH(const char *g_realm;)
@@ -294,6 +296,8 @@ struct globals {
#define index_page (G.index_page )
#define found_mime_type (G.found_mime_type )
@@ -76,19 +74,19 @@
+ c_opt_config_file,
d_opt_decode_url,
h_opt_home_httpd,
- USE_FEATURE_HTTPD_ENCODE_URL_STR(e_opt_encode_url,)
+ IF_FEATURE_HTTPD_ENCODE_URL_STR(e_opt_encode_url,)
@@ -2315,12 +2328,13 @@ int httpd_main(int argc UNUSED_PARAM, ch
/* We do not "absolutize" path given by -h (home) opt.
* If user gives relative path in -h,
* $SCRIPT_FILENAME will not be set. */
- opt = getopt32(argv, "c:d:h:"
+ opt = getopt32(argv, "R:H:c:d:h:"
- USE_FEATURE_HTTPD_ENCODE_URL_STR("e:")
- USE_FEATURE_HTTPD_BASIC_AUTH("r:")
- USE_FEATURE_HTTPD_AUTH_MD5("m:")
- USE_FEATURE_HTTPD_SETUID("u:")
+ IF_FEATURE_HTTPD_ENCODE_URL_STR("e:")
+ IF_FEATURE_HTTPD_BASIC_AUTH("r:")
+ IF_FEATURE_HTTPD_AUTH_MD5("m:")
+ IF_FEATURE_HTTPD_SETUID("u:")
"p:ifv",
+ &redirect_path, &redirect_host,
&opt_c_configFile, &url_for_decode, &home_httpd
- USE_FEATURE_HTTPD_ENCODE_URL_STR(, &url_for_encode)
- USE_FEATURE_HTTPD_BASIC_AUTH(, &g_realm)
+ IF_FEATURE_HTTPD_ENCODE_URL_STR(, &url_for_encode)
+ IF_FEATURE_HTTPD_BASIC_AUTH(, &g_realm)