From 48205c183e3b72ec9b3081867e4ad18e95562377 Mon Sep 17 00:00:00 2001 From: hns Date: Mon, 25 Feb 2002 16:13:37 +0000 Subject: [PATCH] Backpedal on previous change to include Servername ("Helma") again instead of printing only the version number. --- src/Acme/Serve/Serve.java | 4 ++-- src/Acme/Serve/ServeUtils.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Acme/Serve/Serve.java b/src/Acme/Serve/Serve.java index ec00980e..c72ccbc3 100644 --- a/src/Acme/Serve/Serve.java +++ b/src/Acme/Serve/Serve.java @@ -457,7 +457,7 @@ public class Serve implements ServletContext, Runnable // Same as the CGI variable SERVER_SOFTWARE. public String getServerInfo() { - return helma.main.Server.version + " (" + ServeUtils.serverUrl + ")"; + return ServeUtils.serverName + " " + helma.main.Server.version + " (" + ServeUtils.serverUrl + ")"; } /// Returns the value of the named attribute of the network service, or @@ -684,7 +684,7 @@ class ServeConnection implements Runnable, HttpServletRequest, HttpServletRespon setStatus( SC_OK ); setDateHeader( "Date", System.currentTimeMillis() ); setHeader( - "Server", helma.main.Server.version ); + "Server", ServeUtils.serverName + "/" + helma.main.Server.version ); setHeader( "Connection", "close" ); try { diff --git a/src/Acme/Serve/ServeUtils.java b/src/Acme/Serve/ServeUtils.java index e7c11b36..d1c73264 100644 --- a/src/Acme/Serve/ServeUtils.java +++ b/src/Acme/Serve/ServeUtils.java @@ -42,9 +42,9 @@ public class ServeUtils { // Server identification. - // public static final String serverName = "Helma"; - // public static final String serverVersion = "1.2 p1"; + public static final String serverName = "Helma"; // we're using the server version from helma.main.Server class. + // public static final String serverVersion = "1.2 p1"; public static final String serverUrl = "http://helma.org/"; /// Write a standard-format HTML address for this server. @@ -53,7 +53,7 @@ public class ServeUtils PrintStream p = new PrintStream( o ); p.println( "
" + - helma.main.Server.version + "
" ); + serverName + " " + helma.main.Server.version + "" ); }