From: Adam Dickmeiss <adam@indexdata.dk>
Date: Thu, 10 Sep 2009 10:34:17 +0000 (+0200)
Subject: Remove proxy override.
X-Git-Tag: v1.2.1~39^2~15
X-Git-Url: http://lists.indexdata.dk/?a=commitdiff_plain;h=354598df6b8d6fac5947d3d79e0532665fbe8a19;p=pazpar2-moved-to-github.git

Remove proxy override.

The proxy override global and now local variable has not been configurable
ever. So this code can be safely removed.
---

diff --git a/src/pazpar2.c b/src/pazpar2.c
index 60ec1db..e7d583a 100644
--- a/src/pazpar2.c
+++ b/src/pazpar2.c
@@ -91,7 +91,6 @@ static int sc_main(
     const char *uid = 0;
     int session_timeout = 60;
     const char *listener_override = 0;
-    const char *proxy_override = 0;
     const char *config_fname = 0;
     struct conf_config *config = 0;
     int test_mode = 0;
@@ -194,7 +193,7 @@ static int sc_main(
                     "mode");
             return 1;
         }
-        ret = config_start_listeners(config, listener_override, proxy_override);
+        ret = config_start_listeners(config, listener_override);
         if (ret)
             return ret; /* error starting http listener */
         
diff --git a/src/pazpar2_config.c b/src/pazpar2_config.c
index 7340512..c937927 100644
--- a/src/pazpar2_config.c
+++ b/src/pazpar2_config.c
@@ -958,8 +958,7 @@ void config_stop_listeners(struct conf_config *conf)
 }
 
 int config_start_listeners(struct conf_config *conf,
-                           const char *listener_override,
-                           const char *proxy_override)
+                           const char *listener_override)
 {
     struct conf_server *ser;
     for (ser = conf->servers; ser; ser = ser->next)
@@ -988,9 +987,7 @@ int config_start_listeners(struct conf_config *conf,
             return -1;
 
         w = wrbuf_alloc();
-        if (proxy_override)
-            wrbuf_puts(w, proxy_override);
-        else if (ser->proxy_host || ser->proxy_port)
+        if (ser->proxy_host || ser->proxy_port)
         {
             if (ser->proxy_host)
                 wrbuf_puts(w, ser->proxy_host);
diff --git a/src/pazpar2_config.h b/src/pazpar2_config.h
index 3faa145..7400c9f 100644
--- a/src/pazpar2_config.h
+++ b/src/pazpar2_config.h
@@ -181,8 +181,7 @@ struct conf_service *locate_service(struct conf_server *server,
 
 
 int config_start_listeners(struct conf_config *conf,
-                           const char *listener_override,
-                           const char *proxy_override);
+                           const char *listener_override);
 
 void config_stop_listeners(struct conf_config *conf);