-const char cgi_rcs[] = "$Id: cgi.c,v 1.41 2002/01/17 20:56:22 jongfoster Exp $";
+const char cgi_rcs[] = "$Id: cgi.c,v 1.42 2002/01/21 00:33:20 jongfoster Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/cgi.c,v $
*
* Revisions :
* $Log: cgi.c,v $
+ * Revision 1.42 2002/01/21 00:33:20 jongfoster
+ * Replacing strsav() with the safer string_append() or string_join().
+ * Adding map_block_keep() to save a few bytes in the edit-actions-list HTML.
+ * Adding missing html_encode() to error message generators.
+ * Adding edit-actions-section-swap and many "shortcuts" to the list of CGIs.
+ *
* Revision 1.41 2002/01/17 20:56:22 jongfoster
* Replacing hard references to the URL of the config interface
* with #defines from project.h
if (!err) err = map(exports, "hostport", 1, html_encode(csp->http->hostport), 0);
if (!err) err = map(exports, "path", 1, html_encode(csp->http->path), 0);
if (!err) err = map(exports, "error", 1, html_encode_and_free_original(safe_strerror(sys_err)), 0);
- if (!err) err = map(exports, "host-ip", 1, html_encode(csp->http->host_ip_addr_str), 0);
+ if (!err)
+ {
+ err = map(exports, "host-ip", 1, html_encode(csp->http->host_ip_addr_str), 0);
+ if (err)
+ {
+ // Some failures, like "404 no such domain", don't have an IP address.
+ err = map(exports, "host-ip", 1, html_encode(csp->http->host), 0);
+ }
+ }
+
if (err)
{
"<head><title>500 Internal JunkBuster Proxy Error</title></head>\r\n"
"<body>\r\n"
"<h1>500 Internal JunkBuster Proxy Error</h1>\r\n"
- "<p>JunkBuster <b>ran out of memory</b> whilst processing your request.</p>\r\n"
+ "<p>JunkBuster <b>ran out of memory</b> while processing your request.</p>\r\n"
"<p>Please contact your proxy administrator, or try again later</p>\r\n"
"</body>\r\n"
"</html>\r\n";
"<head><title>500 Internal JunkBuster Proxy Error</title></head>\r\n"
"<body>\r\n"
"<h1>500 Internal JunkBuster Proxy Error</h1>\r\n"
- "<p>JunkBuster encountered an error whilst processing your request:</p>\r\n"
+ "<p>JunkBuster encountered an error while processing your request:</p>\r\n"
"<p><b>Could not load template file <code>";
static const char body_suffix[] =
"</code></b></p>\r\n"
-const char jcc_rcs[] = "$Id: jcc.c,v 1.70 2002/03/05 04:52:42 oes Exp $";
+const char jcc_rcs[] = "$Id: jcc.c,v 1.71 2002/03/05 18:13:56 oes Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/jcc.c,v $
*
* Revisions :
* $Log: jcc.c,v $
+ * Revision 1.71 2002/03/05 18:13:56 oes
+ * Added --user option
+ *
* Revision 1.70 2002/03/05 04:52:42 oes
* Deleted non-errlog debugging code
*
{
no_daemon = 1;
}
-
+#if !defined(__OS2__)
else if (strcmp(argv[argc_pos], "--pidfile" ) == 0)
{
if (++argc_pos == argc) usage(argv[0]);
{
if (++argc_pos == argc) usage(argv[0]);
pw = getpwnam(argv[argc_pos]);
-
+ s
if (pw == NULL)
{
log_error(LOG_LEVEL_FATAL, "User %s not found.", argv[argc_pos]);
}
}
+#endif /* !defined(__OS2__) */
else
#endif /* defined(_WIN32) && !defined(_WIN_CONSOLE) */
{