From 1c3eac29be346e49b89e33f2ca44d84646bb8780 Mon Sep 17 00:00:00 2001 From: qingying00 <1729719432@qq.com> Date: Tue, 15 Jun 2021 15:08:21 +0800 Subject: [PATCH] update components/utility/thttpd/origin.patch. --- components/utility/thttpd/origin.patch | 72 +++++++++++++------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/components/utility/thttpd/origin.patch b/components/utility/thttpd/origin.patch index c7cc180..b055a7e 100644 --- a/components/utility/thttpd/origin.patch +++ b/components/utility/thttpd/origin.patch @@ -1,7 +1,7 @@ -diff --git a/thttpd-origin-2.27_o/config.h b/thttpd-origin-2.27/config.h +diff --git a/thttpd-2.27/config.h b/thttpd-2.27/config.h index 65ab1e3..758e55c 100644 ---- a/thttpd-origin-2.27_o/config.h -+++ b/thttpd-origin-2.27/config.h +--- a/thttpd-2.27/config.h ++++ b/thttpd-2.27/config.h @@ -28,6 +28,18 @@ #ifndef _CONFIG_H_ #define _CONFIG_H_ @@ -32,10 +32,10 @@ index 65ab1e3..758e55c 100644 /* CONFIGURE: $PATH to use for CGI programs. */ -diff --git a/thttpd-origin-2.27_o/fdwatch.c b/thttpd-origin-2.27/fdwatch.c +diff --git a/thttpd-2.27/fdwatch.c b/thttpd-2.27/fdwatch.c index 2b3de74..fbd5992 100644 ---- a/thttpd-origin-2.27_o/fdwatch.c -+++ b/thttpd-origin-2.27/fdwatch.c +--- a/thttpd-2.27/fdwatch.c ++++ b/thttpd-2.27/fdwatch.c @@ -30,7 +30,10 @@ #include #include @@ -61,11 +61,11 @@ index 2b3de74..fbd5992 100644 +{ + struct pollfd *pollfds; + void **client; -+ uint8_t *ready; -+ uint8_t nfds; -+ uint8_t nwatched; -+ uint8_t nactive; -+ uint8_t next; ++ unsigned char *ready; ++ unsigned char nfds; ++ unsigned char nwatched; ++ unsigned char nactive; ++ unsigned char next; +}; + +static struct liteOS_poll_watch_s *gfw; @@ -218,7 +218,7 @@ index 2b3de74..fbd5992 100644 + goto errout_with_allocations; + } + -+ fw->ready = (uint8_t*)zalloc(sizeof(uint8_t) * nfds); ++ fw->ready = (unsigned char*)zalloc(sizeof(unsigned char) * nfds); + if (!fw->ready) + { + goto errout_with_allocations; @@ -370,10 +370,10 @@ index 2b3de74..fbd5992 100644 + +#endif + -diff --git a/thttpd-origin-2.27_o/libhttpd.c b/thttpd-origin-2.27/libhttpd.c +diff --git a/thttpd-2.27/libhttpd.c b/thttpd-2.27/libhttpd.c index 3814e6a..44dee42 100644 ---- a/thttpd-origin-2.27_o/libhttpd.c -+++ b/thttpd-origin-2.27/libhttpd.c +--- a/thttpd-2.27/libhttpd.c ++++ b/thttpd-2.27/libhttpd.c @@ -81,6 +81,7 @@ #include "timers.h" #include "match.h" @@ -599,10 +599,10 @@ index 3814e6a..44dee42 100644 } -diff --git a/thttpd-origin-2.27_o/libhttpd.h b/thttpd-origin-2.27/libhttpd.h +diff --git a/thttpd-2.27/libhttpd.h b/thttpd-2.27/libhttpd.h index 7805546..729ddd7 100644 ---- a/thttpd-origin-2.27_o/libhttpd.h -+++ b/thttpd-origin-2.27/libhttpd.h +--- a/thttpd-2.27/libhttpd.h ++++ b/thttpd-2.27/libhttpd.h @@ -32,6 +32,7 @@ #include #include @@ -618,10 +618,10 @@ index 7805546..729ddd7 100644 +int ThttpdRun(); + #endif /* _LIBHTTPD_H_ */ -diff --git a/thttpd-origin-2.27_o/match.c b/thttpd-origin-2.27/match.c +diff --git a/thttpd-2.27/match.c b/thttpd-2.27/match.c index 6facccb..1bffe76 100644 ---- a/thttpd-origin-2.27_o/match.c -+++ b/thttpd-origin-2.27/match.c +--- a/thttpd-2.27/match.c ++++ b/thttpd-2.27/match.c @@ -35,7 +35,7 @@ static int match_one( const char* pattern, int patternlen, const char* string ); @@ -631,10 +631,10 @@ index 6facccb..1bffe76 100644 { const char* or; -diff --git a/thttpd-origin-2.27_o/match.h b/thttpd-origin-2.27/match.h +diff --git a/thttpd-2.27/match.h b/thttpd-2.27/match.h index 01c5f2a..2b5917d 100644 ---- a/thttpd-origin-2.27_o/match.h -+++ b/thttpd-origin-2.27/match.h +--- a/thttpd-2.27/match.h ++++ b/thttpd-2.27/match.h @@ -31,6 +31,6 @@ /* Simple shell-style filename pattern matcher. Only does ? * and **, and ** multiple patterns separated by |. Returns 1 or 0. @@ -643,20 +643,20 @@ index 01c5f2a..2b5917d 100644 +int thttpd_match( const char* pattern, const char* string ); #endif /* _MATCH_H_ */ -diff --git a/thttpd-origin-2.27/mime_encodings.h b/thttpd-origin-2.27/mime_encodings.h +diff --git a/thttpd-2.27/mime_encodings.h b/thttpd-2.27/mime_encodings.h new file mode 100644 index 0000000..f12bd7f ---- /dev/null -+++ b/thttpd-origin-2.27/mime_encodings.h +--- a/thttpd-2.27/mime_encodings.h ++++ b/thttpd-2.27/mime_encodings.h @@ -0,0 +1,3 @@ +{ "Z", 0, "compress", 0 }, +{ "gz", 0, "gzip", 0 }, +{ "uu", 0, "x-uuencode", 0 }, -diff --git a/thttpd-origin-2.27/mime_types.h b/thttpd-origin-2.27/mime_types.h +diff --git a/thttpd-2.27/mime_types.h b/thttpd-2.27/mime_types.h new file mode 100644 index 0000000..15a93fa ---- /dev/null -+++ b/thttpd-origin-2.27/mime_types.h +--- a/thttpd-2.27/mime_types.h ++++ b/thttpd-2.27/mime_types.h @@ -0,0 +1,193 @@ +{ "a", 0, "application/octet-stream", 0 }, +{ "aab", 0, "application/x-authorware-bin", 0 }, @@ -851,10 +851,10 @@ index 0000000..15a93fa +{ "xwd", 0, "image/x-xwindowdump", 0 }, +{ "xyz", 0, "chemical/x-xyz", 0 }, +{ "zip", 0, "application/zip", 0 }, -diff --git a/thttpd-origin-2.27_o/strerror.c b/thttpd-origin-2.27/strerror.c +diff --git a/thttpd-2.27/strerror.c b/thttpd-2.27/strerror.c index 6a161e6..6a76c6e 100644 ---- a/thttpd-origin-2.27_o/strerror.c -+++ b/thttpd-origin-2.27/strerror.c +--- a/thttpd-2.27/strerror.c ++++ b/thttpd-2.27/strerror.c @@ -18,7 +18,7 @@ #if defined(LIBC_SCCS) && !defined(lint) static char sccsid[] = "@(#)strerror.c 5.1 (Berkeley) 4/9/89"; @@ -876,10 +876,10 @@ index 6a161e6..6a76c6e 100644 (void)sprintf(ebuf, "Unknown error: %d", errnum); return(ebuf); } -diff --git a/thttpd-origin-2.27_o/thttpd.c b/thttpd-origin-2.27/thttpd.c +diff --git a/thttpd-2.27/thttpd.c b/thttpd-2.27/thttpd.c index 3be7546..83d826d 100644 ---- a/thttpd-origin-2.27_o/thttpd.c -+++ b/thttpd-origin-2.27/thttpd.c +--- a/thttpd-2.27/thttpd.c ++++ b/thttpd-2.27/thttpd.c @@ -33,7 +33,9 @@ #include #include -- Gitee