JBossWeb SVN: r2002 - in trunk/java/org: apache/coyote and 2 other directories.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2012-03-14 13:31:01 -0400 (Wed, 14 Mar 2012)
New Revision: 2002
Added:
trunk/java/org/jboss/web/upgrade/
trunk/java/org/jboss/web/upgrade/ProtocolHandler.java
trunk/java/org/jboss/web/upgrade/WebConnection.java
Modified:
trunk/java/org/apache/catalina/connector/LocalStrings.properties
trunk/java/org/apache/catalina/connector/Response.java
trunk/java/org/apache/catalina/connector/ResponseFacade.java
trunk/java/org/apache/coyote/ActionCode.java
Log:
Add an API for protocol upgrade based on a mix between the current Servlet draft and the HTTP events capabilities.
Modified: trunk/java/org/apache/catalina/connector/LocalStrings.properties
===================================================================
--- trunk/java/org/apache/catalina/connector/LocalStrings.properties 2012-03-14 15:15:05 UTC (rev 2001)
+++ trunk/java/org/apache/catalina/connector/LocalStrings.properties 2012-03-14 17:31:01 UTC (rev 2002)
@@ -39,6 +39,8 @@
coyoteResponse.sendFile.ise=Cannot call sendFile() after the response has been committed
coyoteResponse.sendFile.no=Sendfile is disabled
coyoteResponse.sendFile.path=Invalid path
+coyoteResponse.upgrade.ise=Cannot call sendUpgrade() after the response has been committed
+coyoteResponse.upgrade.noEvents=Cannot upgrade from HTTP/1.1 without IO events
#
# CoyoteRequest
Modified: trunk/java/org/apache/catalina/connector/Response.java
===================================================================
--- trunk/java/org/apache/catalina/connector/Response.java 2012-03-14 15:15:05 UTC (rev 2001)
+++ trunk/java/org/apache/catalina/connector/Response.java 2012-03-14 17:31:01 UTC (rev 2002)
@@ -47,6 +47,7 @@
import org.apache.catalina.util.CharsetMapper;
import org.apache.catalina.util.DateTool;
import org.apache.catalina.util.StringManager;
+import org.apache.coyote.ActionCode;
import org.apache.naming.resources.CacheEntry;
import org.apache.naming.resources.ProxyDirContext;
import org.apache.tomcat.util.buf.CharChunk;
@@ -1341,6 +1342,29 @@
}
+ public void sendUpgrade(org.jboss.web.upgrade.ProtocolHandler protocolHandler)
+ throws IOException {
+
+ if (isCommitted())
+ throw new IllegalStateException
+ (sm.getString("coyoteResponse.upgrade.ise"));
+
+ if (!connector.hasIoEvents())
+ throw new IllegalStateException
+ (sm.getString("coyoteResponse.upgrade.noEvents"));
+
+ request.getCoyoteRequest().action(ActionCode.UPGRADE, protocolHandler);
+
+ // Output required by RFC2616. Protocol specific headers should have
+ // already been set.
+ setStatus(HttpServletResponse.SC_SWITCHING_PROTOCOLS);
+
+ // Cause the response to be finished (from the application perspective)
+ setSuspended(true);
+
+ }
+
+
public void sendFile(String path, String absolutePath, long start, long end) {
if (isCommitted())
Modified: trunk/java/org/apache/catalina/connector/ResponseFacade.java
===================================================================
--- trunk/java/org/apache/catalina/connector/ResponseFacade.java 2012-03-14 15:15:05 UTC (rev 2001)
+++ trunk/java/org/apache/catalina/connector/ResponseFacade.java 2012-03-14 17:31:01 UTC (rev 2002)
@@ -454,6 +454,19 @@
}
+ public void sendUpgrade(org.jboss.web.upgrade.ProtocolHandler protocolHandler)
+ throws IOException {
+
+ if (isCommitted())
+ throw new IllegalStateException
+ (/*sm.getString("responseBase.reset.ise")*/);
+
+ response.setAppCommitted(true);
+
+ response.sendUpgrade(protocolHandler);
+
+ }
+
public void setDateHeader(String name, long date) {
if (isCommitted())
Modified: trunk/java/org/apache/coyote/ActionCode.java
===================================================================
--- trunk/java/org/apache/coyote/ActionCode.java 2012-03-14 15:15:05 UTC (rev 2001)
+++ trunk/java/org/apache/coyote/ActionCode.java 2012-03-14 17:31:01 UTC (rev 2002)
@@ -171,6 +171,11 @@
*/
public static final ActionCode ACTION_EVENT_WRITE = new ActionCode(27);
+ /**
+ * Ask for a protocol upgrade
+ */
+ public static final ActionCode UPGRADE = new ActionCode(28);
+
// ----------------------------------------------------------- Constructors
int code;
Added: trunk/java/org/jboss/web/upgrade/ProtocolHandler.java
===================================================================
--- trunk/java/org/jboss/web/upgrade/ProtocolHandler.java (rev 0)
+++ trunk/java/org/jboss/web/upgrade/ProtocolHandler.java 2012-03-14 17:31:01 UTC (rev 2002)
@@ -0,0 +1,34 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2012, Red Hat, Inc., and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.web.upgrade;
+
+public interface ProtocolHandler {
+ public void init(WebConnection wc);
+ public void destroy(WebConnection wc);
+ public void inputAvailable(WebConnection wc);
+ public void outputReady(WebConnection wc);
+ public void resume(WebConnection wc);
+ public void timeout(WebConnection wc);
+ public void error(WebConnection wc);
+ public void eof(WebConnection wc);
+}
Added: trunk/java/org/jboss/web/upgrade/WebConnection.java
===================================================================
--- trunk/java/org/jboss/web/upgrade/WebConnection.java (rev 0)
+++ trunk/java/org/jboss/web/upgrade/WebConnection.java 2012-03-14 17:31:01 UTC (rev 2002)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2012, Red Hat, Inc., and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.web.upgrade;
+
+import java.io.IOException;
+
+public interface WebConnection {
+ public boolean isReadReady();
+ public boolean isWriteReady();
+ public void setTimeout(int timeout);
+ public void suspend();
+ public void close() throws IOException;
+ public int read(byte[] b, int off, int len)
+ throws IOException;
+ public void write(byte[] b, int off, int len)
+ throws IOException;
+}
12 years, 9 months
JBossWeb SVN: r2000 - in trunk: webapps/docs and 1 other directory.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2012-03-14 06:13:39 -0400 (Wed, 14 Mar 2012)
New Revision: 2000
Modified:
trunk/java/org/apache/jasper/compiler/Generator.java
trunk/webapps/docs/changelog.xml
Log:
Port 52776: Fix cleanup after JspFragment.invoke
Modified: trunk/java/org/apache/jasper/compiler/Generator.java
===================================================================
--- trunk/java/org/apache/jasper/compiler/Generator.java 2012-03-09 21:44:26 UTC (rev 1999)
+++ trunk/java/org/apache/jasper/compiler/Generator.java 2012-03-14 10:13:39 UTC (rev 2000)
@@ -2098,9 +2098,6 @@
out.println(");");
}
- // Restore EL context
- out.printil("jspContext.getELContext().putContext(JspContext.class,getJspContext());");
-
n.setEndJavaLine(out.getJavaLine());
}
@@ -4186,6 +4183,7 @@
out.printil("}");
out.printil("try {");
out.pushIndent();
+ out.printil("Object _jspx_saved_JspContext = this.jspContext.getELContext().getContext(javax.servlet.jsp.JspContext.class);");
out.printil("this.jspContext.getELContext().putContext(JspContext.class,this.jspContext);");
out.printil("switch( this.discriminator ) {");
out.pushIndent();
@@ -4198,6 +4196,10 @@
}
out.popIndent();
out.printil("}"); // switch
+
+ // restore nested JspContext on ELContext
+ out.printil("jspContext.getELContext().putContext(javax.servlet.jsp.JspContext.class,_jspx_saved_JspContext);");
+
out.popIndent();
out.printil("}"); // try
out.printil("catch( Throwable e ) {");
Modified: trunk/webapps/docs/changelog.xml
===================================================================
--- trunk/webapps/docs/changelog.xml 2012-03-09 21:44:26 UTC (rev 1999)
+++ trunk/webapps/docs/changelog.xml 2012-03-14 10:13:39 UTC (rev 2000)
@@ -27,6 +27,13 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Jasper">
+ <changelog>
+ <fix>
+ <bug>52776</bug>: Fix cleanup after JspFragment.invoke. Sumitted by Karl von Randow. (markt)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="JBoss Web 7.0.12.Final (remm)">
12 years, 9 months
JBossWeb SVN: r1999 - in branches/JBOSSWEB_2_1_12_GA_JBPAPP-8108: java/org/apache/jasper/compiler and 1 other directories.
by jbossweb-commits＠lists.jboss.org
Author: bmaxwell
Date: 2012-03-09 16:44:26 -0500 (Fri, 09 Mar 2012)
New Revision: 1999
Modified:
branches/JBOSSWEB_2_1_12_GA_JBPAPP-8108/build.properties.default
branches/JBOSSWEB_2_1_12_GA_JBPAPP-8108/build.xml
branches/JBOSSWEB_2_1_12_GA_JBPAPP-8108/java/org/apache/jasper/compiler/AttributeParser.java
branches/JBOSSWEB_2_1_12_GA_JBPAPP-8108/java/org/apache/jasper/compiler/Parser.java
branches/JBOSSWEB_2_1_12_GA_JBPAPP-8108/webapps/docs/changelog.xml
Log:
[JBPAPP-8108] fix regression Tomcat 48627 - JasperException with JSF tags and value expressions
Modified: branches/JBOSSWEB_2_1_12_GA_JBPAPP-8108/build.properties.default
===================================================================
--- branches/JBOSSWEB_2_1_12_GA_JBPAPP-8108/build.properties.default 2012-03-09 11:13:15 UTC (rev 1998)
+++ branches/JBOSSWEB_2_1_12_GA_JBPAPP-8108/build.properties.default 2012-03-09 21:44:26 UTC (rev 1999)
@@ -14,7 +14,7 @@
version.minor=1
version.build=12
version.patch=0
-version.tag=GA
+version.tag=JBPAPP-8108
# ----- Default Base Path for Dependent Packages -----
# Please note this path must be absolute, not relative,
Modified: branches/JBOSSWEB_2_1_12_GA_JBPAPP-8108/build.xml
===================================================================
--- branches/JBOSSWEB_2_1_12_GA_JBPAPP-8108/build.xml 2012-03-09 11:13:15 UTC (rev 1998)
+++ branches/JBOSSWEB_2_1_12_GA_JBPAPP-8108/build.xml 2012-03-09 21:44:26 UTC (rev 1999)
@@ -18,7 +18,7 @@
<property name="version.minor" value="1" />
<property name="version.build" value="0" />
<property name="version.patch" value="0" />
- <property name="version.tag" value="SNAPSHOT" />
+ <property name="version.tag" value="JBPAPP-8108" />
<property name="version" value="${version.major}.${version.minor}.${version.build}.${version.tag}" />
<property name="version.number" value="${version.major}.${version.minor}.${version.build}.${version.patch}" />
Modified: branches/JBOSSWEB_2_1_12_GA_JBPAPP-8108/java/org/apache/jasper/compiler/AttributeParser.java
===================================================================
--- branches/JBOSSWEB_2_1_12_GA_JBPAPP-8108/java/org/apache/jasper/compiler/AttributeParser.java 2012-03-09 11:13:15 UTC (rev 1998)
+++ branches/JBOSSWEB_2_1_12_GA_JBPAPP-8108/java/org/apache/jasper/compiler/AttributeParser.java 2012-03-09 21:44:26 UTC (rev 1999)
@@ -24,7 +24,7 @@
* "\${1+1}". After unquoting, both appear as "${1+1}" but the first should
* evaluate to "2" and the second to "${1+1}". Literal \, $ and # need special
* treatment to ensure there is no ambiguity. The JSP attribute unquoting
- * covers \\, \", \', \$, \#, %\>, <\%, ' and "
+ * covers \\, \", \', \$, \#, %\>, <\%, &apos; and &quot;
*/
public class AttributeParser {
@@ -43,13 +43,16 @@
* scripting expressions.
* @param isELIgnored Is expression language being ignored on the page
* where the JSP attribute is defined.
+ * @param isDeferredSyntaxAllowedAsLiteral
+ * Are deferred expressions treated as literals?
* @return An unquoted JSP attribute that, if it contains
* expression language can be safely passed to the EL
* processor without fear of ambiguity.
*/
public static String getUnquoted(String input, char quote,
- boolean isELIgnored) {
+ boolean isELIgnored, boolean isDeferredSyntaxAllowedAsLiteral) {
return (new AttributeParser(input, quote, isELIgnored,
+ isDeferredSyntaxAllowedAsLiteral,
STRICT_QUOTE_ESCAPING)).getUnquoted();
}
@@ -62,15 +65,18 @@
* scripting expressions.
* @param isELIgnored Is expression language being ignored on the page
* where the JSP attribute is defined.
+ * @param isDeferredSyntaxAllowedAsLiteral
+ * Are deferred expressions treated as literals?
* @param strict The value to use for STRICT_QUOTE_ESCAPING.
* @return An unquoted JSP attribute that, if it contains
* expression language can be safely passed to the EL
* processor without fear of ambiguity.
*/
protected static String getUnquoted(String input, char quote,
- boolean isELIgnored, boolean strict) {
+ boolean isELIgnored, boolean isDeferredSyntaxAllowedAsLiteral,
+ boolean strict) {
return (new AttributeParser(input, quote, isELIgnored,
- strict)).getUnquoted();
+ isDeferredSyntaxAllowedAsLiteral, strict)).getUnquoted();
}
/* The quoted input string. */
@@ -83,6 +89,9 @@
* treated as literals rather than quoted values. */
private final boolean isELIgnored;
+ /* Are deferred expression treated as literals */
+ private final boolean isDeferredSyntaxAllowedAsLiteral;
+
/* Overrides the STRICT_QUOTE_ESCAPING. Used for Unit tests only. */
private final boolean strict;
@@ -109,12 +118,15 @@
* @param strict
*/
private AttributeParser(String input, char quote,
- boolean isELIgnored, boolean strict) {
+ boolean isELIgnored, boolean isDeferredSyntaxAllowedAsLiteral,
+ boolean strict) {
this.input = input;
this.quote = quote;
// If quote is null this is a scriptign expressions and any EL syntax
// should be ignored
this.isELIgnored = isELIgnored || (quote == 0);
+ this.isDeferredSyntaxAllowedAsLiteral =
+ isDeferredSyntaxAllowedAsLiteral;
this.strict = strict;
this.type = getType(input);
this.size = input.length();
@@ -151,22 +163,27 @@
char ch = nextChar();
if (!isELIgnored && ch == '\\') {
if (type == 0) {
- type = '$';
+ result.append("\\");
+ } else {
+ result.append(type);
+ result.append("{'\\\\'}");
}
- result.append(type);
- result.append("{'\\\\'}");
} else if (!isELIgnored && ch == '$' && lastChEscaped){
if (type == 0) {
- type = '$';
+ result.append("\\$");
+ } else {
+ result.append(type);
+ result.append("{'$'}");
}
- result.append(type);
- result.append("{'$'}");
} else if (!isELIgnored && ch == '#' && lastChEscaped){
+ // Note if isDeferredSyntaxAllowedAsLiteral==true, \# will
+ // not be treated as an escape
if (type == 0) {
- type = '$';
+ result.append("\\#");
+ } else {
+ result.append(type);
+ result.append("{'#'}");
}
- result.append(type);
- result.append("{'#'}");
} else if (ch == type){
if (i < size) {
char next = input.charAt(i);
@@ -197,8 +214,8 @@
private void parseEL() {
boolean endEL = false;
boolean insideLiteral = false;
+ char literalQuote = 0;
while (i < size && !endEL) {
- char literalQuote = '\'';
char ch = nextChar();
if (ch == '\'' || ch == '\"') {
if (insideLiteral) {
@@ -261,7 +278,10 @@
} else if (ch == '\\' && i + 1 < size) {
ch = input.charAt(i + 1);
if (ch == '\\' || ch == '\"' || ch == '\'' ||
- (!isELIgnored && (ch == '$' || ch == '#'))) {
+ (!isELIgnored &&
+ (ch == '$' ||
+ (!isDeferredSyntaxAllowedAsLiteral &&
+ ch == '#')))) {
i += 2;
lastChEscaped = true;
} else {
@@ -311,13 +331,13 @@
int j = 0;
int len = value.length();
char current;
-
+
while (j < len) {
current = value.charAt(j);
if (current == '\\') {
// Escape character - skip a character
j++;
- } else if (current == '#') {
+ } else if (current == '#' && !isDeferredSyntaxAllowedAsLiteral) {
if (j < (len -1) && value.charAt(j + 1) == '{') {
return '#';
}
Modified: branches/JBOSSWEB_2_1_12_GA_JBPAPP-8108/java/org/apache/jasper/compiler/Parser.java
===================================================================
--- branches/JBOSSWEB_2_1_12_GA_JBPAPP-8108/java/org/apache/jasper/compiler/Parser.java 2012-03-09 11:13:15 UTC (rev 1998)
+++ branches/JBOSSWEB_2_1_12_GA_JBPAPP-8108/java/org/apache/jasper/compiler/Parser.java 2012-03-09 21:44:26 UTC (rev 1999)
@@ -247,7 +247,8 @@
quote = watch.charAt(0);
}
ret = AttributeParser.getUnquoted(reader.getText(start, stop),
- quote, pageInfo.isELIgnored());
+ quote, pageInfo.isELIgnored(),
+ pageInfo.isDeferredSyntaxAllowedAsLiteral());
} catch (IllegalArgumentException iae) {
err.jspError(start, iae.getMessage());
}
Modified: branches/JBOSSWEB_2_1_12_GA_JBPAPP-8108/webapps/docs/changelog.xml
===================================================================
--- branches/JBOSSWEB_2_1_12_GA_JBPAPP-8108/webapps/docs/changelog.xml 2012-03-09 11:13:15 UTC (rev 1998)
+++ branches/JBOSSWEB_2_1_12_GA_JBPAPP-8108/webapps/docs/changelog.xml 2012-03-09 21:44:26 UTC (rev 1999)
@@ -50,6 +50,11 @@
<fix>
EL escaping fixes. (markt)
</fix>
+ <fix>
+ <bug>48627</bug>: Fix regression in re-factored EL parsing. Keep
+ literals as literals and handle deferredSyntaxAllowedAsLiteral.
+ (kkolinko)
+ </fix>
</changelog>
</subsection>
12 years, 9 months
JBossWeb SVN: r1998 - tags.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2012-03-09 06:13:15 -0500 (Fri, 09 Mar 2012)
New Revision: 1998
Added:
tags/JBOSSWEB_7_0_13_FINAL/
Log:
Web 7.0.13.
12 years, 9 months
JBossWeb SVN: r1997 - in branches/7.0.x: webapps/docs and 1 other directory.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2012-03-09 06:12:07 -0500 (Fri, 09 Mar 2012)
New Revision: 1997
Modified:
branches/7.0.x/java/org/apache/tomcat/util/http/Parameters.java
branches/7.0.x/webapps/docs/changelog.xml
Log:
JBWEB-234: Fix passing encoding parameter, missed during rebase. Submitted by Philippe Guinot.
Modified: branches/7.0.x/java/org/apache/tomcat/util/http/Parameters.java
===================================================================
--- branches/7.0.x/java/org/apache/tomcat/util/http/Parameters.java 2012-03-09 11:09:43 UTC (rev 1996)
+++ branches/7.0.x/java/org/apache/tomcat/util/http/Parameters.java 2012-03-09 11:12:07 UTC (rev 1997)
@@ -226,7 +226,7 @@
public void processParameters( byte bytes[], int start, int len ) {
- processParameters(bytes, start, len, null);
+ processParameters(bytes, start, len, encoding);
}
private void processParameters(byte bytes[], int start, int len, String enc) {
Modified: branches/7.0.x/webapps/docs/changelog.xml
===================================================================
--- branches/7.0.x/webapps/docs/changelog.xml 2012-03-09 11:09:43 UTC (rev 1996)
+++ branches/7.0.x/webapps/docs/changelog.xml 2012-03-09 11:12:07 UTC (rev 1997)
@@ -22,6 +22,9 @@
<fix>
<jboss-jira>AS7-3851</jboss-jira>: Cleanup IPv6 logging. (remm)
</fix>
+ <fix>
+ <jira>234</jira>: Fix parameters encoding processing issue introduced when rebasing. (remm)
+ </fix>
</changelog>
</subsection>
</section>
12 years, 9 months
JBossWeb SVN: r1996 - in trunk: webapps/docs and 1 other directory.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2012-03-09 06:09:43 -0500 (Fri, 09 Mar 2012)
New Revision: 1996
Modified:
trunk/java/org/apache/tomcat/util/http/Parameters.java
trunk/webapps/docs/changelog.xml
Log:
JBWEB-234: Fix passing encoding parameter, missed during rebase. Submitted by Philippe Guinot.
Modified: trunk/java/org/apache/tomcat/util/http/Parameters.java
===================================================================
--- trunk/java/org/apache/tomcat/util/http/Parameters.java 2012-03-07 16:21:16 UTC (rev 1995)
+++ trunk/java/org/apache/tomcat/util/http/Parameters.java 2012-03-09 11:09:43 UTC (rev 1996)
@@ -226,7 +226,7 @@
public void processParameters( byte bytes[], int start, int len ) {
- processParameters(bytes, start, len, null);
+ processParameters(bytes, start, len, encoding);
}
private void processParameters(byte bytes[], int start, int len, String enc) {
Modified: trunk/webapps/docs/changelog.xml
===================================================================
--- trunk/webapps/docs/changelog.xml 2012-03-07 16:21:16 UTC (rev 1995)
+++ trunk/webapps/docs/changelog.xml 2012-03-09 11:09:43 UTC (rev 1996)
@@ -22,6 +22,9 @@
<fix>
<jboss-jira>AS7-3851</jboss-jira>: Cleanup IPv6 logging. (remm)
</fix>
+ <fix>
+ <jira>234</jira>: Fix parameters encoding processing issue introduced when rebasing. (remm)
+ </fix>
</changelog>
</subsection>
</section>
12 years, 9 months
JBossWeb SVN: r1995 - in trunk: java/org/apache/coyote/http11 and 1 other directories.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2012-03-07 11:21:16 -0500 (Wed, 07 Mar 2012)
New Revision: 1995
Modified:
trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
trunk/java/org/apache/coyote/ajp/AjpProtocol.java
trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
trunk/java/org/apache/coyote/http11/Http11Protocol.java
trunk/webapps/docs/changelog.xml
Log:
AS7-3851: Cleanup IPv6 logging.
Modified: trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
===================================================================
--- trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java 2012-03-07 16:20:42 UTC (rev 1994)
+++ trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java 2012-03-07 16:21:16 UTC (rev 1995)
@@ -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: trunk/java/org/apache/coyote/ajp/AjpProtocol.java
===================================================================
--- trunk/java/org/apache/coyote/ajp/AjpProtocol.java 2012-03-07 16:20:42 UTC (rev 1994)
+++ trunk/java/org/apache/coyote/ajp/AjpProtocol.java 2012-03-07 16:21:16 UTC (rev 1995)
@@ -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: trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
===================================================================
--- trunk/java/org/apache/coyote/http11/Http11AprProtocol.java 2012-03-07 16:20:42 UTC (rev 1994)
+++ trunk/java/org/apache/coyote/http11/Http11AprProtocol.java 2012-03-07 16:21:16 UTC (rev 1995)
@@ -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: trunk/java/org/apache/coyote/http11/Http11Protocol.java
===================================================================
--- trunk/java/org/apache/coyote/http11/Http11Protocol.java 2012-03-07 16:20:42 UTC (rev 1994)
+++ trunk/java/org/apache/coyote/http11/Http11Protocol.java 2012-03-07 16:21:16 UTC (rev 1995)
@@ -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: trunk/webapps/docs/changelog.xml
===================================================================
--- trunk/webapps/docs/changelog.xml 2012-03-07 16:20:42 UTC (rev 1994)
+++ trunk/webapps/docs/changelog.xml 2012-03-07 16:21:16 UTC (rev 1995)
@@ -16,6 +16,16 @@
<body>
+<section name="JBoss Web 7.2.0.Alpha1 (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>
12 years, 10 months
JBossWeb SVN: r1994 - in branches/7.0.x: java/org/apache/coyote/http11 and 1 other directories.
by jbossweb-commits＠lists.jboss.org
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>
12 years, 10 months
JBossWeb SVN: r1993 - branches.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2012-03-05 09:38:44 -0500 (Mon, 05 Mar 2012)
New Revision: 1993
Added:
branches/7.0.x/
Log:
7.0.x maintenance branch. Trunk will have the 7.2.x version number.
12 years, 10 months
JBossWeb SVN: r1992 - tags.
by jbossweb-commits＠lists.jboss.org
Author: remy.maucherat(a)jboss.com
Date: 2012-03-02 10:52:31 -0500 (Fri, 02 Mar 2012)
New Revision: 1992
Added:
tags/JBOSSWEB_7_0_12_FINAL/
Log:
Web 7.0.12.
12 years, 10 months