aboutsummaryrefslogtreecommitdiff
path: root/networking/httpd.c
diff options
context:
space:
mode:
authorGravatar Denys Vlasenko <vda.linux@googlemail.com>2018-03-06 18:11:47 +0100
committerGravatar Denys Vlasenko <vda.linux@googlemail.com>2018-03-06 18:11:47 +0100
commite1b1b7926975c3cd4313be0019212b1cf68fa529 (patch)
tree31f9227004013462e899d383c1e7a0910f7157aa /networking/httpd.c
parent33f7c8f200b6c3f7163dc89723ab67462688dccd (diff)
downloadbusybox-e1b1b7926975c3cd4313be0019212b1cf68fa529.tar.gz
busybox-e1b1b7926975c3cd4313be0019212b1cf68fa529.tar.bz2
use gmtime_r() instead of gmtime()
This avoids pulling in gmtime's static buffer: function old new delta svlogd_main 1401 1412 +11 send_headers 668 678 +10 gmtime 21 - -21 ------------------------------------------------------------------------------ (add/remove: 0/2 grow/shrink: 2/0 up/down: 21/-21) Total: 0 bytes text data bss dec hex filename 920221 555 5804 926580 e2374 busybox_old 920221 555 5740 926516 e2334 busybox_unstripped ^^^^ Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'networking/httpd.c')
-rw-r--r--networking/httpd.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/networking/httpd.c b/networking/httpd.c
index 74196a4f1..9439e206c 100644
--- a/networking/httpd.c
+++ b/networking/httpd.c
@@ -1046,6 +1046,7 @@ static void send_headers(int responseNum)
/* Fixed size 29-byte string. Example: Sun, 06 Nov 1994 08:49:37 GMT */
char date_str[40]; /* using a bit larger buffer to paranoia reasons */
+ struct tm tm;
const char *responseString = "";
const char *infoString = NULL;
#if ENABLE_FEATURE_HTTPD_ERROR_PAGES
@@ -1074,7 +1075,8 @@ static void send_headers(int responseNum)
* always fit into those kbytes.
*/
- strftime(date_str, sizeof(date_str), RFC1123FMT, gmtime(&timer));
+ strftime(date_str, sizeof(date_str), RFC1123FMT, gmtime_r(&timer, &tm));
+ /* ^^^ using gmtime_r() instead of gmtime() to not use static data */
len = sprintf(iobuf,
"HTTP/1.0 %d %s\r\n"
"Content-type: %s\r\n"
@@ -1128,7 +1130,7 @@ static void send_headers(int responseNum)
#endif
if (file_size != -1) { /* file */
- strftime(date_str, sizeof(date_str), RFC1123FMT, gmtime(&last_mod));
+ strftime(date_str, sizeof(date_str), RFC1123FMT, gmtime_r(&last_mod, &tm));
#if ENABLE_FEATURE_HTTPD_RANGES
if (responseNum == HTTP_PARTIAL_CONTENT) {
len += sprintf(iobuf + len,