From 2dabe2009d03f68046d7a9fe90318ecb25582b95 Mon Sep 17 00:00:00 2001
From: reger <reger18@arcor.de>
Date: Fri, 18 Apr 2014 19:57:35 +0200
Subject: [PATCH] - remove unused manual http KeepAlive config     (reducing
 references to obsolete httpdemon) - add port info to settings_http

---
 defaults/yacy.init                         | 3 ---
 htroot/SettingsAck_p.html                  | 4 ----
 htroot/SettingsAck_p.java                  | 6 ------
 htroot/Settings_Http.inc                   | 9 ++++-----
 htroot/Settings_p.java                     | 1 -
 source/net/yacy/server/http/HTTPDemon.java | 2 --
 6 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/defaults/yacy.init b/defaults/yacy.init
index 88c80f957..b45d6ac0e 100644
--- a/defaults/yacy.init
+++ b/defaults/yacy.init
@@ -719,9 +719,6 @@ wordCacheMaxCount = 50000
 # by the firewall to yacy running on port 8090 (192.168.0.1:8090)
 isTransparentProxy=false
 
-# Specifies if yacy should use the http connection keep-alive feature
-connectionKeepAliveSupport=true
-
 # Specifies the timeout the proxy sould use
 proxy.clientTimeout = 60000
 
diff --git a/htroot/SettingsAck_p.html b/htroot/SettingsAck_p.html
index 73ca05cb5..decaf3fea 100644
--- a/htroot/SettingsAck_p.html
+++ b/htroot/SettingsAck_p.html
@@ -103,10 +103,6 @@
           <td>Transparent Proxy Support is:</td>
           <td class="settingsValue">#[isTransparentProxy]#</td>
       </tr>
-      <tr>
-          <td>Connection Keep-Alive Support is:</td>
-          <td class="settingsValue">#[connectionKeepAliveSupport]#</td>
-      </tr>
       <tr>
           <td>Send via header is:</td>
           <td class="settingsValue">#[proxy.sendViaHeader]#</td>
diff --git a/htroot/SettingsAck_p.java b/htroot/SettingsAck_p.java
index 749e8c749..7f810c5a2 100644
--- a/htroot/SettingsAck_p.java
+++ b/htroot/SettingsAck_p.java
@@ -49,7 +49,6 @@ import net.yacy.search.SwitchboardConstants;
 import net.yacy.server.serverCore;
 import net.yacy.server.serverObjects;
 import net.yacy.server.serverSwitch;
-import net.yacy.server.http.HTTPDemon;
 
 public class SettingsAck_p {
 
@@ -180,11 +179,6 @@ public class SettingsAck_p {
             env.setConfig("isTransparentProxy", isTransparentProxy);
             prop.put("info_isTransparentProxy", isTransparentProxy ? "on" : "off");
 
-            // setting the keep alive property
-            HTTPDemon.keepAliveSupport = post.containsKey("connectionKeepAliveSupport");
-            env.setConfig("connectionKeepAliveSupport", HTTPDemon.keepAliveSupport);
-            prop.put("info_connectionKeepAliveSupport", HTTPDemon.keepAliveSupport ? "on" : "off");
-
             // setting via header property
             env.setConfig("proxy.sendViaHeader", post.containsKey("proxy.sendViaHeader"));
             prop.put("info_proxy.sendViaHeader", post.containsKey("proxy.sendViaHeader")? "on" : "off");
diff --git a/htroot/Settings_Http.inc b/htroot/Settings_Http.inc
index 59a5eb409..909e367b9 100644
--- a/htroot/Settings_Http.inc
+++ b/htroot/Settings_Http.inc
@@ -10,11 +10,6 @@
       <small><code>iptables -t nat -A PREROUTING -p tcp -s 192.168.0.0/16 --dport 80 -j DNAT --to 192.168.0.1:#[port]#</code></small>
     </td>
   </tr>  
-  <tr valign="top">
-    <td><label for="conn_keep_alive">Connection Keep-Alive</label>:</td>
-    <td><input type="checkbox" name="connectionKeepAliveSupport" id="conn_keep_alive" #(connectionKeepAliveSupport)#::checked="checked" #(/connectionKeepAliveSupport)#/></td>
-    <td>With this you can specify if YaCy should support the HTTP connection keep-alive feature.</td>
-  </tr>  
   <tr valign="top">
     <td><label for="via_header">Send "Via" Header</label>:</td>
     <td><input type="checkbox" name="proxy.sendViaHeader" id="via_header" #(proxy.sendViaHeader)#::checked="checked" #(/proxy.sendViaHeader)#/></td>
@@ -41,6 +36,10 @@
     <td>HTTP Server Version:</td>
     <td><b>#[httpservername]#</b></td>
   </tr>
+  <tr>
+    <td>HTTP Server Port:</td>
+    <td><b>#[port]#</b></td>
+  </tr>
 </table>
 </fieldset>
 </form><br />
\ No newline at end of file
diff --git a/htroot/Settings_p.java b/htroot/Settings_p.java
index 87a8b8490..79341fef7 100644
--- a/htroot/Settings_p.java
+++ b/htroot/Settings_p.java
@@ -86,7 +86,6 @@ public final class Settings_p {
         
         // http networking settings
         prop.put("isTransparentProxy", env.getConfigBool("isTransparentProxy", false) ? "1" : "0");
-        prop.put("connectionKeepAliveSupport", env.getConfigBool("connectionKeepAliveSupport", false) ? "1" : "0");
         prop.put("proxy.sendViaHeader", env.getConfigBool("proxy.sendViaHeader", false) ? "1" : "0");
         prop.put("proxy.sendXForwardedForHeader", env.getConfigBool("proxy.sendXForwardedForHeader", true) ? "1" : "0");
         
diff --git a/source/net/yacy/server/http/HTTPDemon.java b/source/net/yacy/server/http/HTTPDemon.java
index 46799a13f..365402ea3 100644
--- a/source/net/yacy/server/http/HTTPDemon.java
+++ b/source/net/yacy/server/http/HTTPDemon.java
@@ -67,8 +67,6 @@ public final class HTTPDemon {
     // static objects
     private static volatile Switchboard switchboard = Switchboard.getSwitchboard();
 
-    public static boolean keepAliveSupport = false;
-
     static final void sendRespondError(
             final HashMap<String, Object> conProp,
             final OutputStream respond,