diff options
| author | Nicolas Thill <nico@openwrt.org> | 2011-11-23 19:41:36 +0000 |
|---|---|---|
| committer | Nicolas Thill <nico@openwrt.org> | 2011-11-23 19:41:36 +0000 |
| commit | be4f27f38b4238088cfd9cecbdae1e462ef3005a (patch) | |
| tree | 5a5c7c0d8dd58039280ab9f67013dd675c505d3a /package/busybox/patches/350-httpd_redir.patch | |
| parent | e73515487465f48efffb4fc5c4d0d4d150953e96 (diff) | |
| download | upstream-be4f27f38b4238088cfd9cecbdae1e462ef3005a.tar.gz upstream-be4f27f38b4238088cfd9cecbdae1e462ef3005a.tar.bz2 upstream-be4f27f38b4238088cfd9cecbdae1e462ef3005a.zip | |
package/busybox: wget: URL-decode user:password before base64-encoding it into auth hdr (upstream fix)
SVN-Revision: 29299
Diffstat (limited to 'package/busybox/patches/350-httpd_redir.patch')
| -rw-r--r-- | package/busybox/patches/350-httpd_redir.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/package/busybox/patches/350-httpd_redir.patch b/package/busybox/patches/350-httpd_redir.patch index d5f64e332a..11125e71f1 100644 --- a/package/busybox/patches/350-httpd_redir.patch +++ b/package/busybox/patches/350-httpd_redir.patch @@ -35,7 +35,7 @@ #define last_mod (G.last_mod ) #define ip_a_d (G.ip_a_d ) #define g_realm (G.g_realm ) -@@ -1028,8 +1035,11 @@ static void send_headers(int responseNum +@@ -956,8 +963,11 @@ static void send_headers(int responseNum } #endif if (responseNum == HTTP_MOVED_TEMPORARILY) { @@ -48,7 +48,7 @@ (g_query ? "?" : ""), (g_query ? g_query : "")); } -@@ -1997,8 +2007,12 @@ static void handle_incoming_and_exit(con +@@ -1925,8 +1935,12 @@ static void handle_incoming_and_exit(con } while (*++tptr); *++urlp = '\0'; /* terminate after last character */ @@ -62,7 +62,7 @@ if (is_directory(urlcopy + 1, 1, NULL)) { found_moved_temporarily = urlcopy; } -@@ -2355,7 +2369,9 @@ static void sighup_handler(int sig UNUSE +@@ -2283,7 +2297,9 @@ static void sighup_handler(int sig UNUSE } enum { @@ -73,7 +73,7 @@ d_opt_decode_url, h_opt_home_httpd, IF_FEATURE_HTTPD_ENCODE_URL_STR(e_opt_encode_url,) -@@ -2404,12 +2420,13 @@ int httpd_main(int argc UNUSED_PARAM, ch +@@ -2332,12 +2348,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. */ |