[Bug 56334] New: Double Backslash Escaping in Attributes
https://issues.apache.org/bugzilla/show_bug.cgi?id=56334
Bug ID: 56334
Summary: Double Backslash Escaping in Attributes
Product: Tomcat 7
Version: 7.0.52
Hardware: PC
Status: NEW
Severity: normal
Priority: P2
Component: Jasper
Assignee: dev@tomcat.apache.org
Reporter: p...@chamaeleon.de
Created attachment 31462
-- https://issues.apache.org/bugzilla/attachment.cgi?id=31462action=edit
WAR file to reproduce exception
EL expressions in jspx-files are Java-String-backslash-decoded twice when
they're part of static template text. They're even decoded twice when they're
part of certain JSP-Tag attributes, but they're only decoded once during
processing when part of a JSTL tag attribute:
!-- Works as expected yielding \?resize as value of asd --
c:set var=asd value=${'\\?resize'} /
!-- Won't work, but should --
set data-value=${'\\?resize'} /
!-- dito --
jsp:element name=${'\\?resize'}/jsp:element
!-- Works, but yields actually invalid results --
set data-value=${'?resize'} /
During JSP compiling the following exception is thrown (taken from Tomcat log):
Apr 01, 2014 10:51:31 AM org.apache.catalina.core.StandardWrapperValve invoke
Schwerwiegend: Servlet.service() for servlet [jsp] in context with path
[/tomcat_test] threw exception [/index.jspx (line: 12, column: 37)
${'\\?resize'} contains invalid expression(s): javax.el.ELException: Failed
to parse the expression [${'\?resize'}]] with root cause
org.apache.jasper.JasperException: /index.jspx (line: 12, column: 37)
${'\\?resize'} contains invalid expression(s): javax.el.ELException: Failed
to parse the expression [${'\?resize'}]
at
org.apache.jasper.compiler.DefaultErrorHandler.jspError(DefaultErrorHandler.java:42)
at
org.apache.jasper.compiler.ErrorDispatcher.dispatch(ErrorDispatcher.java:443)
at
org.apache.jasper.compiler.ErrorDispatcher.jspError(ErrorDispatcher.java:199)
at
org.apache.jasper.compiler.Validator$ValidateVisitor.getJspAttribute(Validator.java:1399)
at
org.apache.jasper.compiler.Validator$ValidateVisitor.visit(Validator.java:772)
at org.apache.jasper.compiler.Node$UninterpretedTag.accept(Node.java:1251)
at org.apache.jasper.compiler.Node$Nodes.visit(Node.java:2375)
at org.apache.jasper.compiler.Node$Visitor.visitBody(Node.java:2427)
at
org.apache.jasper.compiler.Validator$ValidateVisitor.visit(Validator.java:529)
at org.apache.jasper.compiler.Node$JspRoot.accept(Node.java:564)
at org.apache.jasper.compiler.Node$Nodes.visit(Node.java:2375)
at org.apache.jasper.compiler.Node$Visitor.visitBody(Node.java:2427)
at org.apache.jasper.compiler.Node$Visitor.visit(Node.java:2433)
at org.apache.jasper.compiler.Node$Root.accept(Node.java:474)
at org.apache.jasper.compiler.Node$Nodes.visit(Node.java:2375)
at
org.apache.jasper.compiler.Validator.validateExDirectives(Validator.java:1817)
at org.apache.jasper.compiler.Compiler.generateJava(Compiler.java:217)
at org.apache.jasper.compiler.Compiler.compile(Compiler.java:373)
at org.apache.jasper.compiler.Compiler.compile(Compiler.java:353)
at org.apache.jasper.compiler.Compiler.compile(Compiler.java:340) [...]
As you can see the \\ get processed to \ between the output of the line
information and the actual EL parsing.
In tomcat 7.0.27 the above examples work and produce the correct output.
--
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 55696] mod_jk crash in jk_map_get_int()
https://issues.apache.org/bugzilla/show_bug.cgi?id=55696
--- Comment #13 from Rainer Jung rainer.j...@kippdata.de ---
A more minimalistic patch would be (untested yet):
Index: common/jk_map.c
===
--- common/jk_map.c (revision 1583423)
+++ common/jk_map.c (working copy)
@@ -206,7 +206,6 @@
const char *rc;
size_t len;
int int_res;
-int multit = 1;
sprintf(buf, %d, def);
rc = jk_map_get_string(m, name, buf);
@@ -213,22 +212,21 @@
len = strlen(rc);
if (len) {
-char *lastchar = buf[0] + len - 1;
-strcpy(buf, rc);
+const char *lastchar = rc[0] + len - 1;
+int multit = 1;
if ('m' == *lastchar || 'M' == *lastchar) {
-*lastchar = '\0';
multit = 1024 * 1024;
}
else if ('k' == *lastchar || 'K' == *lastchar) {
-*lastchar = '\0';
multit = 1024;
}
-int_res = atoi(buf);
+/* Safe because atoi() will stop at any non-numeric lastchar */
+int_res = atoi(rc) * multit;
}
else
int_res = def;
-return int_res * multit;
+return int_res;
}
double jk_map_get_double(jk_map_t *m, const char *name, double def)
The only reason for using a copy of rc seems to be that we terminate the string
after the number in case there was a scaling character (k or M etc.). But
atoi should stop converting to a number when detecting such a character anyhow,
so we don't nee to overwrite it with a zero byte and thus can operate on the
original rc. No string copy, no overlap.
Moving the use of multit completely to the non-default value block because it
is a bit misleading to multiply in the default case (factor was 1 there).
--
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1583726 - in /tomcat/jk/trunk: native/common/jk_map.c xdocs/miscellaneous/changelog.xml
Author: rjung
Date: Tue Apr 1 16:10:55 2014
New Revision: 1583726
URL: http://svn.apache.org/r1583726
Log:
BZ 55696: Fix crash on Mac OS X 10.9 during config
parsing.
Modified:
tomcat/jk/trunk/native/common/jk_map.c
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
Modified: tomcat/jk/trunk/native/common/jk_map.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_map.c?rev=1583726r1=1583725r2=1583726view=diff
==
--- tomcat/jk/trunk/native/common/jk_map.c (original)
+++ tomcat/jk/trunk/native/common/jk_map.c Tue Apr 1 16:10:55 2014
@@ -206,29 +206,27 @@ int jk_map_get_int(jk_map_t *m, const ch
const char *rc;
size_t len;
int int_res;
-int multit = 1;
sprintf(buf, %d, def);
rc = jk_map_get_string(m, name, buf);
len = strlen(rc);
if (len) {
-char *lastchar = buf[0] + len - 1;
-strcpy(buf, rc);
+const char *lastchar = rc[0] + len - 1;
+int multit = 1;
if ('m' == *lastchar || 'M' == *lastchar) {
-*lastchar = '\0';
multit = 1024 * 1024;
}
else if ('k' == *lastchar || 'K' == *lastchar) {
-*lastchar = '\0';
multit = 1024;
}
-int_res = atoi(buf);
+/* Safe because atoi() will stop at any non-numeric lastchar */
+int_res = atoi(rc) * multit;
}
else
int_res = def;
-return int_res * multit;
+return int_res;
}
double jk_map_get_double(jk_map_t *m, const char *name, double def)
Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1583726r1=1583725r2=1583726view=diff
==
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Tue Apr 1 16:10:55 2014
@@ -57,6 +57,10 @@
fix
bug53542/bug: ISAPI: Fix grammar in 503 error page. (rjung)
/fix
+ fix
+bug55696/bug: Crash on Mac OS X 10.9 during config parsing.
+(rjung)
+ /fix
/changelog
/subsection
/section
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 55696] mod_jk crash in jk_map_get_int()
https://issues.apache.org/bugzilla/show_bug.cgi?id=55696 --- Comment #14 from Rainer Jung rainer.j...@kippdata.de --- Fixed in 1583726. Will be part of version 1.2.40. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 55696] mod_jk crash in jk_map_get_int()
https://issues.apache.org/bugzilla/show_bug.cgi?id=55696 Rainer Jung rainer.j...@kippdata.de changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1583731 - in /tomcat/trunk: java/org/apache/tomcat/util/net/Nio2Endpoint.java webapps/docs/changelog.xml
Author: remm
Date: Tue Apr 1 16:37:24 2014
New Revision: 1583731
URL: http://svn.apache.org/r1583731
Log:
Cleanup waiting async connections on shutdown, to avoid any abrupt close if
everything is well behaved.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1583731r1=1583730r2=1583731view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Tue Apr 1
16:37:24 2014
@@ -385,11 +385,23 @@ public class Nio2Endpoint extends Abstra
running = false;
unlockAccept();
}
-try {
-handler.closeAll();
-} catch (Throwable t) {
-ExceptionUtils.handleThrowable(t);
-}
+// Use the executor to avoid binding the main thread if something bad
+// occurs and unbind will also wait for a bit for it to complete
+getExecutor().execute(new Runnable() {
+@Override
+public void run() {
+// Timeout any pending async request
+for (SocketWrapperNio2Channel socket :
waitingRequests.keySet()) {
+processSocket(socket, SocketStatus.TIMEOUT, false);
+}
+// Then close all active connections if any remains
+try {
+handler.closeAll();
+} catch (Throwable t) {
+ExceptionUtils.handleThrowable(t);
+}
+}
+});
if (useCaches) {
socketWrapperCache.clear();
nioChannels.clear();
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1583731r1=1583730r2=1583731view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Apr 1 16:37:24 2014
@@ -72,6 +72,13 @@
/fix
/changelog
/subsection
+ subsection name=Coyote
+changelog
+ fix
+More cleanup of NIO2 endpoint shutdown. (remm)
+ /fix
+/changelog
+ /subsection
subsection name=Cluster
changelog
scode
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1583762 - in /tomcat/site/trunk: ./ docs/ xdocs/
Author: violetagg Date: Tue Apr 1 19:23:27 2014 New Revision: 1583762 URL: http://svn.apache.org/r1583762 Log: Updates (excluding docs) for 7.0.53 release Modified: tomcat/site/trunk/build.properties.default tomcat/site/trunk/docs/doap_Tomcat.rdf tomcat/site/trunk/docs/download-70.html tomcat/site/trunk/docs/index.html tomcat/site/trunk/docs/migration-7.html tomcat/site/trunk/docs/oldnews.html tomcat/site/trunk/docs/whichversion.html tomcat/site/trunk/xdocs/doap_Tomcat.rdf tomcat/site/trunk/xdocs/download-70.xml tomcat/site/trunk/xdocs/index.xml tomcat/site/trunk/xdocs/migration-7.xml tomcat/site/trunk/xdocs/oldnews.xml tomcat/site/trunk/xdocs/whichversion.xml Modified: tomcat/site/trunk/build.properties.default URL: http://svn.apache.org/viewvc/tomcat/site/trunk/build.properties.default?rev=1583762r1=1583761r2=1583762view=diff == --- tomcat/site/trunk/build.properties.default (original) +++ tomcat/site/trunk/build.properties.default Tue Apr 1 19:23:27 2014 @@ -37,7 +37,7 @@ tomcat.loc=http://www.apache.org/dist/to # - Tomcat versions - tomcat60=6.0.39 -tomcat70=7.0.52 +tomcat70=7.0.53 tomcat80=8.0.5 Modified: tomcat/site/trunk/docs/doap_Tomcat.rdf URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/doap_Tomcat.rdf?rev=1583762r1=1583761r2=1583762view=diff == --- tomcat/site/trunk/docs/doap_Tomcat.rdf (original) +++ tomcat/site/trunk/docs/doap_Tomcat.rdf Tue Apr 1 19:23:27 2014 @@ -64,8 +64,8 @@ release Version nameLatest Stable 7.0.x Release/name -created2014-02-17/created -revision7.0.52/revision +created2014-03-30/created +revision7.0.53/revision /Version /release release Modified: tomcat/site/trunk/docs/download-70.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-70.html?rev=1583762r1=1583761r2=1583762view=diff == --- tomcat/site/trunk/docs/download-70.html (original) +++ tomcat/site/trunk/docs/download-70.html Tue Apr 1 19:23:27 2014 @@ -204,8 +204,8 @@ div class=text a href=https://www.apache.org/dist/tomcat/tomcat-7/KEYS;KEYS/a | -a href=#7.0.527.0.52/a | -a href=[preferred]tomcat/tomcat-7/v7.0.52 rel=nofollowBrowse/a | +a href=#7.0.537.0.53/a | +a href=[preferred]tomcat/tomcat-7/v7.0.53 rel=nofollowBrowse/a | a href=http://archive.apache.org/dist/tomcat/tomcat-7;Archives/a /div @@ -251,12 +251,12 @@ /div -h3 id=7.0.527.0.52/h3 +h3 id=7.0.537.0.53/h3 div class=text p Please see the - a href=[preferred]tomcat/tomcat-7/v7.0.52/README.html rel=nofollowREADME/a + a href=[preferred]tomcat/tomcat-7/v7.0.53/README.html rel=nofollowREADME/a file for packaging information. It explains what every distribution contains. /p @@ -272,44 +272,44 @@ li -a href=[preferred]tomcat/tomcat-7/v7.0.52/bin/apache-tomcat-7.0.52.zip rel=nofollowzip/a -(a href=https://www.apache.org/dist/tomcat/tomcat-7/v7.0.52/bin/apache-tomcat-7.0.52.zip.asc;pgp/a, -a href=https://www.apache.org/dist/tomcat/tomcat-7/v7.0.52/bin/apache-tomcat-7.0.52.zip.md5;md5/a) +a href=[preferred]tomcat/tomcat-7/v7.0.53/bin/apache-tomcat-7.0.53.zip rel=nofollowzip/a +(a href=https://www.apache.org/dist/tomcat/tomcat-7/v7.0.53/bin/apache-tomcat-7.0.53.zip.asc;pgp/a, +a href=https://www.apache.org/dist/tomcat/tomcat-7/v7.0.53/bin/apache-tomcat-7.0.53.zip.md5;md5/a) /li li -a href=[preferred]tomcat/tomcat-7/v7.0.52/bin/apache-tomcat-7.0.52.tar.gz rel=nofollowtar.gz/a -(a href=https://www.apache.org/dist/tomcat/tomcat-7/v7.0.52/bin/apache-tomcat-7.0.52.tar.gz.asc;pgp/a, -a href=https://www.apache.org/dist/tomcat/tomcat-7/v7.0.52/bin/apache-tomcat-7.0.52.tar.gz.md5;md5/a) +a href=[preferred]tomcat/tomcat-7/v7.0.53/bin/apache-tomcat-7.0.53.tar.gz rel=nofollowtar.gz/a +(a href=https://www.apache.org/dist/tomcat/tomcat-7/v7.0.53/bin/apache-tomcat-7.0.53.tar.gz.asc;pgp/a, +a href=https://www.apache.org/dist/tomcat/tomcat-7/v7.0.53/bin/apache-tomcat-7.0.53.tar.gz.md5;md5/a) /li li -a href=[preferred]tomcat/tomcat-7/v7.0.52/bin/apache-tomcat-7.0.52-windows-x86.zip rel=nofollow32-bit Windows zip/a -(a href=https://www.apache.org/dist/tomcat/tomcat-7/v7.0.52/bin/apache-tomcat-7.0.52-windows-x86.zip.asc;pgp/a, -a href=https://www.apache.org/dist/tomcat/tomcat-7/v7.0.52/bin/apache-tomcat-7.0.52-windows-x86.zip.md5;md5/a) +a
[Bug 56336] New: IndexOutOfBoundsException in the AjpNio2Processor.output() method
https://issues.apache.org/bugzilla/show_bug.cgi?id=56336 Bug ID: 56336 Summary: IndexOutOfBoundsException in the AjpNio2Processor.output() method Product: Tomcat 8 Version: trunk Hardware: PC OS: Linux Status: NEW Severity: normal Priority: P2 Component: Connectors Assignee: dev@tomcat.apache.org Reporter: bdeva...@docfinity.com Generated with the NIO2 protocol in the connector. The same code using tomcat with HTTP/1.1 and AJP/1.3 in the connector worked correctly. java.lang.IndexOutOfBoundsException at java.nio.Buffer.checkBounds(Buffer.java:559) at java.nio.HeapByteBuffer.put(HeapByteBuffer.java:181) at org.apache.coyote.ajp.AjpNio2Processor.output(AjpNio2Processor.java:158) at org.apache.coyote.ajp.AbstractAjpProcessor.writeResponseMessage(AbstractAjpProcessor.java:1658) at org.apache.coyote.ajp.AbstractAjpProcessor.writeData(AbstractAjpProcessor.java:1577) at org.apache.coyote.ajp.AbstractAjpProcessor.access$200(AbstractAjpProcessor.java:62) at org.apache.coyote.ajp.AbstractAjpProcessor$SocketOutputBuffer.doWrite(AbstractAjpProcessor.java:1725) at org.apache.coyote.Response.doWrite(Response.java:523) at org.apache.catalina.connector.OutputBuffer.realWriteBytes(OutputBuffer.java:391) at org.apache.tomcat.util.buf.ByteChunk.append(ByteChunk.java:344) at org.apache.catalina.connector.OutputBuffer.writeBytes(OutputBuffer.java:421) at org.apache.catalina.connector.OutputBuffer.write(OutputBuffer.java:409) at org.apache.catalina.connector.CoyoteOutputStream.write(CoyoteOutputStream.java:97) at java.io.DataOutputStream.write(DataOutputStream.java:107) at java.io.FilterOutputStream.write(FilterOutputStream.java:97) -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1583767 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Author: violetagg Date: Tue Apr 1 19:47:16 2014 New Revision: 1583767 URL: http://svn.apache.org/r1583767 Log: Add release date for 7.0.53 Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1583767r1=1583766r2=1583767view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Apr 1 19:47:16 2014 @@ -89,7 +89,7 @@ /changelog /subsection /section -section name=Tomcat 7.0.53 (violetagg) +section name=Tomcat 7.0.53 (violetagg) rtext=released 2014-03-30 subsection name=Catalina changelog add - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r4928 - /release/tomcat/tomcat-7/v7.0.52/
Author: violetagg Date: Tue Apr 1 19:51:14 2014 New Revision: 4928 Log: Remove 7.0.52 Removed: release/tomcat/tomcat-7/v7.0.52/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1583776 - in /tomcat/site/trunk/docs/tomcat-7.0-doc: ./ api/ api/org/apache/catalina/ api/org/apache/catalina/ant/ api/org/apache/catalina/ant/jmx/ api/org/apache/catalina/authenticator/
Author: violetagg Date: Tue Apr 1 20:29:41 2014 New Revision: 1583776 URL: http://svn.apache.org/r1583776 Log: Update docs for Apache Tomcat 7.0.53 release. [This commit notification would consist of 62 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.] - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[ANN] Apache Tomcat 7.0.53 released
The Apache Tomcat team announces the immediate availability of Apache Tomcat 7.0.53. Apache Tomcat is an open source software implementation of the Java Servlet, JavaServer Pages, Java Expression Language and Java WebSocket technologies. This release contains a number of bug fixes and improvements compared to version 7.0.52. The notable changes since 7.0.52 include: - Update the Eclipse JDT compiler to enable full Java 8 support in JSPs. Please refer to the change log for the complete list of changes: http://tomcat.apache.org/tomcat-7.0-doc/changelog.html Note: This version has 4 zip binaries: a generic one and three bundled with Tomcat native binaries for Windows operating systems running on different CPU architectures. Note: Use of the JSR-356 Java WebSocket 1.0 implementation requires Java 7. Note: If you use the APR/native AJP or HTTP connector you *must* upgrade to version 1.1.29 or later of the APR/native library. Downloads: http://tomcat.apache.org/download-70.cgi Migration guides from Apache Tomcat 5.5.x and 6.0.x: http://tomcat.apache.org/migration.html - The Apache Tomcat team
svn commit: r1583814 - in /tomcat/trunk: java/org/apache/coyote/ajp/AbstractAjpProcessor.java webapps/docs/changelog.xml
Author: remm
Date: Tue Apr 1 22:41:54 2014
New Revision: 1583814
URL: http://svn.apache.org/r1583814
Log:
56336: Fix apparent AJP output issue [untested and unverified, no test case].
Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java?rev=1583814r1=1583813r2=1583814view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java Tue Apr
1 22:41:54 2014
@@ -1656,7 +1656,7 @@ public abstract class AbstractAjpProcess
while (written 0 responseMsgPos len) {
written = output(
-responseMessage.getBuffer(), responseMsgPos, len, block);
+responseMessage.getBuffer(), responseMsgPos, len -
responseMsgPos, block);
responseMsgPos += written;
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1583814r1=1583813r2=1583814view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Apr 1 22:41:54 2014
@@ -77,6 +77,9 @@
fix
More cleanup of NIO2 endpoint shutdown. (remm)
/fix
+ fix
+bug56336/bug: AJP output corruption and errors. (remm)
+ /fix
/changelog
/subsection
subsection name=Cluster
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1583815 - in /tomcat/trunk/java/org/apache/tomcat/util/net: Nio2Endpoint.java SecureNio2Channel.java
Author: remm
Date: Tue Apr 1 22:42:15 2014
New Revision: 1583815
URL: http://svn.apache.org/r1583815
Log:
Remove useless methods.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java?rev=1583815r1=1583814r2=1583815view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Tue Apr 1
22:42:15 2014
@@ -853,8 +853,6 @@ public class Nio2Endpoint extends Abstra
}
@Override
-public ByteBuffer expand(ByteBuffer buffer, int remaining) {return
buffer;}
-@Override
public ByteBuffer getReadBuffer() {return readbuf;}
@Override
public ByteBuffer getWriteBuffer() {return writebuf;}
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java?rev=1583815r1=1583814r2=1583815view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java Tue Apr
1 22:42:15 2014
@@ -963,7 +963,6 @@ public class SecureNio2Channel extends N
* when buffer overflow exceptions happen
*/
public static interface ApplicationBufferHandler {
-public ByteBuffer expand(ByteBuffer buffer, int remaining);
public ByteBuffer getReadBuffer();
public ByteBuffer getWriteBuffer();
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56336] IndexOutOfBoundsException in the AjpNio2Processor.output() method
https://issues.apache.org/bugzilla/show_bug.cgi?id=56336 --- Comment #1 from Remy Maucherat r...@apache.org --- The AJP connector is really heavy on code reuse, so the NIO2 code that is used here is identical to the NIO1 code (and the shared code looks like it's only working by accident, so I'll try to fix it http://svn.apache.org/r1583814 ). You could investigate and debug to see why this exception occurs or test the fix. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1583822 - /tomcat/maven-plugin/trunk/pom.xml
Author: olamy Date: Tue Apr 1 23:10:00 2014 New Revision: 1583822 URL: http://svn.apache.org/r1583822 Log: use ecj 4.3.1 Modified: tomcat/maven-plugin/trunk/pom.xml Modified: tomcat/maven-plugin/trunk/pom.xml URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/pom.xml?rev=1583822r1=1583821r2=1583822view=diff == --- tomcat/maven-plugin/trunk/pom.xml (original) +++ tomcat/maven-plugin/trunk/pom.xml Tue Apr 1 23:10:00 2014 @@ -307,7 +307,7 @@ dependency groupIdorg.eclipse.jdt.core.compiler/groupId artifactIdecj/artifactId -version4.2.2/version +version4.3.1/version /dependency dependency - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1583821 - /tomcat/maven-plugin/trunk/pom.xml
Author: olamy Date: Tue Apr 1 23:09:55 2014 New Revision: 1583821 URL: http://svn.apache.org/r1583821 Log: tomcat 7.0.53 Modified: tomcat/maven-plugin/trunk/pom.xml Modified: tomcat/maven-plugin/trunk/pom.xml URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/pom.xml?rev=1583821r1=1583820r2=1583821view=diff == --- tomcat/maven-plugin/trunk/pom.xml (original) +++ tomcat/maven-plugin/trunk/pom.xml Tue Apr 1 23:09:55 2014 @@ -73,7 +73,7 @@ its.ajp.port2001/its.ajp.port !-- server port for it tests -- its.server.port2008/its.server.port -tomcat7Version7.0.50/tomcat7Version +tomcat7Version7.0.53/tomcat7Version !-- to prevent isssues with last apache parent pom -- arguments / - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 55483] ELException when object has overloaded methods
https://issues.apache.org/bugzilla/show_bug.cgi?id=55483
--- Comment #4 from Eugene Chung (TmaxSoft) bluewolf.ch...@gmail.com ---
org.apache.el.util.ReflectionUtil#getMethod(java.lang.Object, java.lang.Object,
java.lang.Class?[], java.lang.Object[])
// If a method is found where every parameter matches exactly,
// return it
if (exactMatch == paramCount) {
getMethod(base.getClass(), m);
}
I haven't fully understand the recent patches but I think it should be
return getMethod(base.getClass(), m);
as the comment says.
--
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
