diff options
| author | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-04-03 00:58:46 +0000 |
|---|---|---|
| committer | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-04-03 00:58:46 +0000 |
| commit | 9ac93adcf7ed767ae6d53cc43804515c14a27fad (patch) | |
| tree | d07bb9a053f23756c5eed4761088f44d8b555235 /package/busybox/patches/350-httpd_redir.patch | |
| parent | b83eec6384a244d5c9b27647ea3694f26f7049af (diff) | |
[package] busybox: update to v1.16.1 (based on v1.16.0 update patch from Peter Wagner)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20661 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 | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/package/busybox/patches/350-httpd_redir.patch b/package/busybox/patches/350-httpd_redir.patch index 3d3e041ce..bbb8eb4aa 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 -@@ -1693,6 +1693,7 @@ +@@ -1727,6 +1727,7 @@ IF_FEATURE_HTTPD_BASIC_AUTH(" [-r REALM]") \ " [-h HOME]\n" \ "or httpd -d/-e" IF_FEATURE_HTTPD_AUTH_MD5("/-m") " STRING" @@ -8,18 +8,18 @@ #define httpd_full_usage "\n\n" \ "Listen for incoming HTTP requests\n" \ "\nOptions:" \ -@@ -1710,6 +1711,8 @@ +@@ -1744,6 +1745,8 @@ "\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" \ ++ "\n -R PATH Redirect target path" \ ++ "\n -H HOST Redirect target host" \ #define hwclock_trivial_usage \ IF_FEATURE_HWCLOCK_LONG_OPTIONS( \ --- a/networking/httpd.c +++ b/networking/httpd.c -@@ -248,6 +248,8 @@ struct globals { +@@ -250,6 +250,8 @@ struct globals { const char *found_mime_type; const char *found_moved_temporarily; @@ -28,7 +28,7 @@ Htaccess_IP *ip_a_d; /* config allow/deny lines */ IF_FEATURE_HTTPD_BASIC_AUTH(const char *g_realm;) -@@ -294,6 +296,8 @@ struct globals { +@@ -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) @@ -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 +@@ -997,8 +1001,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 +@@ -1941,8 +1948,12 @@ static void handle_incoming_and_exit(con } while (*++tptr); *++urlp = '\0'; /* terminate after last character */ @@ -61,10 +61,10 @@ /* If URL is a directory, add '/' */ - if (urlp[-1] != '/') { + if (!redirect_path && (urlp[-1] != '/')) { - if (is_directory(urlcopy + 1, 1, &sb)) { + if (is_directory(urlcopy + 1, 1, NULL)) { found_moved_temporarily = urlcopy; } -@@ -2266,7 +2277,9 @@ static void sighup_handler(int sig UNUSE +@@ -2283,7 +2294,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 +@@ -2332,12 +2345,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. */ |