-const char cgi_rcs[] = "$Id: cgi.c,v 1.8 2001/06/29 13:21:46 oes Exp $";
+const char cgi_rcs[] = "$Id: cgi.c,v 1.12 2001/07/29 18:47:05 jongfoster Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/cgi.c,v $
*
* Revisions :
* $Log: cgi.c,v $
+ * Revision 1.12 2001/07/29 18:47:05 jongfoster
+ * Adding missing #include "loadcfg.h"
+ *
+ * Revision 1.11 2001/07/18 17:24:37 oes
+ * Changed to conform to new pcrs interface
+ *
+ * Revision 1.10 2001/07/13 13:53:13 oes
+ * Removed all #ifdef PCRS and related code
+ *
+ * Revision 1.9 2001/06/29 21:45:41 oes
+ * Indentation, CRLF->LF, Tab-> Space
+ *
* Revision 1.8 2001/06/29 13:21:46 oes
* - Cosmetics: renamed and reordered functions, variables,
* texts, improved comments etc
#include "project.h"
#include "cgi.h"
#include "list.h"
-#include "pcrs.h"
#include "encode.h"
#include "ssplit.h"
#include "jcc.h"
#include "errlog.h"
#include "miscutil.h"
#include "showargs.h"
+#include "loadcfg.h"
const char cgi_h_rcs[] = CGI_H_VERSION;
int i;
struct map *exports = default_exports(csp, "show-status");
-#ifdef SPLIT_PROXY_ARGS
FILE * fp;
char buf[BUFFER_SIZE];
char * p;
}
break;
-#ifdef PCRS
case 'r':
if (csp->rlist)
{
file_description = "Regex Filter List";
}
break;
-#endif /* def PCRS */
-#ifdef TRUST_FILES
+#ifdef FEATURE_TRUST
case 't':
if (csp->tlist)
{
file_description = "Trust List";
}
break;
-#endif /* def TRUST_FILES */
+#endif /* def FEATURE_TRUST */
}
if (NULL != filename)
}
-#endif /* def SPLIT_PROXY_ARGS */
-
exports = map(exports, "redirect-url", 1, REDIRECT_URL, 1);
s = NULL;
s = show_defines();
exports = map(exports, "defines", 1, s, 0);
-#ifdef STATISTICS
+#ifdef FEATURE_STATISTICS
exports = add_stats(exports);
-#else
+#else /* ndef FEATURE_STATISTICS */
exports = map_block_killer(exports, "statistics");
-#endif /* ndef STATISTICS */
-
-#ifdef SPLIT_PROXY_ARGS
+#endif /* ndef FEATURE_STATISTICS */
exports = map_block_killer(exports, "no-split-args");
exports = map(exports, "actions-filename", 1, "None specified", 1);
}
-#ifdef PCRS
if (csp->rlist)
{
exports = map(exports, "re-filter-filename", 1, csp->rlist->filename, 1);
{
exports = map(exports, "re-filter-filename", 1, "None specified", 1);
}
-#else
- exports = map_block_killer(exports, "pcrs-support");
-#endif /* ndef PCRS */
-#ifdef TRUST_FILES
+#ifdef FEATURE_TRUST
if (csp->tlist)
{
exports = map(exports, "trust-filename", 1, csp->tlist->filename, 1);
}
#else
exports = map_block_killer(exports, "trust-support");
-#endif /* ndef TRUST_FILES */
-
-#else /* ifndef SPLIT_PROXY_ARGS */
- exports = map_block_killer(exports, "split-args");
-
- if (csp->clist)
- {
- map(exports, "clist", 1, csp->clist->proxy_args , 1);
- }
-
-#ifdef PCRS
- if (csp->rlist)
- {
- map(exports, "rlist", 1, csp->rlist->proxy_args , 1);
- }
-#endif /* def PCRS */
-
-#ifdef TRUST_FILES
- if (csp->tlist)
- {
- map(exports, "tlist", 1, csp->tlist->proxy_args , 1);
- }
-#endif /* def TRUST_FILES */
-
-#endif /* ndef SPLIT_PROXY_ARGS */
+#endif /* ndef FEATURE_TRUST */
rsp->body = fill_template(csp, "show-status", exports);
free_map(exports);
/* Enclose name in @@ */
snprintf(buf, BUFFER_SIZE, "@%s@", m->name);
- /* Make and chain in job */
- if ( NULL == (job = (pcrs_make_job(buf, m->value, "sigTU", &error))) )
+ /* Make and chain job */
+ if ( NULL == (job = (pcrs_compile(buf, m->value, "sigTU", &error))) )
{
log_error(LOG_LEVEL_ERROR, "Error compiling template fill job %s: %d", m->name, error);
}
}
-#ifdef STATISTICS
+#ifdef FEATURE_STATISTICS
/*********************************************************************
*
* Function : add_stats
return(exports);
}
-#endif /* def STATISTICS */
+#endif /* def FEATURE_STATISTICS */
/*
Local Variables: