[backfire] package/busybox: backport r29299 (wget: URL-decode user:password before...

[openwrt-10.03/.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 3d3e041ce8f1656c3b4023f4cde93bb6344b9bc3..99f60457caa2da8ecbaac2de046e93792a4b464b 100644 (file)
--- a/package/busybox/patches/350-httpd_redir.patch
+++ b/package/busybox/patches/350-httpd_redir.patch
@@ -37,7 +37,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
+@@ -921,8 +925,11 @@ static void send_headers(int responseNum
        }
  #endif
        if (responseNum == HTTP_MOVED_TEMPORARILY) {
@@ -50,7 +50,7 @@
                                (g_query ? "?" : ""),
                                (g_query ? g_query : ""));
        }
-@@ -1924,8 +1931,12 @@ static void handle_incoming_and_exit(con
+@@ -1852,8 +1859,12 @@ static void handle_incoming_and_exit(con
        } while (*++tptr);
        *++urlp = '\0';       /* terminate after last character */
  
@@ -64,7 +64,7 @@
                if (is_directory(urlcopy + 1, 1, &sb)) {
                        found_moved_temporarily = urlcopy;
                }
-@@ -2266,7 +2277,9 @@ static void sighup_handler(int sig UNUSE
+@@ -2194,7 +2205,9 @@ static void sighup_handler(int sig UNUSE
  }
  
  enum {
@@ -75,7 +75,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
+@@ -2243,12 +2256,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. */