projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upgrade URL to https://
[privoxy.git]
/
cgi.c
diff --git
a/cgi.c
b/cgi.c
index
acae0fe
..
94f6875
100644
(file)
--- a/
cgi.c
+++ b/
cgi.c
@@
-7,7
+7,7
@@
* This only contains the framework functions, the
* actual handler functions are declared elsewhere.
*
* This only contains the framework functions, the
* actual handler functions are declared elsewhere.
*
- * Copyright : Written by and Copyright (C) 2001-20
17
+ * Copyright : Written by and Copyright (C) 2001-20
20
* members of the Privoxy team. https://www.privoxy.org/
*
* Based on the Internet Junkbuster originally written
* members of the Privoxy team. https://www.privoxy.org/
*
* Based on the Internet Junkbuster originally written
@@
-106,7
+106,7
@@
static const struct cgi_dispatcher cgi_dispatchers[] = {
*/
{ "client-tags",
cgi_show_client_tags,
*/
{ "client-tags",
cgi_show_client_tags,
- "View or toggle the tags that can be set based on the clients address",
+ "View or toggle the tags that can be set based on the client
'
s address",
TRUE },
#endif
{ "show-request",
TRUE },
#endif
{ "show-request",
@@
-444,7
+444,9
@@
static int referrer_is_safe(const struct client_state *csp)
{
char *referrer;
static const char alternative_prefix[] = "http://" CGI_SITE_1_HOST "/";
{
char *referrer;
static const char alternative_prefix[] = "http://" CGI_SITE_1_HOST "/";
+#ifdef FEATURE_HTTPS_INSPECTION
static const char alt_prefix_https[] = "https://" CGI_SITE_1_HOST "/";
static const char alt_prefix_https[] = "https://" CGI_SITE_1_HOST "/";
+#endif
const char *trusted_cgi_referrer = csp->config->trusted_cgi_referrer;
referrer = grep_cgi_referrer(csp);
const char *trusted_cgi_referrer = csp->config->trusted_cgi_referrer;
referrer = grep_cgi_referrer(csp);
@@
-535,7
+537,8
@@
static struct http_response *dispatch_known_cgi(struct client_state * csp,
*query_args_start++ = '\0';
param_list = new_map();
err = map(param_list, "file", 1, url_decode(query_args_start), 0);
*query_args_start++ = '\0';
param_list = new_map();
err = map(param_list, "file", 1, url_decode(query_args_start), 0);
- if (JB_ERR_OK != err) {
+ if (JB_ERR_OK != err)
+ {
free(param_list);
free(path_copy);
return cgi_error_memory();
free(param_list);
free(path_copy);
return cgi_error_memory();
@@
-1274,7
+1277,7
@@
jb_err cgi_error_unknown(const struct client_state *csp,
static const char body_suffix[] =
"</b></p>\n"
"<p>Please "
static const char body_suffix[] =
"</b></p>\n"
"<p>Please "
- "<a href=\"http
://sourceforge.net/tracker/?group_id=11118&atid=111118
\">"
+ "<a href=\"http
s://sourceforge.net/p/ijbswa/bugs/
\">"
"file a bug report</a>.</p>\n"
"</body>\n"
"</html>\n";
"file a bug report</a>.</p>\n"
"</body>\n"
"</html>\n";
@@
-1513,13
+1516,15
@@
static void get_locale_time(char *buf, size_t buffer_size)
#elif defined(MUTEX_LOCKS_AVAILABLE)
privoxy_mutex_lock(&localtime_mutex);
timeptr = localtime(¤t_time);
#elif defined(MUTEX_LOCKS_AVAILABLE)
privoxy_mutex_lock(&localtime_mutex);
timeptr = localtime(¤t_time);
- privoxy_mutex_unlock(&localtime_mutex);
#else
timeptr = localtime(¤t_time);
#endif
strftime(buf, buffer_size, "%a %b %d %X %Z %Y", timeptr);
#else
timeptr = localtime(¤t_time);
#endif
strftime(buf, buffer_size, "%a %b %d %X %Z %Y", timeptr);
+#if !defined(HAVE_LOCALTIME_R) && defined(MUTEX_LOCKS_AVAILABLE)
+ privoxy_mutex_unlock(&localtime_mutex);
+#endif
}
}
@@
-1556,14
+1561,14
@@
char *compress_buffer(char *buffer, size_t *buffer_length, int compression_level
(Bytef *)buffer, *buffer_length, compression_level))
{
log_error(LOG_LEVEL_ERROR,
(Bytef *)buffer, *buffer_length, compression_level))
{
log_error(LOG_LEVEL_ERROR,
- "compress2() failed. Buffer size: %
d
, compression level: %d.",
+ "compress2() failed. Buffer size: %
lu
, compression level: %d.",
new_length, compression_level);
freez(compressed_buffer);
return NULL;
}
log_error(LOG_LEVEL_RE_FILTER,
new_length, compression_level);
freez(compressed_buffer);
return NULL;
}
log_error(LOG_LEVEL_RE_FILTER,
- "Compressed content from %
d to %d
bytes. Compression level: %d",
+ "Compressed content from %
lu to %lu
bytes. Compression level: %d",
*buffer_length, new_length, compression_level);
*buffer_length = (size_t)new_length;
*buffer_length, new_length, compression_level);
*buffer_length = (size_t)new_length;