diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2009-02-21 15:07:45 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2009-02-21 15:07:45 +0000 |
commit | 701d71984cd2ae8ddabb45ca57a871fdb4a94df3 (patch) | |
tree | 799f7389b8981f2da6bfba2b3296b5faef3e360b /package/busybox/patches/350-httpd_redir.patch | |
parent | 3849a57cd7cb47e30a506222779916eebdbb28fb (diff) | |
download | upstream-701d71984cd2ae8ddabb45ca57a871fdb4a94df3.tar.gz upstream-701d71984cd2ae8ddabb45ca57a871fdb4a94df3.tar.bz2 upstream-701d71984cd2ae8ddabb45ca57a871fdb4a94df3.zip |
busybox: refresh busybox patches
SVN-Revision: 14590
Diffstat (limited to 'package/busybox/patches/350-httpd_redir.patch')
-rw-r--r-- | package/busybox/patches/350-httpd_redir.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/package/busybox/patches/350-httpd_redir.patch b/package/busybox/patches/350-httpd_redir.patch index 388cf8cfec..5cda8c3306 100644 --- a/package/busybox/patches/350-httpd_redir.patch +++ b/package/busybox/patches/350-httpd_redir.patch @@ -21,7 +21,7 @@ USE_GETOPT_LONG( \ --- a/networking/httpd.c +++ b/networking/httpd.c -@@ -247,6 +247,8 @@ +@@ -247,6 +247,8 @@ struct globals { const char *found_mime_type; const char *found_moved_temporarily; @@ -30,7 +30,7 @@ Htaccess_IP *ip_a_d; /* config allow/deny lines */ USE_FEATURE_HTTPD_BASIC_AUTH(const char *g_realm;) -@@ -292,6 +294,8 @@ +@@ -292,6 +294,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 ) -@@ -991,8 +995,11 @@ +@@ -991,8 +995,11 @@ static void send_headers(int responseNum } #endif if (responseNum == HTTP_MOVED_TEMPORARILY) { @@ -52,7 +52,7 @@ (g_query ? "?" : ""), (g_query ? g_query : "")); } -@@ -1923,8 +1930,12 @@ +@@ -1923,8 +1930,12 @@ static void handle_incoming_and_exit(con } while (*++tptr); *++urlp = '\0'; /* terminate after last character */ @@ -66,7 +66,7 @@ if (is_directory(urlcopy + 1, 1, &sb)) { found_moved_temporarily = urlcopy; } -@@ -2274,7 +2285,9 @@ +@@ -2274,7 +2285,9 @@ static void sighup_handler(int sig) #endif enum { @@ -77,7 +77,7 @@ d_opt_decode_url, h_opt_home_httpd, USE_FEATURE_HTTPD_ENCODE_URL_STR(e_opt_encode_url,) -@@ -2323,12 +2336,13 @@ +@@ -2323,12 +2336,13 @@ int httpd_main(int argc ATTRIBUTE_UNUSED /* We do not "absolutize" path given by -h (home) opt. * If user gives relative path in -h, * $SCRIPT_FILENAME will not be set. */ |