diff options
| author | Nicolas Thill <nico@openwrt.org> | 2010-08-15 20:28:05 +0000 |
|---|---|---|
| committer | Nicolas Thill <nico@openwrt.org> | 2010-08-15 20:28:05 +0000 |
| commit | 2c57634be3dfb83d76cc63e6fddb486fc725ecb7 (patch) | |
| tree | 610afdd6036831458db468e283b1710083c3aa6d /package/busybox/patches/350-httpd_redir.patch | |
| parent | 26f323dcf5afee0a88f1545aba04556aec6b9ae1 (diff) | |
| download | upstream-2c57634be3dfb83d76cc63e6fddb486fc725ecb7.tar.gz upstream-2c57634be3dfb83d76cc63e6fddb486fc725ecb7.tar.bz2 upstream-2c57634be3dfb83d76cc63e6fddb486fc725ecb7.zip | |
package/busybox: add missing bits from 1.17.1 update (mostly config stuff), rename upstream patches so they're applied first
SVN-Revision: 22665
Diffstat (limited to 'package/busybox/patches/350-httpd_redir.patch')
| -rw-r--r-- | package/busybox/patches/350-httpd_redir.patch | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/package/busybox/patches/350-httpd_redir.patch b/package/busybox/patches/350-httpd_redir.patch index 2bd569c296..7437d898c2 100644 --- a/package/busybox/patches/350-httpd_redir.patch +++ b/package/busybox/patches/350-httpd_redir.patch @@ -1,6 +1,6 @@ --- a/include/usage.src.h +++ b/include/usage.src.h -@@ -1718,7 +1718,8 @@ INSERT +@@ -1719,7 +1719,8 @@ INSERT IF_FEATURE_HTTPD_SETUID(" [-u USER[:GRP]]") \ IF_FEATURE_HTTPD_BASIC_AUTH(" [-r REALM]") \ " [-h HOME]\n" \ @@ -10,16 +10,15 @@ #define httpd_full_usage "\n\n" \ "Listen for incoming HTTP requests\n" \ "\nOptions:" \ -@@ -2321,6 +2322,9 @@ INSERT +@@ -1737,6 +1738,8 @@ INSERT + "\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 lock_trivial_usage NOUSAGE_STR - #define lock_full_usage "" -+ -+#define lock_trivial_usage NOUSAGE_STR -+#define lock_full_usage "" - - #define logger_trivial_usage \ - "[OPTIONS] [MESSAGE]" + #define hwclock_trivial_usage \ + IF_FEATURE_HWCLOCK_LONG_OPTIONS( \ --- a/networking/httpd.c +++ b/networking/httpd.c @@ -250,6 +250,8 @@ struct globals { |