cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector Connector.java CoyoteAdapter.java

[billbarker]

billbarker2005/04/29 20:32:43

  Modified:catalina/src/share/org/apache/catalina/connector
Connector.java CoyoteAdapter.java
  Log:
  Add option to enable IP-based Virtual Hosting.
  
  Fix for bug #34648
  
  Revision  ChangesPath
  1.18  +22 -1 
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.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- Connector.java28 Apr 2005 12:29:51 -  1.17
  +++ Connector.java30 Apr 2005 03:32:43 -  1.18
  @@ -208,6 +208,10 @@
*/
   protected boolean stopped = false;
   
  +/**
  + * Flag to use IP-based virtual hosting.
  + */
  +protected boolean useIPVHosts = false;
   
   /**
* The background thread.
  @@ -853,6 +857,23 @@
   setProperty(xpoweredBy, String.valueOf(xpoweredBy));
   }
   
  +/**
  + * Enable the use of IP-based virtual hosting.
  + *
  + * @param useIPVHosts codetrue/code if Hosts are identified by IP,
  + *codefalse/code if Hosts are identified by name.
  + */
  +public void setUseIPVHosts(boolean useIPVHosts) {
  +this.useIPVHosts = useIPVHosts;
  +setProperty(useIPVHosts, String.valueOf(useIPVHosts));
  +}
  +
  +/**
  + * Test if IP-based virtual hosting is enabled.
  + */
  +public boolean getUseIPVHosts() {
  +return useIPVHosts;
  +}
   
   // - Public 
Methods
   
  
  
  
  1.9   +12 -2 
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/CoyoteAdapter.java
  
  Index: CoyoteAdapter.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/CoyoteAdapter.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- CoyoteAdapter.java27 Oct 2004 22:58:17 -  1.8
  +++ CoyoteAdapter.java30 Apr 2005 03:32:43 -  1.9
  @@ -259,7 +259,17 @@
   }
   
   // Request mapping.
  -connector.getMapper().map(req.serverName(), decodedURI, 
  +MessageBytes serverName;
  +if(connector.getUseIPVHosts()) {
  +serverName = req.localName();
  +if(serverName.isNull()) {
  +// well, they did ask for it
  +res.action(ActionCode.ACTION_REQ_LOCAL_NAME_ATTRIBUTE, null);
  +}
  +} else {
  +serverName = req.serverName();
  +}
  +connector.getMapper().map(serverName, decodedURI, 
 request.getMappingData());
   request.setContext((Context) request.getMappingData().context);
   request.setWrapper((Wrapper) request.getMappingData().wrapper);
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector Connector.java CoyoteAdapter.java

[remm]

remm2004/10/04 02:25:11

  Modified:catalina/src/share/org/apache/catalina/connector
Connector.java CoyoteAdapter.java
  Log:
  - Switch to getIsPowered.
  - Add replacement for property names.
  - Add back bufferSize property (which isn't used).
  
  Revision  ChangesPath
  1.7   +43 -4 
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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Connector.java3 Oct 2004 08:53:56 -   1.6
  +++ Connector.java4 Oct 2004 09:25:11 -   1.7
  @@ -18,6 +18,8 @@
   package org.apache.catalina.connector;
   
   import java.net.URLEncoder;
  +import java.util.HashMap;
  +import java.util.Hashtable;
   
   import javax.management.MBeanRegistration;
   import javax.management.MBeanServer;
  @@ -251,6 +253,15 @@
private boolean useBodyEncodingForURI = false;
   
   
  + protected static HashMap replacements = new HashMap();
  + static {
  + replacements.put(acceptCount, backlog);
  + replacements.put(connectionLinger, soLinger);
  + replacements.put(connectionTimeout, soTimeout);
  + replacements.put(connectionUploadTimeout, timeout);
  + }
  + 
  + 
   // - Properties
   
   
  @@ -258,7 +269,12 @@
* Return a configured property.
*/
   public Object getProperty(String name) {
  -return IntrospectionUtils.getProperty(protocolHandler, name);
  +String repl = name;
  +if (replacements.get(name) != null) {
  +repl = (String) replacements.get(name);
  +}
  +log.info(get  + name +  as  + repl);
  +return IntrospectionUtils.getProperty(protocolHandler, repl);
   }
   
   
  @@ -266,7 +282,11 @@
* Set a configured property.
*/
   public void setProperty(String name, String value) {
  -IntrospectionUtils.setProperty(protocolHandler, name, value);
  +String repl = name;
  +if (replacements.get(name) != null) {
  +repl = (String) replacements.get(name);
  +}
  +IntrospectionUtils.setProperty(protocolHandler, repl, value);
   }
   
   
  @@ -351,6 +371,25 @@
   
   
   /**
  + * Return the input buffer size for this Connector.
  + * 
  + * @deprecated
  + */
  +public int getBufferSize() {
  +return 2048;
  +}
  +
  +/**
  + * Set the input buffer size for this Connector.
  + *
  + * @param bufferSize The new input buffer size.
  + * @deprecated
  + */
  +public void setBufferSize(int bufferSize) {
  +}
  +
  +
  +/**
* Return the Container used for processing requests received by this
* Connector.
*/
  @@ -717,7 +756,7 @@
* @return true if generation of X-Powered-By response header is enabled,
* false otherwise
*/
  -public boolean isXpoweredBy() {
  +public boolean getXpoweredBy() {
   return xpoweredBy;
   }
   
  
  
  
  1.6   +2 -2  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/CoyoteAdapter.java
  
  Index: CoyoteAdapter.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/connector/CoyoteAdapter.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- CoyoteAdapter.java29 Aug 2004 16:46:09 -  1.5
  +++ CoyoteAdapter.java4 Oct 2004 09:25:11 -   1.6
  @@ -135,7 +135,7 @@
   
   }
   
  -if (connector.isXpoweredBy()) {
  +if (connector.getXpoweredBy()) {
   response.addHeader(X-Powered-By, Servlet/2.4);
   }
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]