10:20 a.m.
Author: remy.maucherat(a)jboss.com
Date: 2012-03-07 11:20:42 -0500 (Wed, 07 Mar 2012)
New Revision: 1994
Modified:
branches/7.0.x/java/org/apache/coyote/ajp/AjpAprProtocol.java
branches/7.0.x/java/org/apache/coyote/ajp/AjpProtocol.java
branches/7.0.x/java/org/apache/coyote/http11/Http11AprProtocol.java
branches/7.0.x/java/org/apache/coyote/http11/Http11Protocol.java
branches/7.0.x/webapps/docs/changelog.xml
Log:
AS7-3851: Cleanup IPv6 logging.
Modified: branches/7.0.x/java/org/apache/coyote/ajp/AjpAprProtocol.java
===================================================================
--- branches/7.0.x/java/org/apache/coyote/ajp/AjpAprProtocol.java 2012-03-05 14:38:44 UTC
(rev 1993)
+++ branches/7.0.x/java/org/apache/coyote/ajp/AjpAprProtocol.java 2012-03-07 16:20:42 UTC
(rev 1994)
@@ -289,7 +289,7 @@
String encodedAddr = "";
if (getAddress() != null) {
encodedAddr = "" + getAddress();
- encodedAddr = URLEncoder.encode(encodedAddr.replace('/',
'-')) + "-";
+ encodedAddr = URLEncoder.encode(encodedAddr.replace('/',
'-').replace(':', '_').replace('%', '-')) +
"-";
}
return ("ajp-" + encodedAddr + endpoint.getPort());
}
Modified: branches/7.0.x/java/org/apache/coyote/ajp/AjpProtocol.java
===================================================================
--- branches/7.0.x/java/org/apache/coyote/ajp/AjpProtocol.java 2012-03-05 14:38:44 UTC
(rev 1993)
+++ branches/7.0.x/java/org/apache/coyote/ajp/AjpProtocol.java 2012-03-07 16:20:42 UTC
(rev 1994)
@@ -266,7 +266,7 @@
String encodedAddr = "";
if (getAddress() != null) {
encodedAddr = "" + getAddress();
- encodedAddr = URLEncoder.encode(encodedAddr.replace('/',
'-')) + "-";
+ encodedAddr = URLEncoder.encode(encodedAddr.replace('/',
'-').replace(':', '_').replace('%', '-')) +
"-";
}
return ("ajp-" + encodedAddr + endpoint.getPort());
}
Modified: branches/7.0.x/java/org/apache/coyote/http11/Http11AprProtocol.java
===================================================================
--- branches/7.0.x/java/org/apache/coyote/http11/Http11AprProtocol.java 2012-03-05
14:38:44 UTC (rev 1993)
+++ branches/7.0.x/java/org/apache/coyote/http11/Http11AprProtocol.java 2012-03-07
16:20:42 UTC (rev 1994)
@@ -234,7 +234,7 @@
String encodedAddr = "";
if (getAddress() != null) {
encodedAddr = "" + getAddress();
- encodedAddr = URLEncoder.encode(encodedAddr.replace('/',
'-')) + "-";
+ encodedAddr = URLEncoder.encode(encodedAddr.replace('/',
'-').replace(':', '_').replace('%', '-')) +
"-";
}
return ("http-" + encodedAddr + endpoint.getPort());
}
Modified: branches/7.0.x/java/org/apache/coyote/http11/Http11Protocol.java
===================================================================
--- branches/7.0.x/java/org/apache/coyote/http11/Http11Protocol.java 2012-03-05 14:38:44
UTC (rev 1993)
+++ branches/7.0.x/java/org/apache/coyote/http11/Http11Protocol.java 2012-03-07 16:20:42
UTC (rev 1994)
@@ -281,7 +281,7 @@
String encodedAddr = "";
if (getAddress() != null) {
encodedAddr = "" + getAddress();
- encodedAddr = URLEncoder.encode(encodedAddr.replace('/',
'-')) + "-";
+ encodedAddr = URLEncoder.encode(encodedAddr.replace('/',
'-').replace(':', '_').replace('%', '-')) +
"-";
}
return ("http-" + encodedAddr + endpoint.getPort());
}
Modified: branches/7.0.x/webapps/docs/changelog.xml
===================================================================
--- branches/7.0.x/webapps/docs/changelog.xml 2012-03-05 14:38:44 UTC (rev 1993)
+++ branches/7.0.x/webapps/docs/changelog.xml 2012-03-07 16:20:42 UTC (rev 1994)
@@ -16,6 +16,16 @@
<body>
+<section name="JBoss Web 7.0.13.Final (remm)">
+ <subsection name="Coyote">
+ <changelog>
+ <fix>
+ <jboss-jira>AS7-3851</jboss-jira>: Cleanup IPv6 logging. (remm)
+ </fix>
+ </changelog>
+ </subsection>
+</section>
+
<section name="JBoss Web 7.0.12.Final (remm)">
<subsection name="Coyote">
<changelog>