Author: jmitchell
Date: Mon Sep 19 23:29:01 2005
New Revision: 290373
URL: http://svn.apache.org/viewcvs?rev=290373&view=rev
Log:
make sure the server was not specified before grabbing and using the Host from
the header
Modified:
struts/taglib/trunk/src/java/org/apache/struts/taglib/html/BaseTag.java
Modified:
struts/taglib/trunk/src/java/org/apache/struts/taglib/html/BaseTag.java
URL:
http://svn.apache.org/viewcvs/struts/taglib/trunk/src/java/org/apache/struts/taglib/html/BaseTag.java?rev=290373&r1=290372&r2=290373&view=diff
==============================================================================
--- struts/taglib/trunk/src/java/org/apache/struts/taglib/html/BaseTag.java
(original)
+++ struts/taglib/trunk/src/java/org/apache/struts/taglib/html/BaseTag.java Mon
Sep 19 23:29:01 2005
@@ -114,7 +114,7 @@
int port = request.getServerPort();
String headerHost = request.getHeader("Host");
- if (headerHost != null) {
+ if (serverName == null && headerHost != null) {
StringTokenizer tokenizer = new StringTokenizer(headerHost,":");
serverName = tokenizer.nextToken();
if (tokenizer.hasMoreTokens()) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
