|
|
|
|
@ -1,6 +1,6 @@
|
|
|
|
|
--- a/include/usage.src.h
|
|
|
|
|
+++ b/include/usage.src.h
|
|
|
|
|
@@ -1719,7 +1719,8 @@ INSERT
|
|
|
|
|
@@ -1623,7 +1623,8 @@ INSERT
|
|
|
|
|
IF_FEATURE_HTTPD_SETUID(" [-u USER[:GRP]]") \
|
|
|
|
|
IF_FEATURE_HTTPD_BASIC_AUTH(" [-r REALM]") \
|
|
|
|
|
" [-h HOME]\n" \
|
|
|
|
|
@ -10,7 +10,7 @@
|
|
|
|
|
#define httpd_full_usage "\n\n" \
|
|
|
|
|
"Listen for incoming HTTP requests\n" \
|
|
|
|
|
"\nOptions:" \
|
|
|
|
|
@@ -1737,6 +1738,8 @@ INSERT
|
|
|
|
|
@@ -1641,6 +1642,8 @@ INSERT
|
|
|
|
|
"\n -m STRING MD5 crypt STRING") \
|
|
|
|
|
"\n -e STRING HTML encode STRING" \
|
|
|
|
|
"\n -d STRING URL decode STRING" \
|
|
|
|
|
@ -21,7 +21,7 @@
|
|
|
|
|
IF_FEATURE_HWCLOCK_LONG_OPTIONS( \
|
|
|
|
|
--- a/networking/httpd.c
|
|
|
|
|
+++ b/networking/httpd.c
|
|
|
|
|
@@ -250,6 +250,8 @@ struct globals {
|
|
|
|
|
@@ -243,6 +243,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 */
|
|
|
|
|
|
|
|
|
|
IF_FEATURE_HTTPD_BASIC_AUTH(const char *g_realm;)
|
|
|
|
|
@@ -296,6 +298,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 )
|
|
|
|
|
@@ -997,8 +1001,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 : ""));
|
|
|
|
|
}
|
|
|
|
|
@@ -1942,8 +1949,12 @@ static void handle_incoming_and_exit(con
|
|
|
|
|
@@ -1967,8 +1974,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, NULL)) {
|
|
|
|
|
found_moved_temporarily = urlcopy;
|
|
|
|
|
}
|
|
|
|
|
@@ -2283,7 +2294,9 @@ static void sighup_handler(int sig UNUSE
|
|
|
|
|
@@ -2325,7 +2336,9 @@ static void sighup_handler(int sig UNUSE
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
enum {
|
|
|
|
|
@ -77,7 +77,7 @@
|
|
|
|
|
d_opt_decode_url,
|
|
|
|
|
h_opt_home_httpd,
|
|
|
|
|
IF_FEATURE_HTTPD_ENCODE_URL_STR(e_opt_encode_url,)
|
|
|
|
|
@@ -2332,12 +2345,13 @@ int httpd_main(int argc UNUSED_PARAM, ch
|
|
|
|
|
@@ -2374,12 +2387,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. */
|
|
|
|
|
|
Felix Fietkau
13 years ago