[package] busybox: add 6RD prefix sanity checking as mandated by RFC5969, bump pkg...

[openwrt/svn-archive/archive.git] / package / busybox / patches / 440-httpd_chdir.patch

diff --git a/package/busybox/patches/440-httpd_chdir.patch b/package/busybox/patches/440-httpd_chdir.patch
index fcd2689bf6091826050853834ce880a8835690d0..2f44111dcbdd5b210db4e0f716b15a86326e614e 100644 (file)
--- a/package/busybox/patches/440-httpd_chdir.patch
+++ b/package/busybox/patches/440-httpd_chdir.patch
@@ -1,28 +1,10 @@
-diff -ur busybox.old/networking/httpd.c busybox.dev/networking/httpd.c
---- busybox.old/networking/httpd.c     2007-02-27 23:15:20.611300000 +0100
-+++ busybox.dev/networking/httpd.c     2007-02-27 23:18:10.022546112 +0100
-@@ -102,6 +102,7 @@
- static const char default_path_httpd_conf[] = "/etc";
- static const char httpd_conf[] = "httpd.conf";
- static const char home[] = "./";
-+static const char *home_httpd = home;
- 
- #define TIMEOUT 60
- 
-@@ -1500,6 +1501,8 @@
- #if ENABLE_FEATURE_HTTPD_BASIC_AUTH
-       int credentials = -1;  /* if not required this is Ok */
+--- a/networking/httpd.c
++++ b/networking/httpd.c
+@@ -1828,6 +1828,7 @@ static void handle_incoming_and_exit(con
+       char *header_ptr = header_ptr;
+       Htaccess_Proxy *proxy_entry;
  #endif
-+      
 +      xchdir(home_httpd);
  
-       sa.sa_handler = handle_sigalrm;
-       sigemptyset(&sa.sa_mask);
-@@ -1931,7 +1934,6 @@
- int httpd_main(int argc, char *argv[])
- {
-       unsigned opt;
--      const char *home_httpd = home;
-       char *url_for_decode;
-       USE_FEATURE_HTTPD_ENCODE_URL_STR(const char *url_for_encode;)
-       const char *s_port;
+       /* Allocation of iobuf is postponed until now
+        * (IOW, server process doesn't need to waste 8k) */