X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/b0c94d7f56f87751f1a594bc189b204eed800610..86143fe01068cd4a7703629b88ce41e51bccb03b:/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 bc34c3b54..3d3e041ce 100644
--- a/package/busybox/patches/350-httpd_redir.patch
+++ b/package/busybox/patches/350-httpd_redir.patch
@@ -1,31 +1,25 @@
-Index: busybox-1.7.2/include/usage.h
-===================================================================
---- busybox-1.7.2.orig/include/usage.h	2007-10-30 15:34:59.000000000 -0500
-+++ busybox-1.7.2/include/usage.h	2007-10-30 15:35:03.000000000 -0500
-@@ -1350,7 +1350,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.h
++++ b/include/usage.h
+@@ -1693,6 +1693,7 @@
+ 	IF_FEATURE_HTTPD_BASIC_AUTH(" [-r REALM]") \
+        " [-h HOME]\n" \
+        "or httpd -d/-e" IF_FEATURE_HTTPD_AUTH_MD5("/-m") " STRING"
 +       " [-R <path> [-H <host>]]"
- #define httpd_full_usage \
-        "Listen for incoming HTTP requests" \
-        "\n\nOptions:" \
-@@ -1368,6 +1369,8 @@
-        "\n	-h HOME		Home directory (default .)" \
-        "\n	-e STRING	HTML encode STRING" \
-        "\n	-d STRING	URL decode STRING" \
-+       "\n	-R PATH 	Redirect target path" \
-+       "\n	-H HOST 	Redirect target host" \
+ #define httpd_full_usage "\n\n" \
+        "Listen for incoming HTTP requests\n" \
+      "\nOptions:" \
+@@ -1710,6 +1711,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" \
  
  #define hwclock_trivial_usage \
-        "[-r|--show] [-s|--hctosys] [-w|--systohc]" \
-Index: busybox-1.7.2/networking/httpd.c
-===================================================================
---- busybox-1.7.2.orig/networking/httpd.c	2007-10-30 15:35:03.000000000 -0500
-+++ busybox-1.7.2/networking/httpd.c	2007-10-30 15:35:03.000000000 -0500
-@@ -230,6 +230,8 @@
+ 	IF_FEATURE_HWCLOCK_LONG_OPTIONS( \
+--- a/networking/httpd.c
++++ b/networking/httpd.c
+@@ -248,6 +248,8 @@ struct globals {
  
  	const char *found_mime_type;
  	const char *found_moved_temporarily;
@@ -33,17 +27,17 @@ Index: busybox-1.7.2/networking/httpd.c
 +	const char *redirect_host;
  	Htaccess_IP *ip_a_d;    /* config allow/deny lines */
  
- 	USE_FEATURE_HTTPD_BASIC_AUTH(const char *g_realm;)
-@@ -264,6 +266,8 @@
- #define home_httpd        (G.home_httpd       )
+ 	IF_FEATURE_HTTPD_BASIC_AUTH(const char *g_realm;)
+@@ -294,6 +296,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)
 +#define redirect_path     (G.redirect_path    )
 +#define redirect_host     (G.redirect_host    )
- #define ContentLength     (G.ContentLength    )
  #define last_mod          (G.last_mod         )
  #define ip_a_d            (G.ip_a_d           )
-@@ -901,8 +905,11 @@
+ #define g_realm           (G.g_realm          )
+@@ -993,8 +997,11 @@ static void send_headers(int responseNum
  	}
  #endif
  	if (responseNum == HTTP_MOVED_TEMPORARILY) {
@@ -56,22 +50,22 @@ Index: busybox-1.7.2/networking/httpd.c
  				(g_query ? "?" : ""),
  				(g_query ? g_query : ""));
  	}
-@@ -1730,8 +1737,12 @@
- 	*++urlp = '\0';       /* so keep last character */
- 	tptr = urlp;          /* end ptr */
+@@ -1924,8 +1931,12 @@ static void handle_incoming_and_exit(con
+ 	} while (*++tptr);
+ 	*++urlp = '\0';       /* terminate after last character */
  
 +	/* redirect active */
 +	if (redirect_path && (strncmp(urlcopy, redirect_path, strlen(redirect_path)) != 0))
 +		found_moved_temporarily = redirect_path;
 +
  	/* If URL is a directory, add '/' */
--	if (tptr[-1] != '/') {
-+	if (!redirect_path && (tptr[-1] != '/')) {
+-	if (urlp[-1] != '/') {
++	if (!redirect_path && (urlp[-1] != '/')) {
  		if (is_directory(urlcopy + 1, 1, &sb)) {
  			found_moved_temporarily = urlcopy;
  		}
-@@ -2004,7 +2015,9 @@
- #endif
+@@ -2266,7 +2277,9 @@ static void sighup_handler(int sig UNUSE
+ }
  
  enum {
 -	c_opt_config_file = 0,
@@ -80,19 +74,19 @@ Index: busybox-1.7.2/networking/httpd.c
 +	c_opt_config_file,
  	d_opt_decode_url,
  	h_opt_home_httpd,
- 	USE_FEATURE_HTTPD_ENCODE_URL_STR(e_opt_encode_url,)
-@@ -2053,12 +2066,13 @@
+ 	IF_FEATURE_HTTPD_ENCODE_URL_STR(e_opt_encode_url,)
+@@ -2315,12 +2328,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 can end up
- 	 * relative too. */
+ 	 * 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,
- 			&configFile, &url_for_decode, &home_httpd
- 			USE_FEATURE_HTTPD_ENCODE_URL_STR(, &url_for_encode)
- 			USE_FEATURE_HTTPD_BASIC_AUTH(, &g_realm)
+ 			&opt_c_configFile, &url_for_decode, &home_httpd
+ 			IF_FEATURE_HTTPD_ENCODE_URL_STR(, &url_for_encode)
+ 			IF_FEATURE_HTTPD_BASIC_AUTH(, &g_realm)