rt2800pci: add back ifdown hang workaround that was accidentally dropped during a...

[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 bc34c3b..7437d89 100644 (file)
--- a/package/busybox/patches/350-httpd_redir.patch
+++ b/package/busybox/patches/350-httpd_redir.patch
@@ -1,31 +1,27 @@
-Index: busybox-1.7.2/include/usage.h
-===================================================================
---- busybox-1.7.2.orig/include/usage.h 2007-10-30 15:34:59.000000000 -0500
-+++ busybox-1.7.2/include/usage.h      2007-10-30 15:35:03.000000000 -0500
-@@ -1350,7 +1350,8 @@
-       USE_FEATURE_HTTPD_BASIC_AUTH(" [-r realm]") \
-       USE_FEATURE_HTTPD_AUTH_MD5(" [-m pass]") \
-        " [-h home]" \
--       " [-d/-e string]"
-+       " [-d/-e string]" \
+--- a/include/usage.src.h
++++ b/include/usage.src.h
+@@ -1719,7 +1719,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>]]"
 +       " [-R <path> [-H <host>]]"

- #define httpd_full_usage \
-        "Listen for incoming HTTP requests" \
-        "\n\nOptions:" \
-@@ -1368,6 +1369,8 @@
-        "\n    -h HOME         Home directory (default .)" \
-        "\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 httpd_full_usage "\n\n" \
+        "Listen for incoming HTTP requests\n" \
+      "\nOptions:" \
+@@ -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 hwclock_trivial_usage \
  
  #define hwclock_trivial_usage \

-        "[-r|--show] [-s|--hctosys] [-w|--systohc]" \
-Index: busybox-1.7.2/networking/httpd.c
-===================================================================
---- busybox-1.7.2.orig/networking/httpd.c      2007-10-30 15:35:03.000000000 -0500
-+++ busybox-1.7.2/networking/httpd.c   2007-10-30 15:35:03.000000000 -0500
-@@ -230,6 +230,8 @@
+       IF_FEATURE_HWCLOCK_LONG_OPTIONS( \
+--- a/networking/httpd.c
++++ b/networking/httpd.c
+@@ -250,6 +250,8 @@ struct globals {

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


@@ -33,17 +29,17 @@ Index: busybox-1.7.2/networking/httpd.c
 +      const char *redirect_host;
        Htaccess_IP *ip_a_d;    /* config allow/deny lines */
  
 +      const char *redirect_host;
        Htaccess_IP *ip_a_d;    /* config allow/deny lines */
  

-       USE_FEATURE_HTTPD_BASIC_AUTH(const char *g_realm;)
-@@ -264,6 +266,8 @@
- #define home_httpd        (G.home_httpd       )
+       IF_FEATURE_HTTPD_BASIC_AUTH(const char *g_realm;)
+@@ -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)
 +#define redirect_path     (G.redirect_path    )
 +#define redirect_host     (G.redirect_host    )
  #define found_mime_type   (G.found_mime_type  )
  #define found_moved_temporarily (G.found_moved_temporarily)
 +#define redirect_path     (G.redirect_path    )
 +#define redirect_host     (G.redirect_host    )

- #define ContentLength     (G.ContentLength    )

  #define last_mod          (G.last_mod         )
  #define ip_a_d            (G.ip_a_d           )
  #define last_mod          (G.last_mod         )
  #define ip_a_d            (G.ip_a_d           )

-@@ -901,8 +905,11 @@
+ #define g_realm           (G.g_realm          )
+@@ -997,8 +1001,11 @@ static void send_headers(int responseNum

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


@@ -56,22 +52,22 @@ Index: busybox-1.7.2/networking/httpd.c
                                (g_query ? "?" : ""),
                                (g_query ? g_query : ""));
        }
                                (g_query ? "?" : ""),
                                (g_query ? g_query : ""));
        }

-@@ -1730,8 +1737,12 @@
-       *++urlp = '\0';       /* so keep last character */
-       tptr = urlp;          /* end ptr */
+@@ -1942,8 +1949,12 @@ static void handle_incoming_and_exit(con
+       } while (*++tptr);
+       *++urlp = '\0';       /* terminate after last character */

  
 +      /* redirect active */
 +      if (redirect_path && (strncmp(urlcopy, redirect_path, strlen(redirect_path)) != 0))
 +              found_moved_temporarily = redirect_path;
 +
        /* If URL is a directory, add '/' */
  
 +      /* redirect active */
 +      if (redirect_path && (strncmp(urlcopy, redirect_path, strlen(redirect_path)) != 0))
 +              found_moved_temporarily = redirect_path;
 +
        /* If URL is a directory, add '/' */

--      if (tptr[-1] != '/') {
-+      if (!redirect_path && (tptr[-1] != '/')) {
-               if (is_directory(urlcopy + 1, 1, &sb)) {
+-      if (urlp[-1] != '/') {
++      if (!redirect_path && (urlp[-1] != '/')) {
+               if (is_directory(urlcopy + 1, 1, NULL)) {

                        found_moved_temporarily = urlcopy;
                }
                        found_moved_temporarily = urlcopy;
                }

-@@ -2004,7 +2015,9 @@
- #endif
+@@ -2283,7 +2294,9 @@ static void sighup_handler(int sig UNUSE
+ }

  
  enum {
 -      c_opt_config_file = 0,
  
  enum {
 -      c_opt_config_file = 0,


@@ -80,19 +76,19 @@ Index: busybox-1.7.2/networking/httpd.c
 +      c_opt_config_file,
        d_opt_decode_url,
        h_opt_home_httpd,
 +      c_opt_config_file,
        d_opt_decode_url,
        h_opt_home_httpd,

-       USE_FEATURE_HTTPD_ENCODE_URL_STR(e_opt_encode_url,)
-@@ -2053,12 +2066,13 @@
+       IF_FEATURE_HTTPD_ENCODE_URL_STR(e_opt_encode_url,)
+@@ -2332,12 +2345,13 @@ int httpd_main(int argc UNUSED_PARAM, ch

        /* We do not "absolutize" path given by -h (home) opt.
        /* We do not "absolutize" path given by -h (home) opt.

-        * If user gives relative path in -h, $SCRIPT_FILENAME can end up
-        * relative too. */
+        * 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:"
 -      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,
                        "p:ifv",
 +                      &redirect_path, &redirect_host,

-                       &configFile, &url_for_decode, &home_httpd
-                       USE_FEATURE_HTTPD_ENCODE_URL_STR(, &url_for_encode)
-                       USE_FEATURE_HTTPD_BASIC_AUTH(, &g_realm)
+                       &opt_c_configFile, &url_for_decode, &home_httpd
+                       IF_FEATURE_HTTPD_ENCODE_URL_STR(, &url_for_encode)
+                       IF_FEATURE_HTTPD_BASIC_AUTH(, &g_realm)