diff options
| author | Alexandros C. Couloumbis <alex@ozo.com> | 2010-08-15 09:53:21 +0000 |
|---|---|---|
| committer | Alexandros C. Couloumbis <alex@ozo.com> | 2010-08-15 09:53:21 +0000 |
| commit | e0d13e77d09997a13c73b58dd3e6232d45c8d1a5 (patch) | |
| tree | 6713ede79915815b117035c65a1ce7a8c87bf7bf /package/busybox/patches/350-httpd_redir.patch | |
| parent | 462dabc7f55d5e5f0aa7d63c10b66e25a091f405 (diff) | |
| download | upstream-e0d13e77d09997a13c73b58dd3e6232d45c8d1a5.tar.gz upstream-e0d13e77d09997a13c73b58dd3e6232d45c8d1a5.tar.bz2 upstream-e0d13e77d09997a13c73b58dd3e6232d45c8d1a5.zip | |
package/busybox: update to busybox-1.7.1, include upstream patches
SVN-Revision: 22659
Diffstat (limited to 'package/busybox/patches/350-httpd_redir.patch')
| -rw-r--r-- | package/busybox/patches/350-httpd_redir.patch | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/package/busybox/patches/350-httpd_redir.patch b/package/busybox/patches/350-httpd_redir.patch index bbb8eb4aab..6161871cf8 100644 --- a/package/busybox/patches/350-httpd_redir.patch +++ b/package/busybox/patches/350-httpd_redir.patch @@ -1,22 +1,25 @@ ---- a/include/usage.h -+++ b/include/usage.h -@@ -1727,6 +1727,7 @@ +--- a/include/usage.src.h ++++ b/include/usage.src.h +@@ -1718,7 +1718,8 @@ INSERT + IF_FEATURE_HTTPD_SETUID(" [-u USER[:GRP]]") \ IF_FEATURE_HTTPD_BASIC_AUTH(" [-r REALM]") \ " [-h HOME]\n" \ - "or httpd -d/-e" IF_FEATURE_HTTPD_AUTH_MD5("/-m") " STRING" +- "or httpd -d/-e" IF_FEATURE_HTTPD_AUTH_MD5("/-m") " STRING" ++ "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:" \ -@@ -1744,6 +1745,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" \ +@@ -2319,6 +2320,9 @@ INSERT + #define loadkmap_example_usage \ + "$ loadkmap < /etc/i18n/lang-keymap\n" - #define hwclock_trivial_usage \ - IF_FEATURE_HWCLOCK_LONG_OPTIONS( \ ++#define lock_trivial_usage NOUSAGE_STR ++#define lock_full_usage "" ++ + #define logger_trivial_usage \ + "[OPTIONS] [MESSAGE]" + #define logger_full_usage "\n\n" \ --- a/networking/httpd.c +++ b/networking/httpd.c @@ -250,6 +250,8 @@ struct globals { |