package/busybox: use new service wrapper

[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 6161871..d5f64e3 100644 (file)
--- a/package/busybox/patches/350-httpd_redir.patch
+++ b/package/busybox/patches/350-httpd_redir.patch
@@ -1,28 +1,23 @@
---- 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" \
-+       " [-R <path> [-H <host>]]"
- #define httpd_full_usage "\n\n" \
-        "Listen for incoming HTTP requests\n" \
-      "\nOptions:" \
-@@ -2319,6 +2320,9 @@ INSERT
- #define loadkmap_example_usage \
-        "$ loadkmap < /etc/i18n/lang-keymap\n"
- 
-+#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
 --- a/networking/httpd.c
 +++ b/networking/httpd.c

-@@ -250,6 +250,8 @@ struct globals {
+@@ -105,6 +105,7 @@
+ //usage:      IF_FEATURE_HTTPD_BASIC_AUTH(" [-r REALM]")
+ //usage:       " [-h HOME]\n"
+ //usage:       "or httpd -d/-e" IF_FEATURE_HTTPD_AUTH_MD5("/-m") " STRING"
++//usage:       " [-R <path> [-H <host>]]"
+ //usage:#define httpd_full_usage "\n\n"
+ //usage:       "Listen for incoming HTTP requests\n"
+ //usage:     "\n      -i              Inetd mode"
+@@ -121,6 +122,8 @@
+ //usage:     "\n      -m STRING       MD5 crypt STRING")
+ //usage:     "\n      -e STRING       HTML encode STRING"
+ //usage:     "\n      -d STRING       URL decode STRING"
++//usage:     "\n      -R PATH         Redirect target path"
++//usage:     "\n      -H HOST         Redirect target host"
+ 
+ #include "libbb.h"
+ #if ENABLE_FEATURE_HTTPD_USE_SENDFILE
+@@ -272,6 +275,8 @@ struct globals {

  
        const char *found_mime_type;
        const char *found_moved_temporarily;
  
        const char *found_mime_type;
        const char *found_moved_temporarily;


@@ -31,7 +26,7 @@
        Htaccess_IP *ip_a_d;    /* config allow/deny lines */
  
        IF_FEATURE_HTTPD_BASIC_AUTH(const char *g_realm;)
        Htaccess_IP *ip_a_d;    /* config allow/deny lines */
  
        IF_FEATURE_HTTPD_BASIC_AUTH(const char *g_realm;)

-@@ -296,6 +298,8 @@ struct globals {
+@@ -322,6 +327,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)
  #define index_page        (G.index_page       )
  #define found_mime_type   (G.found_mime_type  )
  #define found_moved_temporarily (G.found_moved_temporarily)


@@ -40,7 +35,7 @@
  #define last_mod          (G.last_mod         )
  #define ip_a_d            (G.ip_a_d           )
  #define g_realm           (G.g_realm          )
  #define last_mod          (G.last_mod         )
  #define ip_a_d            (G.ip_a_d           )
  #define g_realm           (G.g_realm          )

-@@ -997,8 +1001,11 @@ static void send_headers(int responseNum
+@@ -1028,8 +1035,11 @@ static void send_headers(int responseNum

        }
  #endif
        if (responseNum == HTTP_MOVED_TEMPORARILY) {
        }
  #endif
        if (responseNum == HTTP_MOVED_TEMPORARILY) {


@@ -53,7 +48,7 @@
                                (g_query ? "?" : ""),
                                (g_query ? g_query : ""));
        }
                                (g_query ? "?" : ""),
                                (g_query ? g_query : ""));
        }

-@@ -1941,8 +1948,12 @@ static void handle_incoming_and_exit(con
+@@ -1997,8 +2007,12 @@ static void handle_incoming_and_exit(con

        } while (*++tptr);
        *++urlp = '\0';       /* terminate after last character */
  
        } while (*++tptr);
        *++urlp = '\0';       /* terminate after last character */
  


@@ -67,7 +62,7 @@
                if (is_directory(urlcopy + 1, 1, NULL)) {
                        found_moved_temporarily = urlcopy;
                }
                if (is_directory(urlcopy + 1, 1, NULL)) {
                        found_moved_temporarily = urlcopy;
                }

-@@ -2283,7 +2294,9 @@ static void sighup_handler(int sig UNUSE
+@@ -2355,7 +2369,9 @@ static void sighup_handler(int sig UNUSE

  }
  
  enum {
  }
  
  enum {


@@ -78,7 +73,7 @@
        d_opt_decode_url,
        h_opt_home_httpd,
        IF_FEATURE_HTTPD_ENCODE_URL_STR(e_opt_encode_url,)
        d_opt_decode_url,
        h_opt_home_httpd,
        IF_FEATURE_HTTPD_ENCODE_URL_STR(e_opt_encode_url,)

-@@ -2332,12 +2345,13 @@ int httpd_main(int argc UNUSED_PARAM, ch
+@@ -2404,12 +2420,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. */
        /* We do not "absolutize" path given by -h (home) opt.
         * If user gives relative path in -h,
         * $SCRIPT_FILENAME will not be set. */