diff options
Diffstat (limited to 'package/busybox/patches/350-httpd_redir.patch')
| -rw-r--r-- | package/busybox/patches/350-httpd_redir.patch | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/package/busybox/patches/350-httpd_redir.patch b/package/busybox/patches/350-httpd_redir.patch index bc34c3b541..57d3b0bef5 100644 --- a/package/busybox/patches/350-httpd_redir.patch +++ b/package/busybox/patches/350-httpd_redir.patch @@ -1,8 +1,8 @@ -Index: busybox-1.7.2/include/usage.h +Index: busybox-1.8.1/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 @@ +--- busybox-1.8.1.orig/include/usage.h 2007-11-10 16:54:16.433376848 +0100 ++++ busybox-1.8.1/include/usage.h 2007-11-10 16:54:29.970148260 +0100 +@@ -1418,7 +1418,8 @@ USE_FEATURE_HTTPD_BASIC_AUTH(" [-r realm]") \ USE_FEATURE_HTTPD_AUTH_MD5(" [-m pass]") \ " [-h home]" \ @@ -12,7 +12,7 @@ Index: busybox-1.7.2/include/usage.h #define httpd_full_usage \ "Listen for incoming HTTP requests" \ "\n\nOptions:" \ -@@ -1368,6 +1369,8 @@ +@@ -1436,6 +1437,8 @@ "\n -h HOME Home directory (default .)" \ "\n -e STRING HTML encode STRING" \ "\n -d STRING URL decode STRING" \ @@ -20,12 +20,12 @@ Index: busybox-1.7.2/include/usage.h + "\n -H HOST Redirect target host" \ #define hwclock_trivial_usage \ - "[-r|--show] [-s|--hctosys] [-w|--systohc]" \ -Index: busybox-1.7.2/networking/httpd.c + USE_GETOPT_LONG( \ +Index: busybox-1.8.1/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 @@ +--- busybox-1.8.1.orig/networking/httpd.c 2007-11-10 16:54:28.346055711 +0100 ++++ busybox-1.8.1/networking/httpd.c 2007-11-10 16:54:56.639668071 +0100 +@@ -253,6 +253,8 @@ const char *found_mime_type; const char *found_moved_temporarily; @@ -34,16 +34,16 @@ Index: busybox-1.7.2/networking/httpd.c Htaccess_IP *ip_a_d; /* config allow/deny lines */ USE_FEATURE_HTTPD_BASIC_AUTH(const char *g_realm;) -@@ -264,6 +266,8 @@ +@@ -297,6 +299,8 @@ #define home_httpd (G.home_httpd ) #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 ) +@@ -988,8 +992,11 @@ } #endif if (responseNum == HTTP_MOVED_TEMPORARILY) { @@ -56,7 +56,7 @@ Index: busybox-1.7.2/networking/httpd.c (g_query ? "?" : ""), (g_query ? g_query : "")); } -@@ -1730,8 +1737,12 @@ +@@ -1907,8 +1914,12 @@ *++urlp = '\0'; /* so keep last character */ tptr = urlp; /* end ptr */ @@ -70,7 +70,7 @@ Index: busybox-1.7.2/networking/httpd.c if (is_directory(urlcopy + 1, 1, &sb)) { found_moved_temporarily = urlcopy; } -@@ -2004,7 +2015,9 @@ +@@ -2252,7 +2263,9 @@ #endif enum { @@ -81,7 +81,7 @@ Index: busybox-1.7.2/networking/httpd.c d_opt_decode_url, h_opt_home_httpd, USE_FEATURE_HTTPD_ENCODE_URL_STR(e_opt_encode_url,) -@@ -2053,12 +2066,13 @@ +@@ -2301,12 +2314,13 @@ /* We do not "absolutize" path given by -h (home) opt. * If user gives relative path in -h, $SCRIPT_FILENAME can end up * relative too. */ |