You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by la...@apache.org on 2001/09/08 22:13:19 UTC

cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/modules/config ContextXmlReader.java

larryi      01/09/08 13:13:19

  Modified:    src/share/org/apache/tomcat/modules/config
                        ContextXmlReader.java
  Log:
  Fix bug where host_aliases doesn't get cleared.  If more than one <Host>
  is specified in a file, the last one will get all the aliases previously specified.
  This includes aliases in prior <Host> definitions.
  
  Revision  Changes    Path
  1.10      +1 -0      jakarta-tomcat/src/share/org/apache/tomcat/modules/config/ContextXmlReader.java
  
  Index: ContextXmlReader.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/modules/config/ContextXmlReader.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ContextXmlReader.java	2001/08/16 04:52:56	1.9
  +++ ContextXmlReader.java	2001/09/08 20:13:19	1.10
  @@ -154,6 +154,7 @@
   	// Virtual host support - if Context is inside a <Host>
   	xh.addRule( "Host", xh.setVar( "current_host", "name"));
   	xh.addRule( "Host", xh.setVar( "current_address", "address"));
  +	xh.addRule( "Host", xh.setVar( "host_aliases", "")); // so host_aliases will get reset
   	xh.addRule( "Host", xh.setProperties());
   	xh.addRule( "Alias", new XmlAction() {
   		public void start( SaxContext xctx) throws Exception {