X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/9dfc3e34ee54d00b68cc4cbb5cddcfa588fd07fb..38df04989f5f979596bcceee9d66e68b699b5188:/package/busybox/patches/350-httpd_redir.patch

diff --git a/package/busybox/patches/350-httpd_redir.patch b/package/busybox/patches/350-httpd_redir.patch
index 912cb6d49..7437d898c 100644
--- a/package/busybox/patches/350-httpd_redir.patch
+++ b/package/busybox/patches/350-httpd_redir.patch
@@ -1,27 +1,27 @@
---- a/include/usage.h
-+++ b/include/usage.h
-@@ -1638,7 +1638,8 @@
- 	USE_FEATURE_HTTPD_BASIC_AUTH(" [-r realm]") \
- 	USE_FEATURE_HTTPD_AUTH_MD5(" [-m pass]") \
-        " [-h home]" \
--       " [-d/-e string]"
-+       " [-d/-e string]" \
+--- a/include/usage.src.h
++++ b/include/usage.src.h
+@@ -1719,7 +1719,8 @@ INSERT
+ 	IF_FEATURE_HTTPD_SETUID(" [-u USER[:GRP]]") \
+ 	IF_FEATURE_HTTPD_BASIC_AUTH(" [-r REALM]") \
+        " [-h HOME]\n" \
+-       "or httpd -d/-e" IF_FEATURE_HTTPD_AUTH_MD5("/-m") " STRING"
++       "or httpd -d/-e" IF_FEATURE_HTTPD_AUTH_MD5("/-m") " STRING" \
 +       " [-R <path> [-H <host>]]"
  #define httpd_full_usage "\n\n" \
         "Listen for incoming HTTP requests\n" \
       "\nOptions:" \
-@@ -1656,6 +1657,8 @@
-      "\n	-h HOME		Home directory (default .)" \
+@@ -1737,6 +1738,8 @@ INSERT
+      "\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 \
- 	USE_FEATURE_HWCLOCK_LONG_OPTIONS( \
+ 	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;
@@ -29,8 +29,8 @@
 +	const char *redirect_host;
  	Htaccess_IP *ip_a_d;    /* config allow/deny lines */
  
- 	USE_FEATURE_HTTPD_BASIC_AUTH(const char *g_realm;)
-@@ -294,6 +296,8 @@ struct globals {
+ 	IF_FEATURE_HTTPD_BASIC_AUTH(const char *g_realm;)
+@@ -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)
@@ -39,7 +39,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) {
@@ -52,7 +52,7 @@
  				(g_query ? "?" : ""),
  				(g_query ? g_query : ""));
  	}
-@@ -1924,8 +1931,12 @@ static void handle_incoming_and_exit(con
+@@ -1942,8 +1949,12 @@ static void handle_incoming_and_exit(con
  	} while (*++tptr);
  	*++urlp = '\0';       /* terminate after last character */
  
@@ -63,10 +63,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 {
@@ -76,19 +76,19 @@
 +	c_opt_config_file,
  	d_opt_decode_url,
  	h_opt_home_httpd,
- 	USE_FEATURE_HTTPD_ENCODE_URL_STR(e_opt_encode_url,)
-@@ -2315,12 +2328,13 @@ int httpd_main(int argc UNUSED_PARAM, ch
+ 	IF_FEATURE_HTTPD_ENCODE_URL_STR(e_opt_encode_url,)
+@@ -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. */
 -	opt = getopt32(argv, "c:d:h:"
 +	opt = getopt32(argv, "R:H:c:d:h:"
- 			USE_FEATURE_HTTPD_ENCODE_URL_STR("e:")
- 			USE_FEATURE_HTTPD_BASIC_AUTH("r:")
- 			USE_FEATURE_HTTPD_AUTH_MD5("m:")
- 			USE_FEATURE_HTTPD_SETUID("u:")
+ 			IF_FEATURE_HTTPD_ENCODE_URL_STR("e:")
+ 			IF_FEATURE_HTTPD_BASIC_AUTH("r:")
+ 			IF_FEATURE_HTTPD_AUTH_MD5("m:")
+ 			IF_FEATURE_HTTPD_SETUID("u:")
  			"p:ifv",
 +			&redirect_path, &redirect_host,
  			&opt_c_configFile, &url_for_decode, &home_httpd
- 			USE_FEATURE_HTTPD_ENCODE_URL_STR(, &url_for_encode)
- 			USE_FEATURE_HTTPD_BASIC_AUTH(, &g_realm)
+ 			IF_FEATURE_HTTPD_ENCODE_URL_STR(, &url_for_encode)
+ 			IF_FEATURE_HTTPD_BASIC_AUTH(, &g_realm)