mirror
/
nginx
mirror of https://github.com/nginx/nginx
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge b857b3415f into c70457482c

This commit is contained in:
Roman Arutyunyan 2025-12-09 12:30:44 -08:00 committed by GitHub
parent c70457482c b857b3415f
commit 41c5c0a61e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 41 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/ngx_times.c
View File

@ -360,7 +360,7 @@ ngx_gmtime(time_t t, ngx_tm_t *tp)
*/ */
/* days since March 1, 1 BC */ /* days since March 1, 1 BC */
days = days - (31 + 28) + 719527; days = days + 719527 - (31 + 28);
/* /*
* The "days" should be adjusted to 1 only, however, some March 1st's go * The "days" should be adjusted to 1 only, however, some March 1st's go

33
src/os/unix/ngx_time.c
View File

@ -46,6 +46,9 @@ ngx_timezone_update(void)
s = time(NULL); s = time(NULL);
t = localtime(&s); t = localtime(&s);
if (t == NULL) {
return;
}
strftime(buf, 4, "%H", t); strftime(buf, 4, "%H", t);
@ -57,12 +60,20 @@ void
ngx_localtime(time_t s, ngx_tm_t *tm) ngx_localtime(time_t s, ngx_tm_t *tm)
{ {
#if (NGX_HAVE_LOCALTIME_R) #if (NGX_HAVE_LOCALTIME_R)
(void) localtime_r(&s, tm); if (localtime_r(&s, tm) == NULL) {
ngx_memzero(tm, sizeof(struct tm));
return;
}
#else #else
ngx_tm_t *t; ngx_tm_t *t;
t = localtime(&s); t = localtime(&s);
if (t == NULL) {
ngx_memzero(tm, sizeof(struct tm));
return;
}
*tm = *t; *tm = *t;
#endif #endif
@ -76,12 +87,20 @@ void
ngx_libc_localtime(time_t s, struct tm *tm) ngx_libc_localtime(time_t s, struct tm *tm)
{ {
#if (NGX_HAVE_LOCALTIME_R) #if (NGX_HAVE_LOCALTIME_R)
(void) localtime_r(&s, tm); if (localtime_r(&s, tm) == NULL) {
ngx_memzero(tm, sizeof(struct tm));
return;
}
#else #else
struct tm *t; struct tm *t;
t = localtime(&s); t = localtime(&s);
if (t == NULL) {
ngx_memzero(tm, sizeof(struct tm));
return;
}
*tm = *t; *tm = *t;
#endif #endif
@ -92,12 +111,20 @@ void
ngx_libc_gmtime(time_t s, struct tm *tm) ngx_libc_gmtime(time_t s, struct tm *tm)
{ {
#if (NGX_HAVE_LOCALTIME_R) #if (NGX_HAVE_LOCALTIME_R)
(void) gmtime_r(&s, tm); if (gmtime_r(&s, tm) == NULL) {
ngx_memzero(tm, sizeof(struct tm));
return;
}
#else #else
struct tm *t; struct tm *t;
t = gmtime(&s); t = gmtime(&s);
if (t == NULL) {
ngx_memzero(tm, sizeof(struct tm));
return;
}
*tm = *t; *tm = *t;
#endif #endif

10
src/os/win32/ngx_time.c
View File

@ -44,6 +44,11 @@ ngx_libc_localtime(time_t s, struct tm *tm)
struct tm *t; struct tm *t;
t = localtime(&s); t = localtime(&s);
if (t == NULL) {
ngx_memzero(tm, sizeof(struct tm));
return;
}
*tm = *t; *tm = *t;
} }
@ -54,6 +59,11 @@ ngx_libc_gmtime(time_t s, struct tm *tm)
struct tm *t; struct tm *t;
t = gmtime(&s); t = gmtime(&s);
if (t == NULL) {
ngx_memzero(tm, sizeof(struct tm));
return;
}
*tm = *t; *tm = *t;
} }