Author: jfrederic.clere(a)jboss.com Date: 2007-11-26 08:20:42 -0500 (Mon, 26 Nov 2007) New Revision: 352 Modified: trunk/java/org/apache/catalina/core/StandardServer.java trunk/java/org/apache/catalina/startup/Catalina.java trunk/java/org/apache/tomcat/util/net/AprEndpoint.java trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java trunk/res/tomcat.nsi trunk/webapps/docs/changelog.xml Log: Fix BZ 43588. Modified: trunk/java/org/apache/catalina/core/StandardServer.java =================================================================== --- trunk/java/org/apache/catalina/core/StandardServer.java 2007-11-26 11:56:55 UTC (rev 351) +++ trunk/java/org/apache/catalina/core/StandardServer.java 2007-11-26 13:20:42 UTC (rev 352) @@ -371,7 +371,7 @@ try { serverSocket = new ServerSocket(port, 1, - InetAddress.getByName("127.0.0.1")); + InetAddress.getByName("localhost")); } catch (IOException e) { log.error("StandardServer.await: create[" + port + "]: ", e); Modified: trunk/java/org/apache/catalina/startup/Catalina.java =================================================================== --- trunk/java/org/apache/catalina/startup/Catalina.java 2007-11-26 11:56:55 UTC (rev 351) +++ trunk/java/org/apache/catalina/startup/Catalina.java 2007-11-26 13:20:42 UTC (rev 352) @@ -412,7 +412,7 @@ // Stop the existing server try { - Socket socket = new Socket("127.0.0.1", server.getPort()); + Socket socket = new Socket("localhost", server.getPort()); OutputStream stream = socket.getOutputStream(); String shutdown = server.getShutdown(); for (int i = 0; i < shutdown.length(); i++) Modified: trunk/java/org/apache/tomcat/util/net/AprEndpoint.java =================================================================== --- trunk/java/org/apache/tomcat/util/net/AprEndpoint.java 2007-11-26 11:56:55 UTC (rev 351) +++ trunk/java/org/apache/tomcat/util/net/AprEndpoint.java 2007-11-26 13:20:42 UTC (rev 352) @@ -773,7 +773,7 @@ try { // Need to create a connection to unlock the accept(); if (address == null) { - s = new java.net.Socket("127.0.0.1", port); + s = new java.net.Socket("localhost", port); } else { s = new java.net.Socket(address, port); // setting soLinger to a small value will help shutdown the Modified: trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java =================================================================== --- trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java 2007-11-26 11:56:55 UTC (rev 351) +++ trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java 2007-11-26 13:20:42 UTC (rev 352) @@ -581,7 +581,7 @@ try { // Need to create a connection to unlock the accept(); if (address == null) { - s = new Socket("127.0.0.1", port); + s = new Socket("localhost", port); } else { s = new Socket(address, port); // setting soLinger to a small value will help shutdown the Modified: trunk/res/tomcat.nsi =================================================================== --- trunk/res/tomcat.nsi 2007-11-26 11:56:55 UTC (rev 351) +++ trunk/res/tomcat.nsi 2007-11-26 13:20:42 UTC (rev 352) @@ -228,18 +228,18 @@ "http://tomcat.apache.org/" CreateShortCut "$SMPROGRAMS\Apache Tomcat 6.0\Welcome.lnk" \ - "http://127.0.0.1:$R0/" + "http://localhost:$R0/" ; IfFileExists "$INSTDIR\webapps\admin" 0 NoAdminApp ; ; CreateShortCut "$SMPROGRAMS\Apache Tomcat 6.0\Tomcat Administration.lnk" \ -; "http://127.0.0.1:$R0/admin/" +; "http://localhost:$R0/admin/" ;NoAdminApp: IfFileExists "$INSTDIR\webapps\manager" 0 NoManagerApp CreateShortCut "$SMPROGRAMS\Apache Tomcat 6.0\Tomcat Manager.lnk" \ - "http://127.0.0.1:$R0/manager/html" + "http://localhost:$R0/manager/html" NoManagerApp: Modified: trunk/webapps/docs/changelog.xml =================================================================== --- trunk/webapps/docs/changelog.xml 2007-11-26 11:56:55 UTC (rev 351) +++ trunk/webapps/docs/changelog.xml 2007-11-26 13:20:42 UTC (rev 352) @@ -30,6 +30,9 @@ <subsection name="Catalina"> <changelog> <fix> + Fix BZ 43588 - hard coded 127.0.0.1 for localhost. It requires localhost to be defined correctly in the machine. (jfclere) + </fix> + <fix> Prevent cookie logic to escape quotes where the value is already a quoted-string. (jfclere) </fix> <fix>