diff options
| author | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-09-28 12:38:46 +0000 |
|---|---|---|
| committer | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-09-28 12:38:46 +0000 |
| commit | 9dfc3e34ee54d00b68cc4cbb5cddcfa588fd07fb (patch) | |
| tree | 0c8df24973e5339e60c5aae5a5d461d18d373cac /package/busybox/patches/350-httpd_redir.patch | |
| parent | 21e17d6ad463edff7baf6e25a30041dcf22a8c4e (diff) | |
[package] busybox: update to v1.14.4 (closes: #5619)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17782 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/busybox/patches/350-httpd_redir.patch')
| -rw-r--r-- | package/busybox/patches/350-httpd_redir.patch | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/package/busybox/patches/350-httpd_redir.patch b/package/busybox/patches/350-httpd_redir.patch index da2fab695d..912cb6d497 100644 --- a/package/busybox/patches/350-httpd_redir.patch +++ b/package/busybox/patches/350-httpd_redir.patch @@ -1,6 +1,6 @@ --- a/include/usage.h +++ b/include/usage.h -@@ -1558,7 +1558,8 @@ +@@ -1638,7 +1638,8 @@ USE_FEATURE_HTTPD_BASIC_AUTH(" [-r realm]") \ USE_FEATURE_HTTPD_AUTH_MD5(" [-m pass]") \ " [-h home]" \ @@ -10,7 +10,7 @@ #define httpd_full_usage "\n\n" \ "Listen for incoming HTTP requests\n" \ "\nOptions:" \ -@@ -1576,6 +1577,8 @@ +@@ -1656,6 +1657,8 @@ "\n -h HOME Home directory (default .)" \ "\n -e STRING HTML encode STRING" \ "\n -d STRING URL decode STRING" \ @@ -30,7 +30,7 @@ Htaccess_IP *ip_a_d; /* config allow/deny lines */ USE_FEATURE_HTTPD_BASIC_AUTH(const char *g_realm;) -@@ -295,6 +297,8 @@ struct globals { +@@ -294,6 +296,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) @@ -39,7 +39,7 @@ #define last_mod (G.last_mod ) #define ip_a_d (G.ip_a_d ) #define g_realm (G.g_realm ) -@@ -1003,8 +1007,11 @@ static void send_headers(int responseNum +@@ -993,8 +997,11 @@ static void send_headers(int responseNum } #endif if (responseNum == HTTP_MOVED_TEMPORARILY) { @@ -52,7 +52,7 @@ (g_query ? "?" : ""), (g_query ? g_query : "")); } -@@ -1939,8 +1946,12 @@ static void handle_incoming_and_exit(con +@@ -1924,8 +1931,12 @@ static void handle_incoming_and_exit(con } while (*++tptr); *++urlp = '\0'; /* terminate after last character */ @@ -66,8 +66,8 @@ if (is_directory(urlcopy + 1, 1, &sb)) { found_moved_temporarily = urlcopy; } -@@ -2293,7 +2304,9 @@ static void sighup_handler(int sig) - #endif +@@ -2266,7 +2277,9 @@ static void sighup_handler(int sig UNUSE + } enum { - c_opt_config_file = 0, @@ -77,7 +77,7 @@ d_opt_decode_url, h_opt_home_httpd, USE_FEATURE_HTTPD_ENCODE_URL_STR(e_opt_encode_url,) -@@ -2342,12 +2355,13 @@ int httpd_main(int argc UNUSED_PARAM, ch +@@ -2315,12 +2328,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. */ @@ -89,6 +89,6 @@ USE_FEATURE_HTTPD_SETUID("u:") "p:ifv", + &redirect_path, &redirect_host, - &configFile, &url_for_decode, &home_httpd + &opt_c_configFile, &url_for_decode, &home_httpd USE_FEATURE_HTTPD_ENCODE_URL_STR(, &url_for_encode) USE_FEATURE_HTTPD_BASIC_AUTH(, &g_realm) |