diff options
author | Peter Korsgaard <jacmet@sunsite.dk> | 2009-09-12 20:17:34 +0200 |
---|---|---|
committer | Peter Korsgaard <jacmet@sunsite.dk> | 2009-09-12 20:17:34 +0200 |
commit | f76d8a3fd445bf82c648924392f760603cad5f1d (patch) | |
tree | fdbb923f2be6501963df103567a24819d4477964 /package/busybox/busybox-1.15.0-httpd.patch | |
parent | f1a0066b3dbda8a19b20b1d1e5bb52d7d011a89f (diff) |
busybox: bump 1.15.x version
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/busybox/busybox-1.15.0-httpd.patch')
-rw-r--r-- | package/busybox/busybox-1.15.0-httpd.patch | 61 |
1 files changed, 0 insertions, 61 deletions
diff --git a/package/busybox/busybox-1.15.0-httpd.patch b/package/busybox/busybox-1.15.0-httpd.patch deleted file mode 100644 index 3d6ebadce..000000000 --- a/package/busybox/busybox-1.15.0-httpd.patch +++ /dev/null @@ -1,61 +0,0 @@ -diff -urpN busybox-1.15.0/networking/httpd.c busybox-1.15.0-httpd/networking/httpd.c ---- busybox-1.15.0/networking/httpd.c 2009-08-21 00:26:14.000000000 +0200 -+++ busybox-1.15.0-httpd/networking/httpd.c 2009-09-08 22:33:09.000000000 +0200 -@@ -2101,8 +2101,12 @@ static void handle_incoming_and_exit(con - } - send_cgi_and_exit(urlcopy, prequest, length, cookie, content_type); - } -+#endif -+ -+ if (urlp[-1] == '/') -+ strcpy(urlp, index_page); -+ if (stat(tptr, &sb) == 0) { - #if ENABLE_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR -- { - char *suffix = strrchr(tptr, '.'); - if (suffix) { - Htaccess *cur; -@@ -2112,16 +2116,7 @@ static void handle_incoming_and_exit(con - } - } - } -- } - #endif -- if (prequest != request_GET && prequest != request_HEAD) { -- send_headers_and_exit(HTTP_NOT_IMPLEMENTED); -- } --#endif /* FEATURE_HTTPD_CGI */ -- -- if (urlp[-1] == '/') -- strcpy(urlp, index_page); -- if (stat(tptr, &sb) == 0) { - file_size = sb.st_size; - last_mod = sb.st_mtime; - } -@@ -2135,19 +2130,18 @@ static void handle_incoming_and_exit(con - send_cgi_and_exit("/cgi-bin/index.cgi", prequest, length, cookie, content_type); - } - } --#endif -- /* else { -- * fall through to send_file, it errors out if open fails -- * } -- */ -+ /* else fall through to send_file, it errors out if open fails: */ - -+ if (prequest != request_GET && prequest != request_HEAD) { -+ /* POST for files does not make sense */ -+ send_headers_and_exit(HTTP_NOT_IMPLEMENTED); -+ } - send_file_and_exit(tptr, --#if ENABLE_FEATURE_HTTPD_CGI - (prequest != request_HEAD ? SEND_HEADERS_AND_BODY : SEND_HEADERS) -+ ); - #else -- SEND_HEADERS_AND_BODY -+ send_file_and_exit(tptr, SEND_HEADERS_AND_BODY); - #endif -- ); - } - - /* |