summaryrefslogtreecommitdiff
path: root/package/busybox/patches/350-httpd_redir.patch
diff options
context:
space:
mode:
Diffstat (limited to 'package/busybox/patches/350-httpd_redir.patch')
-rw-r--r--package/busybox/patches/350-httpd_redir.patch16
1 files changed, 8 insertions, 8 deletions
diff --git a/package/busybox/patches/350-httpd_redir.patch b/package/busybox/patches/350-httpd_redir.patch
index 5cda8c3..ab25cd2 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 @@
+@@ -1552,7 +1552,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 @@
+@@ -1570,6 +1571,8 @@
"\n -h HOME Home directory (default .)" \
"\n -e STRING HTML encode STRING" \
"\n -d STRING URL decode STRING" \
@@ -21,7 +21,7 @@
USE_GETOPT_LONG( \
--- a/networking/httpd.c
+++ b/networking/httpd.c
-@@ -247,6 +247,8 @@ struct globals {
+@@ -248,6 +248,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 @@ struct globals {
+@@ -293,6 +295,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 @@ static void send_headers(int responseNum
+@@ -999,8 +1003,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 @@ static void handle_incoming_and_exit(con
+@@ -1931,8 +1938,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 @@ static void sighup_handler(int sig)
+@@ -2281,7 +2292,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 @@ int httpd_main(int argc ATTRIBUTE_UNUSED
+@@ -2330,12 +2343,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. */