projects
/
privoxy.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
fe33cd8
)
server_last_modified(): Use privoxy_gmtime_r()
author
Fabian Keil
<fk@fabiankeil.de>
Sun, 7 Jun 2020 15:51:31 +0000
(17:51 +0200)
committer
Fabian Keil
<fk@fabiankeil.de>
Mon, 8 Jun 2020 13:34:36 +0000
(15:34 +0200)
parsers.c
patch
|
blob
|
history
diff --git
a/parsers.c
b/parsers.c
index
40c58f3
..
1e71b61
100644
(file)
--- a/
parsers.c
+++ b/
parsers.c
@@
-2748,9
+2748,8
@@
static jb_err server_last_modified(struct client_state *csp, char **header)
time_t now;
struct tm *timeptr = NULL;
long int rtime;
time_t now;
struct tm *timeptr = NULL;
long int rtime;
-#ifdef HAVE_GMTIME_R
struct tm gmt;
struct tm gmt;
-#endif
+
now = time(NULL);
rtime = (long int)difftime(now, last_modified);
if (rtime)
now = time(NULL);
rtime = (long int)difftime(now, last_modified);
if (rtime)
@@
-2769,29
+2768,16
@@
static jb_err server_last_modified(struct client_state *csp, char **header)
rtime *= -1;
}
last_modified += rtime;
rtime *= -1;
}
last_modified += rtime;
-#ifdef HAVE_GMTIME_R
- timeptr = gmtime_r(&last_modified, &gmt);
-#elif defined(MUTEX_LOCKS_AVAILABLE)
- privoxy_mutex_lock(&gmtime_mutex);
- timeptr = gmtime(&last_modified);
-#else
- timeptr = gmtime(&last_modified);
-#endif
+ timeptr = privoxy_gmtime_r(&last_modified, &gmt);
if ((NULL == timeptr) || !strftime(newheader,
sizeof(newheader), "%a, %d %b %Y %H:%M:%S GMT", timeptr))
{
if ((NULL == timeptr) || !strftime(newheader,
sizeof(newheader), "%a, %d %b %Y %H:%M:%S GMT", timeptr))
{
-#if !defined(HAVE_GMTIME_R) && defined(MUTEX_LOCKS_AVAILABLE)
- privoxy_mutex_unlock(&gmtime_mutex);
-#endif
log_error(LOG_LEVEL_ERROR,
"Randomizing '%s' failed. Crunching the header without replacement.",
*header);
freez(*header);
return JB_ERR_OK;
}
log_error(LOG_LEVEL_ERROR,
"Randomizing '%s' failed. Crunching the header without replacement.",
*header);
freez(*header);
return JB_ERR_OK;
}
-#if !defined(HAVE_GMTIME_R) && defined(MUTEX_LOCKS_AVAILABLE)
- privoxy_mutex_unlock(&gmtime_mutex);
-#endif
freez(*header);
*header = strdup("Last-Modified: ");
string_append(header, newheader);
freez(*header);
*header = strdup("Last-Modified: ");
string_append(header, newheader);