package/busybox: fix missing bit, refresh patches

[openwrt.git] / package / busybox / patches / 350-httpd_redir.patch

diff --git a/package/busybox/patches/350-httpd_redir.patch b/package/busybox/patches/350-httpd_redir.patch
index 3d3e041..2bd569c 100644 (file)
--- a/package/busybox/patches/350-httpd_redir.patch
+++ b/package/busybox/patches/350-httpd_redir.patch
@@ -1,25 +1,28 @@
---- a/include/usage.h
-+++ b/include/usage.h
-@@ -1693,6 +1693,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:" \
-@@ -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" \
+@@ -2321,6 +2322,9 @@ INSERT
  
- #define hwclock_trivial_usage \
-       IF_FEATURE_HWCLOCK_LONG_OPTIONS( \
+ #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]"
 --- a/networking/httpd.c
 +++ b/networking/httpd.c
-@@ -248,6 +248,8 @@ struct globals {
+@@ -250,6 +250,8 @@ struct globals {
  
        const char *found_mime_type;
        const char *found_moved_temporarily;
@@ -28,7 +31,7 @@
        Htaccess_IP *ip_a_d;    /* config allow/deny lines */
  
        IF_FEATURE_HTTPD_BASIC_AUTH(const char *g_realm;)
-@@ -294,6 +296,8 @@ struct globals {
+@@ -296,6 +298,8 @@ struct globals {
  #define index_page        (G.index_page       )
  #define found_mime_type   (G.found_mime_type  )
  #define found_moved_temporarily (G.found_moved_temporarily)
@@ -37,7 +40,7 @@
  #define last_mod          (G.last_mod         )
  #define ip_a_d            (G.ip_a_d           )
  #define g_realm           (G.g_realm          )
-@@ -993,8 +997,11 @@ static void send_headers(int responseNum
+@@ -997,8 +1001,11 @@ static void send_headers(int responseNum
        }
  #endif
        if (responseNum == HTTP_MOVED_TEMPORARILY) {
@@ -50,7 +53,7 @@
                                (g_query ? "?" : ""),
                                (g_query ? g_query : ""));
        }
-@@ -1924,8 +1931,12 @@ static void handle_incoming_and_exit(con
+@@ -1942,8 +1949,12 @@ static void handle_incoming_and_exit(con
        } while (*++tptr);
        *++urlp = '\0';       /* terminate after last character */
  
@@ -61,10 +64,10 @@
        /* If URL is a directory, add '/' */
 -      if (urlp[-1] != '/') {
 +      if (!redirect_path && (urlp[-1] != '/')) {
-               if (is_directory(urlcopy + 1, 1, &sb)) {
+               if (is_directory(urlcopy + 1, 1, NULL)) {
                        found_moved_temporarily = urlcopy;
                }
-@@ -2266,7 +2277,9 @@ static void sighup_handler(int sig UNUSE
+@@ -2283,7 +2294,9 @@ static void sighup_handler(int sig UNUSE
  }
  
  enum {
@@ -75,7 +78,7 @@
        d_opt_decode_url,
        h_opt_home_httpd,
        IF_FEATURE_HTTPD_ENCODE_URL_STR(e_opt_encode_url,)
-@@ -2315,12 +2328,13 @@ int httpd_main(int argc UNUSED_PARAM, ch
+@@ -2332,12 +2345,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. */