Attachment #21036 for bug #43588

View | Details | Raw Unified | Return to bug 43588
Collapse All | Expand All

Lines 332-338 Link Here

(-)java/org/apache/tomcat/util/net/BaseEndpoint.java (-1 / +1 lines)
332	try {	332	try {
333	// Need to create a connection to unlock the accept();	333	// Need to create a connection to unlock the accept();
334	if (address == null) {	334	if (address == null) {
335	s = new java.net.Socket("127.0.0.1", port);	335	s = new java.net.Socket(InetAddress.getLocalHost().getHostAddress(), port);
336	} else {	336	} else {
337	s = new java.net.Socket(address, port);	337	s = new java.net.Socket(address, port);
338	// setting soLinger to a small value will help shutdown the	338	// setting soLinger to a small value will help shutdown the

Lines 372-378 Link Here

(-)java/org/apache/tomcat/util/net/PoolTcpEndpoint.java (-1 / +1 lines)
372	try {	372	try {
373	// Need to create a connection to unlock the accept();	373	// Need to create a connection to unlock the accept();
374	if (inet == null) {	374	if (inet == null) {
375	s = new Socket("127.0.0.1", port);	375	s = new Socket(InetAddress.getLocalHost().getHostAddress(), port);
376	} else {	376	} else {
377	s = new Socket(inet, port);	377	s = new Socket(inet, port);
378	// setting soLinger to a small value will help shutdown the	378	// setting soLinger to a small value will help shutdown the

Lines 581-587 Link Here

(-)java/org/apache/tomcat/util/net/JIoEndpoint.java (-1 / +1 lines)
581	try {	581	try {
582	// Need to create a connection to unlock the accept();	582	// Need to create a connection to unlock the accept();
583	if (address == null) {	583	if (address == null) {
584	s = new Socket("127.0.0.1", port);	584	s = new Socket(InetAddress.getLocalHost().getHostAddress(), port);
585	} else {	585	} else {
586	s = new Socket(address, port);	586	s = new Socket(address, port);
587	// setting soLinger to a small value will help shutdown the	587	// setting soLinger to a small value will help shutdown the

Lines 858-864 Link Here

(-)java/org/apache/tomcat/util/net/AprEndpoint.java (-1 / +1 lines)
858	try {	858	try {
859	// Need to create a connection to unlock the accept();	859	// Need to create a connection to unlock the accept();
860	if (address == null) {	860	if (address == null) {
861	s = new java.net.Socket("127.0.0.1", port);	861	s = new java.net.Socket(InetAddress.getLocalHost().getHostAddress(), port);
862	} else {	862	} else {
863	s = new java.net.Socket(address, port);	863	s = new java.net.Socket(address, port);
864	// setting soLinger to a small value will help shutdown the	864	// setting soLinger to a small value will help shutdown the

Lines 372-378 Link Here

(-)java/org/apache/catalina/core/StandardServer.java (-1 / +1 lines)
372	try {	372	try {
373	serverSocket =	373	serverSocket =
374	new ServerSocket(port, 1,	374	new ServerSocket(port, 1,
375	InetAddress.getByName("127.0.0.1"));	375	InetAddress.getLocalHost());
376	} catch (IOException e) {	376	} catch (IOException e) {
377	log.error("StandardServer.await: create[" + port	377	log.error("StandardServer.await: create[" + port
378	+ "]: ", e);	378	+ "]: ", e);

Lines 24-29 Link Here

(-)java/org/apache/catalina/startup/Catalina.java (-1 / +3 lines)
24	import java.io.IOException;	24	import java.io.IOException;
25	import java.io.InputStream;	25	import java.io.InputStream;
26	import java.io.OutputStream;	26	import java.io.OutputStream;
		27	import java.net.InetAddress;
27	import java.net.Socket;	28	import java.net.Socket;
28	import java.util.ArrayList;	29	import java.util.ArrayList;
29	import java.util.HashMap;	30	import java.util.HashMap;
Lines 416-422 Link Here
416		417
417	// Stop the existing server	418	// Stop the existing server
418	try {	419	try {
419	Socket socket = new Socket("127.0.0.1", server.getPort());	420	String hostAddress = InetAddress.getLocalHost().getHostAddress();
		421	Socket socket = new Socket(hostAddress, server.getPort());
420	OutputStream stream = socket.getOutputStream();	422	OutputStream stream = socket.getOutputStream();
421	String shutdown = server.getShutdown();	423	String shutdown = server.getShutdown();
422	for (int i = 0; i < shutdown.length(); i++)	424	for (int i = 0; i < shutdown.length(); i++)




                 "http://tomcat.apache.org/"

  CreateShortCut "$SMPROGRAMS\Apache Tomcat 6.0\Welcome.lnk" \
                 "http://localhost:$R0/"

;  IfFileExists "$INSTDIR\webapps\admin" 0 NoAdminApp
;
;  CreateShortCut "$SMPROGRAMS\Apache Tomcat 6.0\Tomcat Administration.lnk" \
;                 "http://localhost:$R0/admin/"
;NoAdminApp:

  IfFileExists "$INSTDIR\webapps\manager" 0 NoManagerApp

  CreateShortCut "$SMPROGRAMS\Apache Tomcat 6.0\Tomcat Manager.lnk" \
                 "http://localhost:$R0/manager/html"

NoManagerApp:


Return to bug 43588

Lines 242-259 Link Here

(-)res/tomcat.nsi (-3 / +3 lines)
242	"http://tomcat.apache.org/"	242	"http://tomcat.apache.org/"
243		243
244	CreateShortCut "$SMPROGRAMS\Apache Tomcat 6.0\Welcome.lnk" \	244	CreateShortCut "$SMPROGRAMS\Apache Tomcat 6.0\Welcome.lnk" \
245	"http://127.0.0.1:$R0/"	245	"http://localhost:$R0/"
246		246
247	; IfFileExists "$INSTDIR\webapps\admin" 0 NoAdminApp	247	; IfFileExists "$INSTDIR\webapps\admin" 0 NoAdminApp
248	;	248	;
249	; CreateShortCut "$SMPROGRAMS\Apache Tomcat 6.0\Tomcat Administration.lnk" \	249	; CreateShortCut "$SMPROGRAMS\Apache Tomcat 6.0\Tomcat Administration.lnk" \
250	; "http://127.0.0.1:$R0/admin/"	250	; "http://localhost:$R0/admin/"
251	;NoAdminApp:	251	;NoAdminApp:
252		252
253	IfFileExists "$INSTDIR\webapps\manager" 0 NoManagerApp	253	IfFileExists "$INSTDIR\webapps\manager" 0 NoManagerApp
254		254
255	CreateShortCut "$SMPROGRAMS\Apache Tomcat 6.0\Tomcat Manager.lnk" \	255	CreateShortCut "$SMPROGRAMS\Apache Tomcat 6.0\Tomcat Manager.lnk" \
256	"http://127.0.0.1:$R0/manager/html"	256	"http://localhost:$R0/manager/html"
257		257
258	NoManagerApp:	258	NoManagerApp:
259		259