pier 01/07/22 15:36:09
Modified: catalina/src/share/org/apache/catalina/connector/http
HttpConnector.java
catalina/src/share/org/apache/catalina/connector/http10
HttpConnector.java
Log:
Moved socket creation in the initialize() method, to allow port <= 1024
binding when running as non-root and using JSVC.
Revision Changes Path
1.21 +12 -12
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpConnector.java
Index: HttpConnector.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpConnector.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- HttpConnector.java 2001/07/22 20:25:07 1.20
+++ HttpConnector.java 2001/07/22 22:36:09 1.21
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpConnector.java,v
1.20 2001/07/22 20:25:07 pier Exp $
- * $Revision: 1.20 $
- * $Date: 2001/07/22 20:25:07 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http/HttpConnector.java,v
1.21 2001/07/22 22:36:09 pier Exp $
+ * $Revision: 1.21 $
+ * $Date: 2001/07/22 22:36:09 $
*
* ====================================================================
*
@@ -95,7 +95,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.20 $ $Date: 2001/07/22 20:25:07 $
+ * @version $Revision: 1.21 $ $Date: 2001/07/22 22:36:09 $
*/
@@ -1073,7 +1073,14 @@
throw new LifecycleException (
sm.getString("httpConnector.alreadyInitialized"));
this.initialized=true;
- System.err.println("HTTP Connector initialized");
+
+ // Establish a server socket on the specified port
+ try {
+ serverSocket = open();
+ } catch (IOException e) {
+ throw new LifecycleException(threadName + ".open", e);
+ }
+
}
@@ -1091,13 +1098,6 @@
threadName = "HttpConnector[" + port + "]";
lifecycle.fireLifecycleEvent(START_EVENT, null);
started = true;
-
- // Establish a server socket on the specified port
- try {
- serverSocket = open();
- } catch (IOException e) {
- throw new LifecycleException(threadName + ".open", e);
- }
// Start our background thread
threadStart();
1.10 +12 -11
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http10/HttpConnector.java
Index: HttpConnector.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http10/HttpConnector.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- HttpConnector.java 2001/07/22 20:25:07 1.9
+++ HttpConnector.java 2001/07/22 22:36:09 1.10
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http10/HttpConnector.java,v
1.9 2001/07/22 20:25:07 pier Exp $
- * $Revision: 1.9 $
- * $Date: 2001/07/22 20:25:07 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/connector/http10/HttpConnector.java,v
1.10 2001/07/22 22:36:09 pier Exp $
+ * $Revision: 1.10 $
+ * $Date: 2001/07/22 22:36:09 $
*
* ====================================================================
*
@@ -94,7 +94,7 @@
* purposes. Not intended to be the final solution.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.9 $ $Date: 2001/07/22 20:25:07 $
+ * @version $Revision: 1.10 $ $Date: 2001/07/22 22:36:09 $
*/
@@ -977,6 +977,14 @@
throw new LifecycleException (
sm.getString("httpConnector.alreadyInitialized"));
this.initialized=true;
+
+ // Establish a server socket on the specified port
+ try {
+ serverSocket = open();
+ } catch (IOException e) {
+ throw new LifecycleException(threadName + ".open", e);
+ }
+
}
/**
@@ -993,13 +1001,6 @@
threadName = "HttpConnector[" + port + "]";
lifecycle.fireLifecycleEvent(START_EVENT, null);
started = true;
-
- // Establish a server socket on the specified port
- try {
- serverSocket = open();
- } catch (IOException e) {
- throw new LifecycleException(threadName + ".open", e);
- }
// Start our background thread
threadStart();
