[GUMP@vmgump]: Project tomcat-taglibs-standard (in module tomcat-taglibs) failed

2012-09-05 Thread Gump
To whom it may engage...

This is an automated request, but not an unsolicited one. For 
more information please visit http://gump.apache.org/nagged.html, 
and/or contact the folk at gene...@gump.apache.org.

Project tomcat-taglibs-standard has an issue affecting its community 
integration.
This issue affects 2 projects,
 and has been outstanding for 55 runs.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- tomcat-taglibs-standard :  Standard Taglib
- tomcat-taglibs-standard-install :  JSP Taglibs


Full details are available at:

http://vmgump.apache.org/gump/public/tomcat-taglibs/tomcat-taglibs-standard/index.html

That said, some information snippets are provided here.

The following annotations (debug/informational/warning/error messages) were 
provided:
 -INFO- Optional dependency httpunit failed with reason build failed
 -DEBUG- (Apache Gump generated) Apache Maven Settings in: 
/srv/gump/public/workspace/tomcat-taglibs/standard/gump_mvn_settings.xml
 -INFO- Failed with reason build failed
 -DEBUG- Maven POM in: 
/srv/gump/public/workspace/tomcat-taglibs/standard/pom.xml
 -INFO- Failed to extract fallback artifacts from Gump Repository



The following work was performed:
http://vmgump.apache.org/gump/public/tomcat-taglibs/tomcat-taglibs-standard/gump_work/build_tomcat-taglibs_tomcat-taglibs-standard.html
Work Name: build_tomcat-taglibs_tomcat-taglibs-standard (Type: Build)
Work ended in a state of : Failed
Elapsed: 21 secs
Command Line: /opt/maven2/bin/mvn --batch-mode -DskipTests=true --settings 
/srv/gump/public/workspace/tomcat-taglibs/standard/gump_mvn_settings.xml 
install 
[Working Directory: /srv/gump/public/workspace/tomcat-taglibs/standard]
M2_HOME: /opt/maven2
-
[INFO] [compiler:compile {execution: default-compile}]
[INFO] Nothing to compile - all classes are up to date
[debug] execute contextualize
[INFO] [resources:testResources {execution: default-testResources}]
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 
/srv/gump/public/workspace/tomcat-taglibs/standard/spec/src/test/resources
[INFO] Copying 3 resources
[INFO] [compiler:testCompile {execution: default-testCompile}]
[INFO] No sources to compile
[INFO] [surefire:test {execution: default-test}]
[INFO] Tests are skipped.
[INFO] [bundle:bundle {execution: default-bundle}]
[INFO] [install:install {execution: default-install}]
[INFO] Installing 
/srv/gump/public/workspace/tomcat-taglibs/standard/spec/target/taglibs-standard-spec-1.2-SNAPSHOT.jar
 to 
/srv/gump/public/workspace/mvnlocalrepo/shared/org/apache/taglibs/taglibs-standard-spec/1.2-SNAPSHOT/taglibs-standard-spec-1.2-SNAPSHOT.jar
[INFO] [bundle:install {execution: default-install}]
[INFO] Parsing 
file:/srv/gump/public/workspace/mvnlocalrepo/shared/repository.xml
[INFO] Installing 
org/apache/taglibs/taglibs-standard-spec/1.2-SNAPSHOT/taglibs-standard-spec-1.2-SNAPSHOT.jar
[INFO] Writing OBR metadata
[INFO] 
[INFO] Building JSTL Implementation
[INFO]task-segment: [install]
[INFO] 
[INFO] [remote-resources:process {execution: default}]
[INFO] snapshot org.apache.taglibs:taglibs-standard-spec:1.2-SNAPSHOT: checking 
for updates from apache.snapshots
[debug] execute contextualize
[INFO] [resources:resources {execution: default-resources}]
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 14 resources
[INFO] Copying 3 resources
[INFO] [compiler:compile {execution: default-compile}]
[INFO] Compiling 96 source files to 
/srv/gump/public/workspace/tomcat-taglibs/standard/impl/target/classes
[INFO] -
[ERROR] COMPILATION ERROR : 
[INFO] -
[ERROR] 
/srv/gump/public/workspace/tomcat-taglibs/standard/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java:[38,7]
 error: DataSourceWrapper is not abstract and does not override abstract method 
getParentLogger() in CommonDataSource
[INFO] 1 error
[INFO] -
[INFO] 
[ERROR] BUILD FAILURE
[INFO] 
[INFO] Compilation failure
/srv/gump/public/workspace/tomcat-taglibs/standard/impl/src/main/java/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java:[38,7]
 error: DataSourceWrapper is not abstract and does not override abstract method 
getParentLogger() in CommonDataSource

[INFO] 
[INFO] For more information, run Maven with the -e switch
[INFO] ---

svn commit: r1381035 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/catalina/realm/RealmBase.java webapps/docs/changelog.xml

2012-09-05 Thread kkolinko
Author: kkolinko
Date: Wed Sep  5 07:10:10 2012
New Revision: 1381035

URL: http://svn.apache.org/viewvc?rev=1381035&view=rev
Log:
Backport revision 1377887 from tomcat/trunk:
Remove unneeded handling of FORM authentication in RealmBase.

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1381035&r1=1381034&r2=1381035&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Sep  5 07:10:10 2012
@@ -142,12 +142,6 @@ PATCHES PROPOSED TO BACKPORT:
   +1: kkolinko, kfujino, jfclere
   -1:
 
-* Remove unneeded handling of FORM authentication in RealmBase
-  http://svn.apache.org/viewvc?rev=1377887&view=rev
-  (r1377892 in 7.0)
-  +1: kkolinko, kfujino, jfclere
-  -1:
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53793
   Change links on the list of applications in the Manager to point to
   '/appname/' instead of '/appname'.

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java?rev=1381035&r1=1381034&r2=1381035&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java Wed Sep  
5 07:10:10 2012
@@ -45,7 +45,6 @@ import org.apache.catalina.Realm;
 import org.apache.catalina.connector.Request;
 import org.apache.catalina.connector.Response;
 import org.apache.catalina.core.ContainerBase;
-import org.apache.catalina.deploy.LoginConfig;
 import org.apache.catalina.deploy.SecurityConstraint;
 import org.apache.catalina.deploy.SecurityCollection;
 import org.apache.catalina.util.HexUtils;
@@ -766,31 +765,6 @@ public abstract class RealmBase
 if (constraints == null || constraints.length == 0)
 return (true);
 
-// Specifically allow access to the form login and form error pages
-// and the "j_security_check" action
-LoginConfig config = context.getLoginConfig();
-if ((config != null) &&
-(Constants.FORM_METHOD.equals(config.getAuthMethod( {
-String requestURI = request.getRequestPathMB().toString();
-String loginPage = config.getLoginPage();
-if (loginPage.equals(requestURI)) {
-if (log.isDebugEnabled())
-log.debug(" Allow access to login page " + loginPage);
-return (true);
-}
-String errorPage = config.getErrorPage();
-if (errorPage.equals(requestURI)) {
-if (log.isDebugEnabled())
-log.debug(" Allow access to error page " + errorPage);
-return (true);
-}
-if (requestURI.endsWith(Constants.FORM_ACTION)) {
-if (log.isDebugEnabled())
-log.debug(" Allow access to username/password submission");
-return (true);
-}
-}
-
 // Which user principal have we already authenticated?
 Principal principal = request.getPrincipal();
 boolean status = false;

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1381035&r1=1381034&r2=1381035&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Sep  5 07:10:10 2012
@@ -198,6 +198,9 @@
 session by default, tracking server rather than client nonces and 
better
 handling of stale nonce values. (markt)
   
+  
+Remove unneeded handling of FORM authentication in RealmBase. 
(kkolinko)
+  
 
   
   



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1381038 - in /tomcat/tc6.0.x/trunk: ./ java/org/apache/catalina/util/ java/org/apache/coyote/ajp/ java/org/apache/coyote/http11/ java/org/apache/coyote/http11/filters/ java/org/apache/jk/

2012-09-05 Thread kkolinko
Author: kkolinko
Date: Wed Sep  5 07:22:33 2012
New Revision: 1381038

URL: http://svn.apache.org/viewvc?rev=1381038&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42181
Better handling of edge conditions in chunk header processing

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/HexUtils.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11Processor.java

tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
tomcat/tc6.0.x/trunk/java/org/apache/jk/common/HandlerRequest.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/buf/HexUtils.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1381038&r1=1381037&r2=1381038&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Sep  5 07:22:33 2012
@@ -136,12 +136,6 @@ PATCHES PROPOSED TO BACKPORT:
   +1: kkolinko, jfclere
   -1:
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42181
-  Better handling of edge conditions in chunk header processing
-  https://issues.apache.org/bugzilla/attachment.cgi?id=29288
-  +1: kkolinko, kfujino, jfclere
-  -1:
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53793
   Change links on the list of applications in the Manager to point to
   '/appname/' instead of '/appname'.

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/HexUtils.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/HexUtils.java?rev=1381038&r1=1381037&r2=1381038&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/HexUtils.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/util/HexUtils.java Wed Sep  5 
07:22:33 2012
@@ -30,27 +30,6 @@ import java.io.ByteArrayOutputStream;
 public final class HexUtils {
 // Code from Ajp11, from Apache's JServ
 
-// Table for HEX to DEC byte translation
-public static final int[] DEC = {
--1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
--1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
--1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-00, 01, 02, 03, 04, 05, 06, 07,  8,  9, -1, -1, -1, -1, -1, -1,
--1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1,
--1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
--1, 10, 11, 12, 13, 14, 15, -1, -1, -1, -1, -1, -1, -1, -1, -1,
--1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
--1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
--1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
--1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
--1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
--1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
--1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
--1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
--1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-};
-
-
 
 /**
  * The string manager for this package.
@@ -121,41 +100,6 @@ public final class HexUtils {
 
 }
 
-/**
- * Convert 4 hex digits to an int, and return the number of converted
- * bytes.
- *
- * @param hex Byte array containing exactly four hexadecimal digits
- *
- * @exception IllegalArgumentException if an invalid hexadecimal digit
- *  is included
- */
-public static int convert2Int( byte[] hex ) {
-// Code from Ajp11, from Apache's JServ
-
-// assert b.length==4
-// assert valid data
-int len;
-if(hex.length < 4 ) return 0;
-if( DEC[hex[0]]<0 )
-throw new IllegalArgumentException(sm.getString("hexUtil.bad"));
-len = DEC[hex[0]];
-len = len << 4;
-if( DEC[hex[1]]<0 )
-throw new IllegalArgumentException(sm.getString("hexUtil.bad"));
-len += DEC[hex[1]];
-len = len << 4;
-if( DEC[hex[2]]<0 )
-throw new IllegalArgumentException(sm.getString("hexUtil.bad"));
-len += DEC[hex[2]];
-len = len << 4;
-if( DEC[hex[3]]<0 )
-throw new IllegalArgumentException(sm.getString("hexUtil.bad"));
-len += DEC[hex[3]];
-retu

[Bug 42181] ArrayIndexOutOfBoundsException in parseChunkHeader

2012-09-05 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=42181

--- Comment #6 from Konstantin Kolinko  ---
Fixed in 6.0 with r1381038. It will be in Tomcat 6.0.36 onwards.

-- 
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



Re: [VOTE] Release Apache Tomcat 7.0.30

2012-09-05 Thread Henri Gomez
+1

Works for me using Jenkins and a bunch of CI services (powered by Tomcat).

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 53830] New: Better handling of Manager.randomFile default value on Windows

2012-09-05 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=53830

  Priority: P2
Bug ID: 53830
  Assignee: dev@tomcat.apache.org
   Summary: Better handling of Manager.randomFile default value on
Windows
  Severity: normal
Classification: Unclassified
OS: Windows XP
  Reporter: knst.koli...@gmail.com
  Hardware: PC
Status: NEW
   Version: 6.0.35
 Component: Catalina
   Product: Tomcat 6

See the following thread on the users list:
"Windows Path Not Found for urandom", started on Aug 28, 2012
http://markmail.org/thread/l3f3meujmac2jzqp
http://marc.info/?t=13461674244&r=1&w=2

This issue is specific to Tomcat 6 and earlier.
In Tomcat 7 the session id generation was reimplemented and this feature was
removed.

The default value of o.a.c.session.ManagerBase.devRandomSource is
"/dev/urandom".

1) The value is unsuitable for Windows, where the file does not exist.

I think it would be better to statically test the value once:
- File.isAbsolute(), to avoid looking for "C:\dev\urandom"
- File.exists()

2) On each call to ManagerBase.getRandomBytes(..) it tries to reopen the file
by calling setRandomFile(..).

There is try/catch(IOException) that clears the name and prevents subsequent
attempts to open the file, but it does not happen in case of simple
if(!f.exists()) return.

Stacktrace (from the mail thread, see details there):
[[[
Aug 29, 2012 11:52:29 AM org.apache.catalina.session.ManagerBase setRandomFile
WARNING: Error reading /dev/urandom
java.io.EOFException
at java.io.DataInputStream.readFully(DataInputStream.java:180)
at java.io.DataInputStream.readLong(DataInputStream.java:399)
at
org.apache.catalina.session.ManagerBase.setRandomFile(ManagerBase.java:548)
at
org.apache.catalina.session.ManagerBase.getRandomBytes(ManagerBase.java:993)
at org.apache.catalina.session.ManagerBase.init(ManagerBase.java:767)
at
org.apache.catalina.session.StandardManager.start(StandardManager.java:630)
at
org.apache.catalina.core.ContainerBase.setManager(ContainerBase.java:446)
at
org.apache.catalina.core.StandardContext.start(StandardContext.java:4631)
at
org.apache.catalina.core.ContainerBase.addChildInternal(ContainerBase.java:799)
at
org.apache.catalina.core.ContainerBase.addChild(ContainerBase.java:779)
at
org.apache.catalina.core.StandardHost.addChild(StandardHost.java:601)
at
org.apache.catalina.startup.HostConfig.deployDescriptor(HostConfig.java:675)
at
org.apache.catalina.startup.HostConfig.deployDescriptors(HostConfig.java:601)
at
org.apache.catalina.startup.HostConfig.deployApps(HostConfig.java:502)
at org.apache.catalina.startup.HostConfig.start(HostConfig.java:1317)
at
org.apache.catalina.startup.HostConfig.lifecycleEvent(HostConfig.java:324)
at
org.apache.catalina.util.LifecycleSupport.fireLifecycleEvent(LifecycleSupport.java:142)
at
org.apache.catalina.core.ContainerBase.start(ContainerBase.java:1065)
at org.apache.catalina.core.StandardHost.start(StandardHost.java:840)
at
org.apache.catalina.core.ContainerBase.start(ContainerBase.java:1057)
at
org.apache.catalina.core.StandardEngine.start(StandardEngine.java:463)
at
org.apache.catalina.core.StandardService.start(StandardService.java:525)
at
org.apache.catalina.core.StandardServer.start(StandardServer.java:754)
at org.apache.catalina.startup.Catalina.start(Catalina.java:595)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
at
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
at java.lang.reflect.Method.invoke(Method.java:597)
at org.apache.catalina.startup.Bootstrap.start(Bootstrap.java:289)
at org.apache.catalina.startup.Bootstrap.main(Bootstrap.java:414)
]]]

-- 
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



to improve the performance of form-based upload for Tomcat 7

2012-09-05 Thread Link Qian
hello,

I am the owner of open source project,fastupload. It's more faster 5.x than 
apache commons file upload in test. also, I test the form-based file uploading 
implementation of Servlet 3.0 API in Tomcat 7,  for example, 
HttpServletRequest.getParts(). it's slower than apache common file upload.
  
Now, I want to refactor the part code of form-based file uploading of Tomcat 
server implement. to improve the performance for it.   sounds good?

I haven't involved development process of apache open source project.   who is 
the right person I need to contact?

fast upload project reference: https://sourceforge.net/projects/fastupload/


Regards,
Link Qian 
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 53830] Better handling of Manager.randomFile default value on Windows

2012-09-05 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=53830

--- Comment #1 from Konstantin Kolinko  ---
Created attachment 29329
  --> https://issues.apache.org/bugzilla/attachment.cgi?id=29329&action=edit
2012-09-05_tc6_53830.patch

Patch for Tomcat 6

-- 
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: r1381087 - /tomcat/tc6.0.x/trunk/STATUS.txt

2012-09-05 Thread kkolinko
Author: kkolinko
Date: Wed Sep  5 09:09:24 2012
New Revision: 1381087

URL: http://svn.apache.org/viewvc?rev=1381087&view=rev
Log:
proposal

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1381087&r1=1381086&r2=1381087&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Sep  5 09:09:24 2012
@@ -150,6 +150,12 @@ PATCHES PROPOSED TO BACKPORT:
   +1: kkolinko, kfujino
   -1:
 
+* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53830
+  Better handling of Manager.randomFile default value on Windows
+  https://issues.apache.org/bugzilla/attachment.cgi?id=29329
+  +1: kkolinko
+  -1:
+
 
 PATCHES/ISSUES THAT ARE STALLED
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 53830] Better handling of Manager.randomFile default value on Windows

2012-09-05 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=53830

Konstantin Kolinko  changed:

   What|Removed |Added

  Attachment #29329|0   |1
is obsolete||

--- Comment #2 from Konstantin Kolinko  ---
Created attachment 29330
  --> https://issues.apache.org/bugzilla/attachment.cgi?id=29330&action=edit
2012-09-05_tc6_53830_v2.patch

Corrected patch.
1) Properly close old randomIS stream when setRandomFile() is called at runtime
to replace the random file.
2) Documentation: The attribute is now documented both for StandardManager and
for PersistentManager.

-- 
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: r1381127 - /tomcat/tc6.0.x/trunk/STATUS.txt

2012-09-05 Thread kkolinko
Author: kkolinko
Date: Wed Sep  5 10:20:55 2012
New Revision: 1381127

URL: http://svn.apache.org/viewvc?rev=1381127&view=rev
Log:
Update proposal

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1381127&r1=1381126&r2=1381127&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Sep  5 10:20:55 2012
@@ -152,7 +152,7 @@ PATCHES PROPOSED TO BACKPORT:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53830
   Better handling of Manager.randomFile default value on Windows
-  https://issues.apache.org/bugzilla/attachment.cgi?id=29329
+  https://issues.apache.org/bugzilla/attachment.cgi?id=29330
   +1: kkolinko
   -1:
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 53830] Better handling of Manager.randomFile default value on Windows

2012-09-05 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=53830

--- Comment #3 from Konstantin Kolinko  ---
Created attachment 29331
  --> https://issues.apache.org/bugzilla/attachment.cgi?id=29331&action=edit
2012-09-05_tc55_53830_v2.patch

Patch for Tomcat 5.5

-- 
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: r1381130 - /tomcat/tc5.5.x/trunk/STATUS.txt

2012-09-05 Thread kkolinko
Author: kkolinko
Date: Wed Sep  5 10:27:37 2012
New Revision: 1381130

URL: http://svn.apache.org/viewvc?rev=1381130&view=rev
Log:
proposal

Modified:
tomcat/tc5.5.x/trunk/STATUS.txt

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1381130&r1=1381129&r2=1381130&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Wed Sep  5 10:27:37 2012
@@ -95,3 +95,9 @@ PATCHES PROPOSED TO BACKPORT:
   https://issues.apache.org/bugzilla/attachment.cgi?id=29295
   +1: kkolinko
   -1:
+
+* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53830
+  Better handling of Manager.randomFile default value on Windows
+  https://issues.apache.org/bugzilla/attachment.cgi?id=29331
+  +1: kkolinko
+  -1:



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 53830] Better handling of Manager.randomFile default value on Windows

2012-09-05 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=53830

--- Comment #4 from Christopher Schultz  ---
RE:documentation of the attribute name, Jeffrey reported that setting the
"randomFile" attribute on the  had no effect: /dev/urandom was still
used. I'm not sure why that was (it could have been a misconfiguration), but
please check that setting "randomFile" actually has an effect.

-- 
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 53713] Performance tuning solution for JspReader

2012-09-05 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=53713

Mark Thomas  changed:

   What|Removed |Added

 Status|NEEDINFO|NEW

--- Comment #10 from Mark Thomas  ---
Nice improvement. I'll take a closer look at the patch with a view to including
it in the next release.

-- 
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



Re: [VOTE] Release Apache Tomcat 7.0.30

2012-09-05 Thread Mark Thomas
On 02/09/2012 11:03, Mark Thomas wrote:
> The proposed Apache Tomcat 7.0.30 release is now available for voting.
> 
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.30/
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-027/
> The svn tag is:
> http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_30/
> 
> The proposed 7.0.30 release is:
> [ ] Broken - do not release
> [X] Stable - go ahead and release as 7.0.30 Stable

Unit tests pass on 64-bit Windows and 64-bit Linux

EL TCK passes
JSP TCK passes with HTTP (direct) BIO, NIO & APR/native (1.1.24)
Servlet TCK passes with
 - HTTP (direct) BIO, NIO & APR/native (1.1.24)
 - HTTP (mod_proxy_http) BIO, NIO & APR/native (1.1.24)
 - AJP  (mod_jk) BIO, NIO & APR/native (1.1.24)
 - AJP  (mod_proxy_ajp) BIO, NIO & APR/native (1.1.24)

All TCK tests run on 64-bit Linux with a security manager

Mark


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[VOTE][RESULT] Release Apache Tomcat 7.0.30

2012-09-05 Thread Mark Thomas
Binding +1 (stable):
rjung, olamy, kkolinko, kfujino, jfarcand, hgomez, markt

No other votes were cast.

The vote therefore passes and the 7.0.30 proposed release will be
released shortly.

I'll make the announcement once most of the mirrors have the release.

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r817 - /dev/tomcat/tomcat-7/v7.0.30/ /release/tomcat/tomcat-7/v7.0.30/

2012-09-05 Thread markt
Author: markt
Date: Wed Sep  5 16:49:52 2012
New Revision: 817

Log:
Release 7.0.30

Added:
release/tomcat/tomcat-7/v7.0.30/
  - copied from r816, dev/tomcat/tomcat-7/v7.0.30/
Removed:
dev/tomcat/tomcat-7/v7.0.30/


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r817 - /dev/tomcat/tomcat-7/v7.0.30/ /release/tomcat/tomcat-7/v7.0.30/

2012-09-05 Thread markt
Author: markt
Date: Wed Sep  5 16:49:52 2012
New Revision: 817

Log:
Release 7.0.30

Added:
release/tomcat/tomcat-7/v7.0.30/
  - copied from r816, dev/tomcat/tomcat-7/v7.0.30/
Removed:
dev/tomcat/tomcat-7/v7.0.30/


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 53814] Could not display PDF file on Tomcat 7.0.27 above.

2012-09-05 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=53814

--- Comment #4 from Konstantin Preißer  ---
Hi Konstantin,

(In reply to comment #3)
> See o.a.tomcat.util.http.parser.AstMediaType#toString(), #toStringNoCharset()
> s/sb.append(';');/sb.append("; ");/

Thank you.
You are right: When I apply this change to the Tomcat 7.0.30 sources, then
Adobe Reader loads the PDF in IE without any error.

So it seems that indeed the client (I guess IE if Adobe Reader uses its API to
do HTTP requests, since IE's User-Agent is submitted and the problem does not
occur on Firefox or Chrome) is expecting a whitespace after the ";".

Although it is not really a Tomcat bug since the absent whitespace is
spec-compliant as you said, I also think a whitespace should be added to not
exclude non-spec-compliant clients.

-- 
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 53814] Could not display PDF file on Tomcat 7.0.27 above.

2012-09-05 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=53814

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |INVALID

--- Comment #5 from Mark Thomas  ---
This is a client bug, not a Tomcat one.

Generally, the Tomcat team does not make changes to work-around buggy clients.

Given which client is broken (Adobe Reader on IE) then the wide user base is
potentially a reason to provide an optional work-around. That is probably best
handled as a separate enhancement request with a better description rather than
re-opening and editing this issue. Personally, I'd like to see some evidence
that the bug had been reported to Adobe and they have refused to fix it before
we even consider adding the work-around to Tomcat. Of course, there is always
the "user a different browser" work-around.

-- 
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 53830] Better handling of Manager.randomFile default value on Windows

2012-09-05 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=53830

--- Comment #5 from Konstantin Kolinko  ---
(In reply to comment #4)
> RE:documentation of the attribute name, Jeffrey reported that setting the
> "randomFile" attribute on the  had no effect: /dev/urandom was
> still used. I'm not sure why that was (it could have been a
> misconfiguration), but please check that setting "randomFile" actually has
> an effect.

Regarding 6.0.35:
I do not know why it did not work for Jeffrey.
http://markmail.org/message/4zfhs6fii6vb7pf4

a) A known issue is that if the value is a non-existent file, then in 6.0.35
setting the value would not have much effect. ManagerBase silently accepts the
file name and then it will try to reopen it, like it does with the default
value of /dev/urandom.
Anyway, whether the value was set can be confirmed via JMX.

b) Maybe a typo, or it was set in a wrong place?


For 6.0.35 and earlier running on Windows I would suggest to set randomFile
attribute to point to an existing file, containing 8 bytes.

The initial 8 bytes are read during readLong() call in setRandomFile(). Having
a non-empty file avoids logging an IOException there. An attempt to read more
bytes in ManagerBase#getRandomBytes() will result in IOException, which will be
caught and will set the devRandomSource field to null.

Using a longer file is not recommended, as it will affect the randomness of
session ids.


Regarding 6.0 + patch, I tested setting the value
a) Using JMX
b) In conf/context.xml:
 
In conf/logging.properties:
 org.apache.catalina.session.ManagerBase.level=FINE

In logs/catalina.2012-09-05.log the following is logged:
 05.09.2012 22:45:17 org.apache.catalina.session.ManagerBase doSetRandomFile
 FINE: Opening C:\[redacted]/conf/server.xml

-- 
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: r1381398 - /tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java

2012-09-05 Thread markt
Author: markt
Date: Wed Sep  5 21:29:46 2012
New Revision: 1381398

URL: http://svn.apache.org/viewvc?rev=1381398&view=rev
Log:
Mapper MBean has moved

Modified:
tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java

Modified: tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java?rev=1381398&r1=1381397&r2=1381398&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java 
(original)
+++ tomcat/trunk/test/org/apache/catalina/mbeans/TestRegistration.java Wed Sep  
5 21:29:46 2012
@@ -64,6 +64,7 @@ public class TestRegistration extends To
 return new String[] {
 "Tomcat:type=Engine",
 "Tomcat:type=Realm,realmPath=/realm0",
+"Tomcat:type=Mapper",
 "Tomcat:type=MBeanFactory",
 "Tomcat:type=NamingResources",
 "Tomcat:type=Server",
@@ -115,8 +116,6 @@ public class TestRegistration extends To
 + ObjectName.quote(ADDRESS),
 "Tomcat:type=GlobalRequestProcessor,name="
 + ObjectName.quote("http-" + type + "-" + ADDRESS + "-" + 
port),
-"Tomcat:type=Mapper,port=" + port + ",address="
-+ ObjectName.quote(ADDRESS),
 "Tomcat:type=ProtocolHandler,port=" + port + ",address="
 + ObjectName.quote(ADDRESS),
 "Tomcat:type=ThreadPool,name="



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1381401 - /tomcat/maven-plugin/trunk/pom.xml

2012-09-05 Thread olamy
Author: olamy
Date: Wed Sep  5 21:45:17 2012
New Revision: 1381401

URL: http://svn.apache.org/viewvc?rev=1381401&view=rev
Log:
use last tomcat libs 7.0.30

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=1381401&r1=1381400&r2=1381401&view=diff
==
--- tomcat/maven-plugin/trunk/pom.xml (original)
+++ tomcat/maven-plugin/trunk/pom.xml Wed Sep  5 21:45:17 2012
@@ -68,7 +68,7 @@
 2001
 
 2008
-7.0.29
+7.0.30
 
 
 



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



svn commit: r1381411 - in /tomcat/trunk/java/org/apache/jasper/compiler: JspReader.java Mark.java

2012-09-05 Thread markt
Author: markt
Date: Wed Sep  5 22:06:32 2012
New Revision: 1381411

URL: http://svn.apache.org/viewvc?rev=1381411&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53713
Performance improvement (up to four times faster parsing) for JSP processing.
Patch provided by Sheldon Shao.

Modified:
tomcat/trunk/java/org/apache/jasper/compiler/JspReader.java
tomcat/trunk/java/org/apache/jasper/compiler/Mark.java

Modified: tomcat/trunk/java/org/apache/jasper/compiler/JspReader.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JspReader.java?rev=1381411&r1=1381410&r2=1381411&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/compiler/JspReader.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/JspReader.java Wed Sep  5 
22:06:32 2012
@@ -187,6 +187,65 @@ class JspReader {
 }
 
 /**
+ * A faster approach than calling {@link #mark()} & {@link #nextChar()}.
+ * However, this approach is only safe if the mark is only used within the
+ * JspReader.
+ */
+private int nextChar(Mark mark) throws JasperException {
+if (!hasMoreInput()) {
+return -1;
+}
+
+int ch = current.stream[current.cursor];
+
+mark.init(current, singleFile);
+
+current.cursor++;
+
+if (ch == '\n') {
+current.line++;
+current.col = 0;
+} else {
+current.col++;
+}
+return ch;
+}
+
+/**
+ * Search the given character, If it was found, then mark the current 
cursor
+ * and the cursor point to next character.
+ */
+private Boolean indexOf(char c, Mark mark) throws JasperException {
+if (!hasMoreInput())
+return null;
+
+int end = current.stream.length;
+int ch;
+int line = current.line;
+int col = current.col;
+int i = current.cursor;
+for(; i < end; i ++) {
+   ch = current.stream[i];
+
+   if (ch == c) {
+   mark.update(i, line, col);
+   }
+   if (ch == '\n') {
+line++;
+col = 0;
+} else {
+col++;
+}
+   if (ch == c) {
+   current.update(i+1, line, col);
+   return Boolean.TRUE;
+   }
+}
+current.update(i, line, col);
+return Boolean.FALSE;
+}
+
+/**
  * Back up the current cursor by one char, assumes current.cursor > 0,
  * and that the char to be pushed back is not '\n'.
  */
@@ -199,10 +258,11 @@ class JspReader {
 Mark oldstart = mark();
 reset(start);
 CharArrayWriter caw = new CharArrayWriter();
-while (!stop.equals(mark()))
+while (!markEquals(stop)) {
 caw.write(nextChar());
+}
 caw.close();
-reset(oldstart);
+setCurrent(oldstart);
 return caw.toString();
 }
 
@@ -216,11 +276,27 @@ class JspReader {
 return new Mark(current);
 }
 
+
+/**
+ * This method avoids a call to {@link #mark()} when doing comparison.
+ */
+private boolean markEquals(Mark another) {
+   return another.equals(current);
+}
+
 void reset(Mark mark) {
 current = new Mark(mark);
 }
 
 /**
+ * Similar to {@link #reset(Mark)} but no new Mark will be created.
+ * Therefore, the parameter mark must NOT be used in other places.
+ */
+private void setCurrent(Mark mark) {
+   current = mark;
+}
+
+/**
  * search the stream for a match to a string
  * @param string The string to match
  * @return true is one is found, the current position
@@ -228,17 +304,40 @@ class JspReader {
  *   false otherwise, position in stream unchanged.
  */
 boolean matches(String string) throws JasperException {
-Mark mark = mark();
-int ch = 0;
-int i = 0;
-do {
-ch = nextChar();
-if (((char) ch) != string.charAt(i++)) {
-reset(mark);
-return false;
-}
-} while (i < string.length());
-return true;
+   int len = string.length();
+   int cursor = current.cursor;
+   int streamSize = current.stream.length;
+   if (cursor + len < streamSize) { //Try to scan in memory
+   int line = current.line;
+   int col = current.col;
+   int ch;
+   int i = 0;
+   for(; i < len; i ++) {
+   ch = current.stream[i+cursor];
+   if (string.charAt(i) != ch) {
+   return false;
+   }
+   if (ch == '\n') {
+  line ++;
+  col = 0;
+   } else {
+  col++;
+   }
+   }
+   current.update(i+cursor, line, col);
+   } else

svn commit: r1381417 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/jasper/compiler/JspReader.java java/org/apache/jasper/compiler/Mark.java webapps/docs/changelog.xml

2012-09-05 Thread markt
Author: markt
Date: Wed Sep  5 22:14:08 2012
New Revision: 1381417

URL: http://svn.apache.org/viewvc?rev=1381417&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=53713
Performance improvement (up to four times faster parsing) for JSP processing.
Patch provided by Sheldon Shao.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JspReader.java
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Mark.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
  Merged /tomcat/trunk:r1381411

Modified: tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JspReader.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JspReader.java?rev=1381417&r1=1381416&r2=1381417&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JspReader.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/JspReader.java Wed Sep 
 5 22:14:08 2012
@@ -193,6 +193,65 @@ class JspReader {
 }
 
 /**
+ * A faster approach than calling {@link #mark()} & {@link #nextChar()}.
+ * However, this approach is only safe if the mark is only used within the
+ * JspReader.
+ */
+private int nextChar(Mark mark) throws JasperException {
+if (!hasMoreInput()) {
+return -1;
+}
+
+int ch = current.stream[current.cursor];
+
+mark.init(current, singleFile);
+
+current.cursor++;
+
+if (ch == '\n') {
+current.line++;
+current.col = 0;
+} else {
+current.col++;
+}
+return ch;
+}
+
+/**
+ * Search the given character, If it was found, then mark the current 
cursor
+ * and the cursor point to next character.
+ */
+private Boolean indexOf(char c, Mark mark) throws JasperException {
+if (!hasMoreInput())
+return null;
+
+int end = current.stream.length;
+int ch;
+int line = current.line;
+int col = current.col;
+int i = current.cursor;
+for(; i < end; i ++) {
+   ch = current.stream[i];
+
+   if (ch == c) {
+   mark.update(i, line, col);
+   }
+   if (ch == '\n') {
+line++;
+col = 0;
+} else {
+col++;
+}
+   if (ch == c) {
+   current.update(i+1, line, col);
+   return Boolean.TRUE;
+   }
+}
+current.update(i, line, col);
+return Boolean.FALSE;
+}
+
+/**
  * Back up the current cursor by one char, assumes current.cursor > 0,
  * and that the char to be pushed back is not '\n'.
  */
@@ -205,10 +264,11 @@ class JspReader {
 Mark oldstart = mark();
 reset(start);
 CharArrayWriter caw = new CharArrayWriter();
-while (!stop.equals(mark()))
+while (!markEquals(stop)) {
 caw.write(nextChar());
+}
 caw.close();
-reset(oldstart);
+setCurrent(oldstart);
 return caw.toString();
 }
 
@@ -222,11 +282,27 @@ class JspReader {
 return new Mark(current);
 }
 
+
+/**
+ * This method avoids a call to {@link #mark()} when doing comparison.
+ */
+private boolean markEquals(Mark another) {
+   return another.equals(current);
+}
+
 void reset(Mark mark) {
 current = new Mark(mark);
 }
 
 /**
+ * Similar to {@link #reset(Mark)} but no new Mark will be created.
+ * Therefore, the parameter mark must NOT be used in other places.
+ */
+private void setCurrent(Mark mark) {
+   current = mark;
+}
+
+/**
  * search the stream for a match to a string
  * @param string The string to match
  * @return true is one is found, the current position
@@ -234,17 +310,40 @@ class JspReader {
  *   false otherwise, position in stream unchanged.
  */
 boolean matches(String string) throws JasperException {
-Mark mark = mark();
-int ch = 0;
-int i = 0;
-do {
-ch = nextChar();
-if (((char) ch) != string.charAt(i++)) {
-reset(mark);
-return false;
-}
-} while (i < string.length());
-return true;
+   int len = string.length();
+   int cursor = current.cursor;
+   int streamSize = current.stream.length;
+   if (cursor + len < streamSize) { //Try to scan in memory
+   int line = current.line;
+   int col = current.col;
+   int ch;
+   int i = 0;
+   for(; i < len; i ++) {
+   ch = current.stream[i+cursor];
+   if (string.charAt(i) != ch)

[Bug 53713] Performance tuning solution for JspReader

2012-09-05 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=53713

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

--- Comment #11 from Mark Thomas  ---
Thanks for the patch. It has been applied (with slight formatting changes) to
trunk and 7.0.x and will be included in 7.0.31 onwards.

-- 
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 53829] Timed out websocket hangs on send

2012-09-05 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=53829

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |INVALID

--- Comment #2 from Mark Thomas  ---
Firefox doesn't close the connection, so since WebSocket uses an infinite
timeout by default, Tomcat just sits and waits for Firefox so send some data.
As soon as I close Firefox, the thread is released.

Possible work-arounds are:
- use a different browser (e.g. Chrome it didn't time out after a couple of
minutes in my simple test)
- specify a read timeout for the WebSocket app and then use ping/pongs to keep
the connection alive

You may also want to report a bug against Firefox since the onClose() event is
firing but the socket is remaining open.

-- 
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



[jira] [Commented] (MTOMCAT-158) WAR Overlay Does Not Include Resources

2012-09-05 Thread Dave Syer (JIRA)

[ 
https://issues.apache.org/jira/browse/MTOMCAT-158?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13449438#comment-13449438
 ] 

Dave Syer commented on MTOMCAT-158:
---

I'd like to use this with tomcat7, please.

> WAR Overlay Does Not Include Resources
> --
>
> Key: MTOMCAT-158
> URL: https://issues.apache.org/jira/browse/MTOMCAT-158
> Project: Apache Tomcat Maven Plugin
>  Issue Type: Bug
>  Components: tomcat6, tomcat7
>Affects Versions: 2.0
>Reporter: Robert Hollencamp
>Assignee: Olivier Lamy (*$^¨%`£)
> Attachments: MTOMCAT-158-1.diff
>
>
> When running tomcat[67]:run on a web application that includes WAR overlays, 
> static resources in those WAR overlays are not seen by the spawned tomcat 
> server.
> Currently, WAR overlays are extracted (to target/apache-tomcat-maven-plugin) 
> and CLASS files are added to the classpath.
> WAR overlays can also contain static resources, like JSP, CSS, JS, etc. 
> Tomcat needs to be aware of these resources

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[jira] [Created] (MTOMCAT-174) tomcatConfigurationFilesDirectory is not implemented

2012-09-05 Thread JIRA
Robin Böhm created MTOMCAT-174:
--

 Summary: tomcatConfigurationFilesDirectory is not implemented
 Key: MTOMCAT-174
 URL: https://issues.apache.org/jira/browse/MTOMCAT-174
 Project: Apache Tomcat Maven Plugin
  Issue Type: Task
  Components: tomcat6, tomcat7
Affects Versions: 2.0-beta-1
Reporter: Robin Böhm
Assignee: Olivier Lamy (*$^¨%`£)


Hey Ya :)

the property "tomcatConfigurationFilesDirectory" is not implemented yet.
There is just a field declaration without any handling.

Ive written a quick patch for my own project that i assign on this issue.
Maybe someone can take this as base for the implementation...

--
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org