projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
FAQ: Change two more SPI links to https
[privoxy.git]
/
cgi.c
diff --git
a/cgi.c
b/cgi.c
index
7c84b69
..
8a4eea0
100644
(file)
--- a/
cgi.c
+++ b/
cgi.c
@@
-1,4
+1,4
@@
-const char cgi_rcs[] = "$Id: cgi.c,v 1.17
0 2017/01/23 16:12:18
fabiankeil Exp $";
+const char cgi_rcs[] = "$Id: cgi.c,v 1.17
3 2017/03/08 13:16:26
fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/cgi.c,v $
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/cgi.c,v $
@@
-98,7
+98,7
@@
static const struct cgi_dispatcher cgi_dispatchers[] = {
TRUE },
{ "show-version",
cgi_show_version,
TRUE },
{ "show-version",
cgi_show_version,
- "View the source code version numbers",
+ NULL, /* Not considered important enough to include in the menu */
TRUE },
#ifdef FEATURE_CLIENT_TAGS
/*
TRUE },
#ifdef FEATURE_CLIENT_TAGS
/*
@@
-2126,15
+2126,12
@@
jb_err template_fill_for_cgi(const struct client_state *csp,
err = template_load(csp, &rsp->body, templatename, 0);
if (err == JB_ERR_FILE)
{
err = template_load(csp, &rsp->body, templatename, 0);
if (err == JB_ERR_FILE)
{
- free_map(exports);
- return cgi_error_no_template(csp, rsp, templatename);
+ err = cgi_error_no_template(csp, rsp, templatename);
}
}
- else if (err)
+ else if (err
== JB_ERR_OK
)
{
{
- free_map(exports);
- return err; /* JB_ERR_MEMORY */
+ err = template_fill(&rsp->body, exports);
}
}
- err = template_fill(&rsp->body, exports);
free_map(exports);
return err;
}
free_map(exports);
return err;
}