X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=loadcfg.c;h=311a43145b4ec40e1c381410de2a6bc757da8075;hp=44446e42d35676c815db5719d7c2d58f15dd406b;hb=f4107f65b676b63a199fe4230e58695757f9f199;hpb=1a096731122473db56caec3c5170be99fcf8aa06
diff --git a/loadcfg.c b/loadcfg.c
index 44446e42..311a4314 100644
--- a/loadcfg.c
+++ b/loadcfg.c
@@ -1,4 +1,4 @@
-const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.71 2007/12/23 15:24:56 fabiankeil Exp $";
+const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.73 2008/02/16 16:54:51 fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/loadcfg.c,v $
@@ -8,7 +8,7 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.71 2007/12/23 15:24:56 fabiankeil
* routine to load the configuration and the global
* variables it writes to.
*
- * Copyright : Written by and Copyright (C) 2001-2007 the SourceForge
+ * Copyright : Written by and Copyright (C) 2001-2008 the SourceForge
* Privoxy team. http://www.privoxy.org/
*
* Based on the Internet Junkbuster originally written
@@ -35,6 +35,12 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.71 2007/12/23 15:24:56 fabiankeil
*
* Revisions :
* $Log: loadcfg.c,v $
+ * Revision 1.73 2008/02/16 16:54:51 fabiankeil
+ * Fix typo.
+ *
+ * Revision 1.72 2008/02/03 13:46:15 fabiankeil
+ * Add SOCKS5 support. Patch #1862863 by Eric M. Hopper with minor changes.
+ *
* Revision 1.71 2007/12/23 15:24:56 fabiankeil
* Reword "unrecognized directive" warning, use better
* mark up and add a
. Fixes parts of #1856559.
@@ -537,6 +543,7 @@ static struct file_list *current_configfile = NULL;
#define hash_forward_socks4a 2639958518ul /* "forward-socks4a" */
#define hash_forward_socks5 3963965522ul /* "forward-socks5" */
#define hash_forwarded_connect_retries 101465292ul /* "forwarded-connect-retries" */
+#define hash_hostname 10308071ul /* "hostname" */
#define hash_jarfile 2046641ul /* "jarfile" */
#define hash_listen_address 1255650842ul /* "listen-address" */
#define hash_logdir 422889ul /* "logdir" */
@@ -618,6 +625,7 @@ static void unload_configfile (void * data)
freez(config->confdir);
freez(config->logdir);
freez(config->templdir);
+ freez(config->hostname);
freez(config->haddr);
freez(config->logfile);
@@ -1294,6 +1302,18 @@ struct configuration_spec * load_config(void)
config->forwarded_connect_retries = atoi(arg);
continue;
+/* *************************************************************************
+ * hostname hostname-to-show-on-cgi-pages
+ * *************************************************************************/
+ case hash_hostname :
+ freez(config->hostname);
+ config->hostname = strdup(arg);
+ if (NULL == config->hostname)
+ {
+ log_error(LOG_LEVEL_FATAL, "Out of memory saving hostname.");
+ }
+ continue;
+
/* *************************************************************************
* jarfile jar-file-name
* In logdir by default
@@ -1823,7 +1843,7 @@ static void savearg(char *command, char *argument, struct configuration_spec * c
/*
* Add config option name embedded in
- * link to it's section in the user-manual
+ * link to its section in the user-manual
*/
buf = strdup("\nusermanual, "file://", 7) ||