cvs commit: jakarta-tomcat-catalina/webapps/docs/config ajp.xml http.xml
pero2005/06/04 05:33:38
Modified:catalina/src/share/org/apache/catalina/connector
Connector.java
webapps/docs changelog.xml
webapps/docs/config ajp.xml http.xml
Log:
Support Host Alias matching with Connector attribute allowedAliasMatches
Submitted by George Sexton
Revision ChangesPath
1.22 +8 -2
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/Connector.java
Index: Connector.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/Connector.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Connector.java22 May 2005 17:18:28 - 1.21
+++ Connector.java4 Jun 2005 12:33:38 - 1.22
@@ -42,6 +42,8 @@
import org.apache.tomcat.util.IntrospectionUtils;
import org.apache.tomcat.util.http.mapper.Mapper;
+import com.sun.org.apache.bcel.internal.generic.ALOAD;
+
/**
* Implementation of a Coyote connector for Tomcat 5.x.
@@ -1104,6 +1106,10 @@
}
if( this.domain != null ) {
+Object allowedAliasMatches = getProperty("allowedAliasMatches") ;
+if(allowedAliasMatches != null && allowedAliasMatches instanceof
String )
+IntrospectionUtils.setProperty(mapper, "allowedAliasMatches",
+(String)allowedAliasMatches);
mapperListener.setDomain( domain );
//mapperListener.setEngine( service.getContainer().getName() );
mapperListener.init();
@@ -1113,7 +1119,7 @@
log.debug(sm.getString(
"coyoteConnector.MapperRegistration",
mapperOname));
Registry.getRegistry(null, null).registerComponent
-(mapper, createObjectName(this.domain,"Mapper"),
"Mapper");
+(mapper, mapperOname, "Mapper");
} catch (Exception ex) {
log.error(sm.getString
("coyoteConnector.protocolRegistrationFailed"), ex);
1.312 +5 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.311
retrieving revision 1.312
diff -u -r1.311 -r1.312
--- changelog.xml 16 May 2005 18:34:51 - 1.311
+++ changelog.xml 4 Jun 2005 12:33:38 - 1.312
@@ -72,6 +72,11 @@
+
+Support Host Alias matching with Connector attribute
allowedAliasMatches="max alias".
+So we can easier integrate subdomain as host alias
*.mydomain.net" .
+Submitted by George Sexton (pero)
+
20380: Access log timestamps now take account of Daylight
Saving
Time (DST). (markt)
1.16 +7 -0 jakarta-tomcat-catalina/webapps/docs/config/ajp.xml
Index: ajp.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/config/ajp.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ajp.xml 22 May 2005 17:18:28 - 1.15
+++ ajp.xml 4 Jun 2005 12:33:38 - 1.16
@@ -52,6 +52,13 @@
+
+ Set this attribute to max subdomain alias matches 16.
+ Is this attribute >0 the host alias element support Alias Matches
+ (*.mydomain.net" ).
+ The default value is 0 no host alias matches support.
+
+
A boolean value which can be used to enable or disable the TRACE
HTTP method. If not specified, this attribute is set to false.
1.24 +9 -1 jakarta-tomcat-catalina/webapps/docs/config/http.xml
Index: http.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/config/http.xml,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- http.xml 22 May 2005 17:18:28 - 1.23
+++ http.xml 4 Jun 2005 12:33:38 - 1.24
@@ -56,7 +56,14 @@
support the following attributes:
-
+
+
+ Set this attribute to max subdomain alias matches 16.
+ Is this attribute >0 the host alias element support Alias Matches
+ (*.mydomain.net" ).
+ The default value is 0 no host alias matches support.
+
+
A boolean value which can be used to enable or disable the TRACE
HTTP method. If not specified, this attribute is set to false.
@@ -173,6 +180,7 @@
specification. The defau
cvs commit: jakarta-tomcat-catalina/webapps/docs/config ajp.xml http.xml
markt 2005/05/22 10:18:28
Modified:catalina/src/share/org/apache/catalina/authenticator
FormAuthenticator.java LocalStrings.properties
catalina/src/share/org/apache/catalina/connector
Connector.java
webapps/docs/config ajp.xml http.xml
Log:
Add new attribute maxSavePostSize to connector and document it
Implement save size limit in form authenticator
Revision ChangesPath
1.23 +22 -14
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/FormAuthenticator.java
Index: FormAuthenticator.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/FormAuthenticator.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- FormAuthenticator.java16 May 2005 05:22:21 - 1.22
+++ FormAuthenticator.java22 May 2005 17:18:28 - 1.23
@@ -36,7 +36,6 @@
import org.apache.catalina.deploy.LoginConfig;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.coyote.InputBuffer;
import org.apache.coyote.ActionCode;
import org.apache.tomcat.util.buf.ByteChunk;
import org.apache.tomcat.util.buf.CharChunk;
@@ -233,7 +232,14 @@
session = request.getSessionInternal(true);
if (log.isDebugEnabled())
log.debug("Save request in session '" +
session.getIdInternal() + "'");
-saveRequest(request, session);
+try {
+saveRequest(request, session);
+} catch (IOException ioe) {
+log.debug("Request body too big to save during
authentication");
+response.sendError(HttpServletResponse.SC_FORBIDDEN,
+sm.getString("authenticator.requestBodyTooBig"));
+return (false);
+}
RequestDispatcher disp =
context.getServletContext().getRequestDispatcher
(config.getLoginPage());
@@ -387,13 +393,16 @@
if ("POST".equalsIgnoreCase(saved.getMethod())) {
ByteChunk body = saved.getBody();
-
-
request.getCoyoteRequest().action(ActionCode.ACTION_REQ_SET_BODY_REPLAY, body);
-
-// Set content type
-MessageBytes contentType = MessageBytes.newInstance();
-contentType.setString("application/x-www-form-urlencoded");
-request.getCoyoteRequest().setContentType(contentType);
+
+if (body != null) {
+request.getCoyoteRequest().action
+(ActionCode.ACTION_REQ_SET_BODY_REPLAY, body);
+
+// Set content type
+MessageBytes contentType = MessageBytes.newInstance();
+contentType.setString("application/x-www-form-urlencoded");
+request.getCoyoteRequest().setContentType(contentType);
+}
}
request.getCoyoteRequest().method().setString(saved.getMethod());
@@ -440,14 +449,13 @@
}
if ("POST".equalsIgnoreCase(request.getMethod())) {
-// Note that the size of the request body is limited by:
-// request.getConnector().getMaxPostSize()
+ByteChunk body = new ByteChunk();
+body.setLimit(request.getConnector().getMaxSavePostSize());
byte[] buffer = new byte[4096];
int bytesRead;
InputStream is = request.getInputStream();
-ByteChunk body = new ByteChunk();
-
+
while ( (bytesRead = is.read(buffer) ) >= 0) {
body.append(buffer, 0, bytesRead);
}
1.3 +1 -0
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/LocalStrings.properties
Index: LocalStrings.properties
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/LocalStrings.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LocalStrings.properties 15 Mar 2004 22:25:35 - 1.2
+++ LocalStrings.properties 22 May 2005 17:18:28 - 1.3
@@ -8,6 +8,7 @@
authenticator.notAuthenticated=Configuration error: Cannot perform access
control without an authenticated principal
authenticator.notContext=Configuration error: Must be attached to a Context
authenticator.notStarted=Security Interceptor has not yet been started
+authenticator.requestBodyTooBig=The request body was too large to be cached
during the authentication process
authenticator.sessionExpired=The time allowed
cvs commit: jakarta-tomcat-catalina/webapps/docs/config ajp.xml http.xml
billbarker2005/04/29 21:35:37 Modified:webapps/docs changelog.xml webapps/docs/config ajp.xml http.xml Log: Update docs to include new Virtual Host option. Revision ChangesPath 1.296 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.295 retrieving revision 1.296 diff -u -r1.295 -r1.296 --- changelog.xml 29 Apr 2005 17:18:21 - 1.295 +++ changelog.xml 30 Apr 2005 04:35:37 - 1.296 @@ -136,6 +136,9 @@ Add Apache Portable Runtime based HTTP/1.1 protocol handler, without SSL support, which provides efficient worker thread usage (remm) + +34648: Add configuration option to enable IP-based Virtual Hosts. (billbarker) + 1.14 +6 -0 jakarta-tomcat-catalina/webapps/docs/config/ajp.xml Index: ajp.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/config/ajp.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- ajp.xml 6 Apr 2005 15:54:05 - 1.13 +++ ajp.xml 30 Apr 2005 04:35:37 - 1.14 @@ -147,6 +147,12 @@ + + Set this attribute to true to cause Tomcat to use + the ServerName passed by the native web server to determine the Host + to send the request to. The default value is false. + + Set this attribute to true to cause Tomcat to advertise support for the Srevlet specification using the header recommended in the 1.22 +6 -0 jakarta-tomcat-catalina/webapps/docs/config/http.xml Index: http.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/config/http.xml,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- http.xml 6 Apr 2005 15:54:05 - 1.21 +++ http.xml 30 Apr 2005 04:35:37 - 1.22 @@ -146,6 +146,12 @@ + + Set this attribute to true to cause Tomcat to use + the IP address that the request was recieved on to determine the Host + to send the request to. The default value is false. + + Set this attribute to true to cause Tomcat to advertise support for the Srevlet specification using the header recommended in the - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs/config ajp.xml http.xml
yoavs 2004/07/23 07:13:41 Modified:webapps/docs changelog.xml webapps/docs/config ajp.xml http.xml Log: Addressed Bugzilla 30245, Connector documentation. Revision ChangesPath 1.75 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- changelog.xml 23 Jul 2004 14:02:17 - 1.74 +++ changelog.xml 23 Jul 2004 14:13:41 - 1.75 @@ -26,6 +26,9 @@ 29584: Enhanced and clarified JNDI documentation. (yoavs) + +30245: Corrected Connector documentation to list "address" as a common attribute. (yoavs) + 1.5 +8 -0 jakarta-tomcat-catalina/webapps/docs/config/ajp.xml Index: ajp.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/config/ajp.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ajp.xml 11 Jan 2004 09:20:22 - 1.4 +++ ajp.xml 23 Jul 2004 14:13:41 - 1.5 @@ -8,6 +8,7 @@ Remy Maucherat +Yoav Shapira The AJP Connector @@ -39,6 +40,13 @@ support the following attributes: + + + For servers with more than one IP address, this attribute + specifies which address will be used for listening on the specified + port. By default, this port will be used on all IP addresses + associated with the server. + A boolean value which can be used to enable or disable the TRACE 1.11 +7 -7 jakarta-tomcat-catalina/webapps/docs/config/http.xml Index: http.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/config/http.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- http.xml 27 May 2004 16:08:51 - 1.10 +++ http.xml 23 Jul 2004 14:13:41 - 1.11 @@ -57,6 +57,13 @@ + + For servers with more than one IP address, this attribute + specifies which address will be used for listening on the specified + port. By default, this port will be used on all IP addresses + associated with the server. + + A boolean value which can be used to enable or disable the TRACE HTTP method. If not specified, this attribute is set to false. @@ -136,13 +143,6 @@ all possible request processing threads are in use. Any requests received when the queue is full will be refused. The default value is 10. - - - - For servers with more than one IP address, this attribute - specifies which address will be used for listening on the specified - port. By default, this port will be used on all IP addresses - associated with the server. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs/config ajp.xml http.xml
remm2004/01/11 01:20:22 Modified:webapps/docs/config ajp.xml http.xml Log: - Document allowTrace. - Improve docs for the encoding flag. Revision ChangesPath 1.4 +10 -3 jakarta-tomcat-catalina/webapps/docs/config/ajp.xml Index: ajp.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/config/ajp.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ajp.xml 12 Dec 2003 02:52:26 - 1.3 +++ ajp.xml 11 Jan 2004 09:20:22 - 1.4 @@ -40,6 +40,11 @@ + + A boolean value which can be used to enable or disable the TRACE + HTTP method. If not specified, this attribute is set to false. + + Set to true if you want calls to request.getRemoteHost() to perform DNS lookups in @@ -86,9 +91,11 @@ This specifies if the encoding specified in contentType should be used - for URI query parameters, instead of using the URIEncoding. This setting is - present for compatibility with Tomcat 4.1.x. - The default value is false. + for URI query parameters, instead of using the URIEncoding. This + setting is present for compatibility with Tomcat 4.1.x, where the + encoding specified in the contentType, or explicitely set using + Request.setCharacterEncoding method was also used for the parameters from + the URL. The default value is false. 1.4 +10 -3 jakarta-tomcat-catalina/webapps/docs/config/http.xml Index: http.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/config/http.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- http.xml 12 Dec 2003 02:52:26 - 1.3 +++ http.xml 11 Jan 2004 09:20:22 - 1.4 @@ -56,6 +56,11 @@ + + A boolean value which can be used to enable or disable the TRACE + HTTP method. If not specified, this attribute is set to false. + + Set to true if you want calls to request.getRemoteHost() to perform DNS lookups in @@ -103,9 +108,11 @@ This specifies if the encoding specified in contentType should be used - for URI query parameters, instead of using the URIEncoding. This setting is - present for compatibility with Tomcat 4.1.x. - The default value is false. + for URI query parameters, instead of using the URIEncoding. This + setting is present for compatibility with Tomcat 4.1.x, where the + encoding specified in the contentType, or explicitely set using + Request.setCharacterEncoding method was also used for the parameters from + the URL. The default value is false. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs/config ajp.xml http.xml
larryi 2003/12/11 18:52:27 Modified:webapps/docs/config ajp.xml http.xml Log: Make description a little more specific, since the topic of URI path parameters seems to be gaining popularity, at leat for the moment. Revision ChangesPath 1.3 +1 -1 jakarta-tomcat-catalina/webapps/docs/config/ajp.xml Index: ajp.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/config/ajp.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ajp.xml 10 Dec 2003 22:34:18 - 1.2 +++ ajp.xml 12 Dec 2003 02:52:26 - 1.3 @@ -86,7 +86,7 @@ This specifies if the encoding specified in contentType should be used - for URI parameters, instead of using the URIEncoding. This setting is + for URI query parameters, instead of using the URIEncoding. This setting is present for compatibility with Tomcat 4.1.x. The default value is false. 1.3 +1 -1 jakarta-tomcat-catalina/webapps/docs/config/http.xml Index: http.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/config/http.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- http.xml 10 Dec 2003 22:34:18 - 1.2 +++ http.xml 12 Dec 2003 02:52:26 - 1.3 @@ -103,7 +103,7 @@ This specifies if the encoding specified in contentType should be used - for URI parameters, instead of using the URIEncoding. This setting is + for URI query parameters, instead of using the URIEncoding. This setting is present for compatibility with Tomcat 4.1.x. The default value is false. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs/config ajp.xml http.xml
remm2003/12/10 14:34:18 Modified:webapps/docs/config ajp.xml http.xml Log: - Document the new flag. Revision ChangesPath 1.2 +8 -0 jakarta-tomcat-catalina/webapps/docs/config/ajp.xml Index: ajp.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/config/ajp.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ajp.xml 10 Dec 2003 12:57:38 - 1.1 +++ ajp.xml 10 Dec 2003 22:34:18 - 1.2 @@ -84,6 +84,14 @@ + + This specifies if the encoding specified in contentType should be used + for URI parameters, instead of using the URIEncoding. This setting is + present for compatibility with Tomcat 4.1.x. + The default value is false. + + + 1.2 +8 -0 jakarta-tomcat-catalina/webapps/docs/config/http.xml Index: http.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/config/http.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- http.xml 10 Dec 2003 12:57:38 - 1.1 +++ http.xml 10 Dec 2003 22:34:18 - 1.2 @@ -101,6 +101,14 @@ + + This specifies if the encoding specified in contentType should be used + for URI parameters, instead of using the URIEncoding. This setting is + present for compatibility with Tomcat 4.1.x. + The default value is false. + + + - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs/config ajp.xml http.xml project.xml coyote.xml jk.xml
remm2003/12/10 04:57:38 Modified:webapps/docs/config project.xml Added: webapps/docs/config ajp.xml http.xml Removed: webapps/docs/config coyote.xml jk.xml Log: - Rename the connectors to the protocol they support: HTTP and AJP. - Fix obsolete information in the HTTP connector documentation. Revision ChangesPath 1.4 +2 -2 jakarta-tomcat-catalina/webapps/docs/config/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/config/project.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- project.xml 10 Dec 2003 12:38:01 - 1.3 +++ project.xml 10 Dec 2003 12:57:38 - 1.4 @@ -22,8 +22,8 @@ - - + + 1.1 jakarta-tomcat-catalina/webapps/docs/config/ajp.xml Index: ajp.xml === ]> &project; Remy Maucherat The AJP Connector The AJP Connector element represents a Connector component that communicates with a web connector via the AJP protocol. This is used for cases where you wish to invisibly integrate Tomcat 5 into an existing (or new) Apache installation, and you want Apache to handle the static content contained in the web application, and/or utilize Apache's SSL processing. This connector supports load balancing when used in conjunction with the jvmRoute attribute of the Engine. All implementations of Connector support the following attributes: Set to true if you want calls to request.getRemoteHost() to perform DNS lookups in order to return the actual host name of the remote client. Set to false to skip the DNS lookup and return the IP address in String form instead (thereby improving performance). By default, DNS lookups are enabled. The maximum size in bytes of the POST which will be handled by the container FORM URL parameter parsing. The feature can be disbled by setting this attribute to a value inferior or equal to 0. If not specified, this attribute is set to 2097152 (2 megabytes). If this Connector is supporting non-SSL requests, and a request is received for which a matchingrequires SSL transport, Catalina will automatically redirect the request to the port number specified here. Set this attribute to the name of the protocol you wish to have returned by calls to request.getScheme(). For example, you would set this attribute to "https" for an SSL Connector. The default value is "http". Set this attribute to true if you wish to have calls to request.isSecure() to return true for requests received by this Connector (you would want this on an SSL Connector). The default value is false. This specifies the character encoding used to decode the URI bytes, after %xx decoding the URL. If not specified, ISO-8859-1 will be used. The standard implementation of AJP Connector is org.apache.coyote.tomcat5.CoyoteConnector, but you must specify the protocol attribute (see below). This implementation supports the AJP 1.3 protocol. It supports the following additional attributes (in addition to the common attributes listed above): The debugging detail level of log messages generated by this component, with higher numbers creating more detailed output. If not specified, this attribute is set to zero (0). This attribute value must be AJP/1.3 to use the AJP handler. Please refer to the http://jakarta.apache.org/builds/jakarta-tomcat-connectors/jk2/doc/";>JK documentation for HOWTOs and complete configuration information. 1.1 jakarta-tomcat-catalina/webapps/docs/config/http.xml Index: http.xml === ]> &project; Craig R. McClanahan The HTTP Connector The HTTP Connector element represents a Connector component that supports the HTTP/1.1 protocol. It enables Catalina to function as a stand-alone web server, in addition to its ability to execute servlets and JSP pages. A particular instance of this component listens for connections on a specific
