svn commit: r1657492 - /tomcat/trunk/test/org/apache/catalina/connector/TestResponsePerformance.java

2015-02-05 Thread markt
Author: markt
Date: Thu Feb  5 08:18:50 2015
New Revision: 1657492

URL: http://svn.apache.org/r1657492
Log:
Re-work test to use a warm-up followed by a best of 5 approach to try and 
avoid false failures with the CI system. (Running on my laptop, homebrew is ~2x 
as fast).

Modified:
tomcat/trunk/test/org/apache/catalina/connector/TestResponsePerformance.java

Modified: 
tomcat/trunk/test/org/apache/catalina/connector/TestResponsePerformance.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/connector/TestResponsePerformance.java?rev=1657492r1=1657491r2=1657492view=diff
==
--- 
tomcat/trunk/test/org/apache/catalina/connector/TestResponsePerformance.java 
(original)
+++ 
tomcat/trunk/test/org/apache/catalina/connector/TestResponsePerformance.java 
Thu Feb  5 08:18:50 2015
@@ -22,28 +22,53 @@ import static org.junit.Assert.assertTru
 import org.junit.Test;
 
 public class TestResponsePerformance {
+
+private final int ITERATIONS = 10;
+
 @Test
 public void testToAbsolutePerformance() throws Exception {
 Request req = new TesterRequest();
 Response resp = new Response();
 resp.setRequest(req);
 
+// Warm up
+doHomebrew(resp);
+doUri();
+
+final int bestOf = 5;
+final int winTarget = (bestOf + 1) / 2;
+int homebrewWin = 0;
+int count = 0;
+
+while (count  bestOf  homebrewWin  winTarget) {
+long homebrew = doHomebrew(resp);
+long uri = doUri();
+System.out.println(Current 'home-brew':  + homebrew + ms, Using 
URI:  + uri + ms);
+if (homebrew  uri) {
+homebrewWin++;
+}
+count++;
+}
+assertTrue(homebrewWin == winTarget);
+}
+
+
+private long doHomebrew(Response resp) {
 long start = System.currentTimeMillis();
-for (int i = 0; i  10; i++) {
+for (int i = 0; i  ITERATIONS; i++) {
 resp.toAbsolute(bar.html);
 }
-long homebrew = System.currentTimeMillis() - start;
+return System.currentTimeMillis() - start;
+}
 
-start = System.currentTimeMillis();
-for (int i = 0; i  10; i++) {
+
+private long doUri() {
+long start = System.currentTimeMillis();
+for (int i = 0; i  ITERATIONS; i++) {
 URI base = URI.create(
 http://localhost:8080/level1/level2/foo.html;);
 base.resolve(URI.create(bar.html)).toASCIIString();
 }
-long uri = System.currentTimeMillis() - start;
-
-System.out.println(Current 'home-brew':  + homebrew +
-ms, Using URI:  + uri + ms);
-assertTrue(homebrew  uri);
+return System.currentTimeMillis() - start;
 }
 }



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



[Bug 57521] Tomcat randomly crashes with [libtcnative-1.so.0.1.30+0xe965] Java_org_apache_tomcat_jni_Socket_sendbb+0x75.

2015-02-05 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=57521

--- Comment #8 from Shunsuke Tanaka tanaka.shuns...@simplex.ne.jp ---
Christopher, Konstantin
Thank you for your comment.


(In reply to Christopher Schultz from comment #6)
 please tell me exactly which package you downloaded.

I downloaded tomcat-native-1.1.30-src.tar.gz.
I builded and upgraded tcnative from 1.1.27 to 1.1.30 in 2014/04/26.


 I'm surprised that the checks already in there aren't protecting you... 
 something deeper must be going on.

If this problem would be caused by tomcat code(if the tcnative receives the
wrong value from Tomcat),
can this symptom occur?
What do you think the following double check?

if(!s-net || s-net != apr_socket_layer){
  tcn_ThrowAPRException(e, APR_EINVALSOCK);
  return -(jint)APR_EINVALSOCK;
}

If the tcnative receives the wrong value from Tomcat, I think this check works
effectively.
And if condition is false and this symptom occur, it seems to me that either of
s-opaque, s-jsbbuff value is broken.
I'm sorry, if I have to say irrelevant things.


 If you built tcnative yourself, re-building it with debug symbols should not 
 be a problem... 

I have to care performance problem to change debug level of tcnative.


 if Tomcat crashes with some regularity, replacing the native library 
 shouldn't represent too much of a burden...

The symptom occured twice a year in production environment.



(In reply to Konstantin Kolinko from comment #7)
 From Tomcat side there have been the following fixes in the Coyote 
 (connector) category:
 7.0.46:
 7.0.54:

If this problem would be caused by tomcat thread-safe or recycle problem, as
you say,
I have a feeling that this symptom never occur by upgrading Tomcat.


 Are you sure that you aren't trying to write to a response that have already 
 been completed and recycled?

How can I check that you say?


 how does it happen that you are directly calling 
 org.apache.catalina.connector.Response method flushBuffer()?

I have no idea.
The stack trace has been writen into the core dump file when the symptom
occured.
When I set breakpoint and step-run, I confirmed that
org.apache.catalina.connector.CoyoteWriter is called.


 org.apache.catalina.connector.RECYCLE_FACADES=true

Thank you for your information.
Also in this case, I have to care performance problem to change this parameter.


I will consider that upgrade Tomcat and/or change RECYCLE_FACADES value to
true.

-- 
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: svn commit: r1657682 - /tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java

2015-02-05 Thread Felix Schumacher


Am 6. Februar 2015 03:23:24 MEZ, schrieb Christopher Schultz 
ch...@christopherschultz.net:
Felix,

On 2/5/15 3:26 PM, fschumac...@apache.org wrote:
 Author: fschumacher
 Date: Thu Feb  5 20:26:19 2015
 New Revision: 1657682
 
 URL: http://svn.apache.org/r1657682
 Log:
 Don't use instance scoped variables in try-with block, since it will
get
 closed, but not nulled.
 
 Modified:
 tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java
 
 Modified: tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java
 URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java?rev=1657682r1=1657681r2=1657682view=diff

==
 --- tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java
(original)
 +++ tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java Thu
Feb  5 20:26:19 2015
 @@ -522,8 +522,8 @@ public class JDBCRealm
  // Ensure that we have an open database connection
  open();
  
 -try (PreparedStatement stmt =
credentials(dbConnection, username);
 -ResultSet rs = stmt.executeQuery()) {
 +PreparedStatement stmt = credentials(dbConnection,
username);
 +try (ResultSet rs = stmt.executeQuery()) {
  if (rs.next()) {
  dbCredentials = rs.getString(1);
  }


What part of this was instance-scoped? Do I misunderstand your commit
comment?

Have a look at credentials. I think I should add a comment in the code as well. 

Felix

-chris

 @@ -552,7 +552,6 @@ public class JDBCRealm
  return null;
  }
  
 -
  /**
   * Return the Principal associated with the given user name.
   */
 @@ -591,8 +590,8 @@ public class JDBCRealm
  // Ensure that we have an open database connection
  open();
  
 -try (PreparedStatement stmt = roles(dbConnection,
username);
 -ResultSet rs = stmt.executeQuery()) {
 +PreparedStatement stmt = roles(dbConnection,
username);
 +try (ResultSet rs = stmt.executeQuery()) {
  // Accumulate the user's roles
  ArrayListString roleList = new ArrayList();
  
 
 
 
 -
 To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
 For additional commands, e-mail: dev-h...@tomcat.apache.org
 


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



Re: svn commit: r1657653 - in /tomcat/taglibs/standard/trunk: impl/src/test/java/org/apache/taglibs/standard/tag/common/xml/ForEachTagTest.java pom.xml

2015-02-05 Thread Jeremy Boynes

 On Feb 5, 2015, at 3:32 PM, Konstantin Kolinko kkoli...@apache.org wrote:
 
 2015-02-05 21:12 GMT+03:00  kkoli...@apache.org:
 Author: kkolinko
 Date: Thu Feb  5 18:12:31 2015
 New Revision: 1657653
 
 URL: http://svn.apache.org/r1657653
 Log:
 Fix compilation failure in a test class when using JDK 1.5.
 The XPathFactory.newInstance(String, String, ClassLoader) method is @since 
 Java 1.6.
 
…

 For a record,
 if I enable the xpathPerformance test (by removing @Ignore annotation)
 and run mvn install with JDK 1.6,
 
 using 1-argument version of XPathFactory.newInstance() results in printing
 [[[
 Running org.apache.taglibs.standard.tag.common.xml.ForEachTagTest
 factory.getClass() = class org.apache.xpath.jaxp.XPathFactoryImpl
 ]]]
 
 using 3-arguments version of XPathFactory.newInstance() results in printing
 [[[
 Running org.apache.taglibs.standard.tag.common.xml.ForEachTagTest
 factory.getClass() = class 
 com.sun.org.apache.xpath.internal.jaxp.XPathFactoryIm
 pl
 ]]]
 
 So there is a difference.
 At the same time, in both cases the test does not complete after
 running for 1 hour. I had to abort the tests and kill java process
 forked by maven/junit. So here is no difference.
 
 A comment for @Ignore is Takes  20s to run, so I was prepared to
 wait, but an hour is more than I expected from that comment.
 
 Maybe reducing the size of a sample document
 (newBenchmarkDocument(20)) will help.
 
 This is not my priority for now. I just run it as I wanted to verify
 whether my code change mattered.

This test was added when I was evaluating different options for addressing the 
XPath performance problems from bug #27717. I was trying to find a solution 
that used the standard JDK XPath APIs rather than having to rely on Xalan’s 
internal DTM interface. This test was used to distinguish between the 
JAXP-conformant xpath implementation built into the JDK and the one supplied as 
part of Xalan. As it turned out, both suffered from the same issue - they are 
O(N^2) compared to the xalanPerformance test which is O(N).

The test is @Ignored as it is just for performance measurement rather than 
functional testing. I left it in in case anyone wanted to re-run the tests if 
an improved JDK XPath implementation came out.

The 3-arg form here is used to ensure the JRE’s implementation is used rather 
than Xalan’s. This change breaks that as illustrated above where you can it is 
using the o.a.xpath version not the com.sun version from the JDK.

An alternative might be to instantiate the class using refection as we should 
not reference a com.sun class directly. Alternatively, we could just revert the 
change as this just blocks building with JDK5 which is EOL’d (although we still 
generate Java5 bytecode for the production classes.)

—
Jeremy



signature.asc
Description: Message signed with OpenPGP using GPGMail


[Bug 57532] Session expire message sent to cluster nodes even with DeltaSession configuration not to

2015-02-05 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=57532

--- Comment #3 from Christopher Schultz ch...@christopherschultz.net ---
(In reply to andrew jardine from comment #2)
 Perhaps I have configured my cluster incorrectly? -- here is my configuration.

 [snip]

You need N  0 nodes to make a cluster. Are they all configured identically?
Maybe you have one of them still running BackupManager.

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

2015-02-05 Thread Pravallika Peddi
Thanks Mark.

I downloaded the source code from trunk using svn. checked out version
is: 1657747
I am able to build it and Tomcat is running successfully in my environment.

Can you help assign a bug or some assignment considering my skills so that
i can start working?

Thanks,
VIN

On Thu, Feb 5, 2015 at 6:16 PM, Mark Thomas ma...@apache.org wrote:

 On 05/02/2015 09:57, Pravallika Peddi wrote:
  Hi Mark,
 
  Thanks for your reply.
 
  I downloaded the tomcat source code of apache-tomcat-8.0.18-src but not
  from the Trunk. I am able to build it and Tomcat is running successfully
 in
  my environment.

 OK. If you can build 8.0.x form source then building trunk from an svn
 checkout isn't that different.

  I do not know how to download the Trunk from SVN.

 Details are in reference [1] in my previous e-mail. You can either
 checkout from the ASF's svn server or clone the github mirror.

 Mark


 
   Thanks,
   VIN.
 
 
  On Thu, Feb 5, 2015 at 2:31 PM, Mark Thomas ma...@apache.org wrote:
 
  On 05/02/2015 08:56, Pravallika Peddi wrote:
  Hi,
  I am VIN and newly joined to the apache DEV community. I would like to
  contribute in development and bug fixing and chose Tomcat as my first
  project. I am good at core java technologies/Servlets. Can some one
 help
  me
  to guide?
 
  Welcome.
 
  The first task is to make sure you can build Tomcat.
 
  Have you checked out trunk (9.0.x). See [1].
 
  Can you build a working Tomcat instance?
 
  Mark
 
 
  [1] http://tomcat.apache.org/svn.html
 
  -
  To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
  For additional commands, e-mail: dev-h...@tomcat.apache.org
 
 
 


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




[Bug 46902] LoginValve to bypass restrictions of j_security_check

2015-02-05 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=46902

--- Comment #5 from Konstantin Kolinko knst.koli...@gmail.com ---
(In reply to Mark Thomas from comment #4)
 I don't think that this Valve is generic enough to include in Tomcat.

Agreed.

 
 I believe an additional option of
 forceLandingPageAfterAuth that always redirected the user to the landing
 page rather than their requested page would meet this requirement. This
 should be fairly easy to implement.

I think it does not match the OP's use case of iframes.


In OP's use case #1 (Comment 3) request for protected resource
http://mysite/protected/some_stuff.html  goes to iframe.  So the login form
will be displayed in the iframe.  Generally you wouldn't want login form in a
iframe, so I think that the login page has to perform some logic to detect that
it is an iframe and to change the URL of the containing page.

In this case the form page shall adapt its behaviour depending on requested
URI. Instead of displaying a form it shall redirect the top frame to
/protected/index.html. (E.g. return a small placeholder page that changes top
frame URL via javascript).

If the top frame URL is /protected/index.html then after authentication the
User will be directed to /protected/index.html, as expected.


In OP's use case #2 (Comment 1) - request to a graphics-file, some JavaScript,
a css-file.

Again, the form page shall adapt its behaviour dependent on requested URI. It
shall not return a HTML form instead of an image. A browser won't be happy to
receive one.


I think that instead of using forceLandingPageAfterAuth one shall implement a
dynamic login form page that does check request URI, and when (requestURI !=
landingPageURI) it responds with 302 redirect to the landing page instead of
displaying a form.

Note forceLandingPageAfterAuth feature and using 302 redirect in login form
differ in the URL that is displayed in location bar of a web browser during
authentication.

In case of forceLandingPageAfterAuth:
The URL displayed in location bar of a browser will be the one of the protected
resource.

It is confusing. After authentication you are not directed to that URL but
302-redirected to the landing page. What have you been authenticating for?

In case of login form page sending a 302-redirect to the landing page:
The displayed URL during authentication will be the same as the one after
authentication - the landing page.  I think that this behaviour is better.

-- 
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 57540] report TLS protocol version

2015-02-05 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=57540

--- Comment #2 from Mark Thomas ma...@apache.org ---
The key needs to be in the org.apache.tomcat name space, not the javax.servlet
space since the Servlet name space is reserved.

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

2015-02-05 Thread Mark Thomas
On 05/02/2015 09:57, Pravallika Peddi wrote:
 Hi Mark,
 
 Thanks for your reply.
 
 I downloaded the tomcat source code of apache-tomcat-8.0.18-src but not
 from the Trunk. I am able to build it and Tomcat is running successfully in
 my environment.

OK. If you can build 8.0.x form source then building trunk from an svn
checkout isn't that different.

 I do not know how to download the Trunk from SVN.

Details are in reference [1] in my previous e-mail. You can either
checkout from the ASF's svn server or clone the github mirror.

Mark


 
  Thanks,
  VIN.
 
 
 On Thu, Feb 5, 2015 at 2:31 PM, Mark Thomas ma...@apache.org wrote:
 
 On 05/02/2015 08:56, Pravallika Peddi wrote:
 Hi,
 I am VIN and newly joined to the apache DEV community. I would like to
 contribute in development and bug fixing and chose Tomcat as my first
 project. I am good at core java technologies/Servlets. Can some one help
 me
 to guide?

 Welcome.

 The first task is to make sure you can build Tomcat.

 Have you checked out trunk (9.0.x). See [1].

 Can you build a working Tomcat instance?

 Mark


 [1] http://tomcat.apache.org/svn.html

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


 


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



Re: svn commit: r1657565 - /tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java

2015-02-05 Thread Mark Thomas
On 05/02/2015 13:50, ma...@apache.org wrote:
 Author: markt
 Date: Thu Feb  5 13:50:19 2015
 New Revision: 1657565
 
 URL: http://svn.apache.org/r1657565
 Log:
 Increase error margin to 500ms in an attempt to reduce false failures on CI 
 system.

This isn't really a viable approach long term. We have been trying to
fix things this way for years without complete success.

I'm going to look at setting a build property that we can use to disable
performance tests and relax timing tests.

Mark


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



[Bug 46902] LoginValve to bypass restrictions of j_security_check

2015-02-05 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=46902

Mark Thomas ma...@apache.org changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |WONTFIX

--- Comment #6 from Mark Thomas ma...@apache.org ---
In which case the logic has to exist in the login page and there is nothing for
us to do here.

-- 
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: r1657565 - /tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java

2015-02-05 Thread markt
Author: markt
Date: Thu Feb  5 13:50:19 2015
New Revision: 1657565

URL: http://svn.apache.org/r1657565
Log:
Increase error margin to 500ms in an attempt to reduce false failures on CI 
system.

Modified:
tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java

Modified: tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java?rev=1657565r1=1657564r2=1657565view=diff
==
--- tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java 
(original)
+++ tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java Thu 
Feb  5 13:50:19 2015
@@ -32,7 +32,7 @@ import org.apache.catalina.connector.Res
 public class TesterAccessLogValve extends ValveBase implements AccessLog {
 
 // Timing tests need a small error margin to prevent failures
-private static final long ERROR_MARGIN = 100;
+private static final long ERROR_MARGIN = 500;
 
 private final ListEntry entries = new ArrayList();
 



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



svn commit: r1657572 - /tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java

2015-02-05 Thread schultz
Author: schultz
Date: Thu Feb  5 14:14:58 2015
New Revision: 1657572

URL: http://svn.apache.org/r1657572
Log:
Javadoc typo.

Modified:
tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java

Modified: tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java?rev=1657572r1=1657571r2=1657572view=diff
==
--- tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/servlets/WebdavServlet.java Thu Feb  
5 14:14:58 2015
@@ -62,7 +62,7 @@ import org.xml.sax.SAXException;
  * p
  * Mapping a subpath (e.g. code/webdav/*/code to this servlet has the 
effect
  * of re-mounting the entire web application under that sub-path, with WebDAV
- * access to all the resources. This codeWEB-INF/code and 
codeMETA-INF/code
+ * access to all the resources. The codeWEB-INF/code and 
codeMETA-INF/code
  * directories are protected in this re-mounted resource tree.
  * p
  * To enable WebDAV for a context add the following to web.xml:



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



svn commit: r1657584 - in /tomcat/trunk/test/org/apache/catalina/mapper: TestMapper.java TestMapperPerformance.java

2015-02-05 Thread markt
Author: markt
Date: Thu Feb  5 14:32:03 2015
New Revision: 1657584

URL: http://svn.apache.org/r1657584
Log:
Refactor Mapper performance tests to a separate class so they can be more 
easily excluded.

Added:
tomcat/trunk/test/org/apache/catalina/mapper/TestMapperPerformance.java   
(with props)
Modified:
tomcat/trunk/test/org/apache/catalina/mapper/TestMapper.java

Modified: tomcat/trunk/test/org/apache/catalina/mapper/TestMapper.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/mapper/TestMapper.java?rev=1657584r1=1657583r2=1657584view=diff
==
--- tomcat/trunk/test/org/apache/catalina/mapper/TestMapper.java (original)
+++ tomcat/trunk/test/org/apache/catalina/mapper/TestMapper.java Thu Feb  5 
14:32:03 2015
@@ -41,7 +41,7 @@ import org.apache.tomcat.util.buf.Messag
 
 public class TestMapper extends LoggingBaseTest {
 
-private Mapper mapper;
+protected Mapper mapper;
 
 private HashMapString, Host hostMap = new HashMap();
 
@@ -538,38 +538,4 @@ public class TestMapper extends LoggingB
 assertEquals(/foo/bar/bla, mappingData.contextPath.toString());
 }
 }
-
-@Test
-public void testPerformance() throws Exception {
-// Takes ~1s on markt's laptop. If this takes more than 5s something
-// probably needs looking at. If this fails repeatedly then we may need
-// to increase this limit.
-final long maxTime = 5000;
-long time = testPerformanceImpl();
-if (time = maxTime) {
-// Rerun to reject occasional failures, e.g. because of gc
-log.warn(testPerformance() test completed in  + time +  ms);
-time = testPerformanceImpl();
-log.warn(testPerformance() test rerun completed in  + time +  
ms);
-}
-assertTrue(String.valueOf(time), time  maxTime);
-}
-
-private long testPerformanceImpl() throws Exception {
-MappingData mappingData = new MappingData();
-MessageBytes host = MessageBytes.newInstance();
-host.setString(iowejoiejfoiew);
-MessageBytes uri = MessageBytes.newInstance();
-uri.setString(/foo/bar/blah/bobou/foo);
-uri.toChars();
-uri.getCharChunk().setLimit(-1);
-
-long start = System.currentTimeMillis();
-for (int i = 0; i  100; i++) {
-mappingData.recycle();
-mapper.map(host, uri, null, mappingData);
-}
-long time = System.currentTimeMillis() - start;
-return time;
-}
 }

Added: tomcat/trunk/test/org/apache/catalina/mapper/TestMapperPerformance.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/mapper/TestMapperPerformance.java?rev=1657584view=auto
==
--- tomcat/trunk/test/org/apache/catalina/mapper/TestMapperPerformance.java 
(added)
+++ tomcat/trunk/test/org/apache/catalina/mapper/TestMapperPerformance.java Thu 
Feb  5 14:32:03 2015
@@ -0,0 +1,61 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the License); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an AS IS BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.catalina.mapper;
+
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+import org.apache.tomcat.util.buf.MessageBytes;
+
+public class TestMapperPerformance extends TestMapper {
+
+@Test
+public void testPerformance() throws Exception {
+// Takes ~1s on markt's laptop. If this takes more than 5s something
+// probably needs looking at. If this fails repeatedly then we may need
+// to increase this limit.
+final long maxTime = 5000;
+long time = testPerformanceImpl();
+if (time = maxTime) {
+// Rerun to reject occasional failures, e.g. because of gc
+log.warn(testPerformance() test completed in  + time +  ms);
+time = testPerformanceImpl();
+log.warn(testPerformance() test rerun completed in  + time +  
ms);
+}
+assertTrue(String.valueOf(time), time  maxTime);
+}
+
+private long testPerformanceImpl() throws Exception {
+MappingData mappingData = new MappingData();
+

svn commit: r1657586 - /tomcat/trunk/build.xml

2015-02-05 Thread markt
Author: markt
Date: Thu Feb  5 14:35:50 2015
New Revision: 1657586

URL: http://svn.apache.org/r1657586
Log:
Tab and whitespace police

Modified:
tomcat/trunk/build.xml

Modified: tomcat/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1657586r1=1657585r2=1657586view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Thu Feb  5 14:35:50 2015
@@ -1414,7 +1414,7 @@
 sysproperty key=tomcat.test.accesslog value=${test.accesslog} /
 sysproperty key=tomcat.test.reports value=${test.reports} /
 sysproperty key=tomcat.test.openssl.path 
value=${test.openssl.path} /
-   sysproperty key=tomcat.test.relaxTiming value=${test.relaxTiming} 
/ 
+sysproperty key=tomcat.test.relaxTiming value=${test.relaxTiming} 
/
 !-- File for Cobertura to write coverage results to --
 sysproperty key=net.sourceforge.cobertura.datafile 
file=${cobertura.datafile} /
 
@@ -1439,8 +1439,8 @@
 exclude name=org/apache/catalina/tribes/test/** /
 !-- Exclude the OpenSSL tests unless OpenSSL is available --
 exclude name=org/apache/tomcat/util/net/jsse/openssl/** 
unless=${test.openssl.exists} /
-   !-- Exclude performance tests. E.g. on systems with 
slow/inconsistent timing --
-   exclude name=**/*Performance.java 
if=${test.excludePerformance} /
+!-- Exclude performance tests. E.g. on systems with 
slow/inconsistent timing --
+exclude name=**/*Performance.java 
if=${test.excludePerformance} /
   /fileset
 /batchtest
   /junit



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



Re: svn commit: r1657580 - in /tomcat/trunk: build.xml test/org/apache/catalina/valves/TesterAccessLogValve.java

2015-02-05 Thread Mark Thomas
On 05/02/2015 14:40, Mark Thomas wrote:
 On 05/02/2015 14:36, Konstantin Kolinko wrote:
 2015-02-05 17:28 GMT+03:00  ma...@apache.org:
 Author: markt
 Date: Thu Feb  5 14:28:37 2015
 New Revision: 1657580

 URL: http://svn.apache.org/r1657580
 Log:
 First pass at reducing false failures on CI system.

 Modified:
 tomcat/trunk/build.xml
 tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java


 Modified: 
 tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java
 URL: 
 http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java?rev=1657580r1=1657579r2=1657580view=diff
 ==
 --- tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java 
 (original)
 +++ tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java 
 Thu Feb  5 14:28:37 2015
 @@ -31,8 +31,10 @@ import org.apache.catalina.connector.Res

  public class TesterAccessLogValve extends ValveBase implements AccessLog {

 -// Timing tests need a small error margin to prevent failures
 -private static final long ERROR_MARGIN = 500;
 +private static boolean RELAX_TIMING = 
 Boolean.getBoolean(tomcat.test.relaxTiming);

 1. final above
 
 Done.
 
 +// Timing tests need an error margin to prevent failures.
 +private static final long ERROR_MARGIN = RELAX_TIMING ? 1000 : 100;

  private final ListEntry entries = new ArrayList();


 2. Mention the new test.relaxTiming build property in BUILDING.txt
  - (7.3) Other configuration options
 
 Will do.
 
 3. System.out.println() added in
 http://svn.apache.org/r1657492
 can be replaced by log.info(). The log is available is the test class
 inherits from o.a.c.startup.LoggingBaseTest.
 
 Grr. That wasn't meant to get committed. It is just me checking that the
 config took effect.

Ah. wrong System.out.println(). I'll get that one changed.

Mark


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



Re: [VOTE] Release Apache Taglibs 1.2.2

2015-02-05 Thread Jeremy Boynes
Ping ?

 On Feb 2, 2015, at 8:29 PM, Jeremy Boynes jboy...@apache.org wrote:
 
 
 On Feb 2, 2015, at 3:05 AM, Konstantin Kolinko knst.koli...@gmail.com 
 wrote:
 
 2015-01-27 19:08 GMT+03:00 Jeremy Boynes jer...@boynes.com:
 
 On Jan 27, 2015, at 7:59 AM, Konstantin Kolinko knst.koli...@gmail.com 
 wrote:
 
 2015-01-26 20:17 GMT+03:00 Jeremy Boynes jboy...@apache.org:
 The proposed Apache Taglibs 1.2.2 release is now available for voting.
 
 It can be obtained from:
 https://dist.apache.org/repos/dist/dev/tomcat/taglibs/taglibs-standard-1.2.2/
 
 The Maven staging repo is:
 https://repository.apache.org/content/repositories/orgapachetomcat-1032/
 
 The SVN tag is:
 http://svn.apache.org/repos/asf/tomcat/taglibs/standard/tags/taglibs-standard-1.2.2/
 
 
 The directory at dist.apache.org contains only 2 files,
 taglibs-standard-1.2.2-source-release.zip
 taglibs-standard-1.2.2-source-release.zip.asc
 
 I went on and added NOTICE, READMEs and checksums there.
 I plan to add the other files from Maven, like it was done for 1.2.1 here:
 https://dist.apache.org/repos/dist/release/tomcat/taglibs/taglibs-standard-1.2.1/
 
 But here is a question the taglibs-standard-1.2.2-source-release.zip
 on dist.a.o differs from one in Maven at
 https://repository.apache.org/content/repositories/orgapachetomcat-1032/org/apache/taglibs/taglibs-standard/1.2.2/
 
 The only difference is timestamps. The contents of the files in the
 archives is the same, but in the Maven staing repository zip all files
 have the same timestamp, while in the dist.a.o zip the timestamps for
 files in the archive are different.
 
 I think that it would be better to replace the zip file on dist.a.o
 with the one from Maven.  Any objections or concerns here?
 
 +1
 
 Thanks for catching that.
 Jeremy
 
 Done.
 I replaced the sources zip and added binary jars - all taken from the
 Maven staging repo.  We now have the same set of files like we had for
 1.2.1.
 
 Here comes my vote:
 
 The proposed 1.2.2 release is:
 [ ] Broken - do not release
 [x] Stable - go ahead and release as 1.2.2 Stable
 
 
 Tested (taglibs-standard-spec-1.2.2.jar +
 taglibs-standard-impl-1.2.2.jar) on my web applications.
 
 Thank you.
 
 I have 2 +1 votes so far (jboynes + kkolinko), would appreciate if others 
 could take a look.
 Jeremy



signature.asc
Description: Message signed with OpenPGP using GPGMail


[Bug 44216] Don't reuse session ID even if emptySessionPath=true

2015-02-05 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=44216

Mark Thomas ma...@apache.org changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |WONTFIX

--- Comment #2 from Mark Thomas ma...@apache.org ---
Coming back to this after far too long.

If this request were implemented I don't believe the problem would be solved
or, at lease, a new one would be created. Reviewing the borken case assuming
the requested option was avaialable and enabled:
- The user navigates to the website and get the session yyy.t2from T2.
- He then bookmarks a URL with session id in it like the one above.
- The next day, he navigates to the website again and get the session xxx.t1
from T1.
- He then selects bookmarked URL.
= The request is redirected to T2. The session is invalid so a new one is
created zzz.t2. This overwrites yyy.t2 created at step 1. Any information
associated with session yyy.t2 is now lost.

The way to fix this would be to fix the load-balancer so that the node
information from the cookie session ID takes precedence over the node
information in the URL session ID.

-- 
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: r1657609 - /tomcat/trunk/BUILDING.txt

2015-02-05 Thread markt
Author: markt
Date: Thu Feb  5 15:44:35 2015
New Revision: 1657609

URL: http://svn.apache.org/r1657609
Log:
Document new test properties.

Modified:
tomcat/trunk/BUILDING.txt

Modified: tomcat/trunk/BUILDING.txt
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/BUILDING.txt?rev=1657609r1=1657608r2=1657609view=diff
==
--- tomcat/trunk/BUILDING.txt (original)
+++ tomcat/trunk/BUILDING.txt Thu Feb  5 15:44:35 2015
@@ -404,6 +404,20 @@ For example:
   Apache License v1.1. See http://cobertura.sf.net for details. Using it
   during Tomcat build is optional and is off by default.
 
+ 6. The performance tests are written to run reasonably powerful machines (such
+as a developer may use day to day) assuming no other resource hungry
+processes are running. These assumptions are not always true (e.g. on CI
+systems running ina virtual machine) so the performance tests may be
+disabled by using the following property:
+
+test.excludePerformance=true
+
+ 7. Some tests include checks that the access log valve entries are as 
expected.
+These checks include timings. On slower / loaded systems these checks will
+often fail. The checks may be relaxed by using the following proeprty:
+
+test.relaxTiming=true
+
 
 (8) Source code checks
 



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



svn commit: r1657610 - in /tomcat/tc8.0.x/trunk: ./ test/org/apache/catalina/connector/ test/org/apache/catalina/mapper/ test/org/apache/catalina/valves/ webapps/docs/

2015-02-05 Thread markt
Author: markt
Date: Thu Feb  5 15:47:45 2015
New Revision: 1657610

URL: http://svn.apache.org/r1657610
Log:
Back-port performance and timing test changes in an attempt to reduce false 
failures on the ASF CI system.

Added:

tomcat/tc8.0.x/trunk/test/org/apache/catalina/mapper/TestMapperPerformance.java
  - copied unchanged from r1657584, 
tomcat/trunk/test/org/apache/catalina/mapper/TestMapperPerformance.java
Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/BUILDING.txt
tomcat/tc8.0.x/trunk/build.xml

tomcat/tc8.0.x/trunk/test/org/apache/catalina/connector/TestResponsePerformance.java
tomcat/tc8.0.x/trunk/test/org/apache/catalina/mapper/TestMapper.java

tomcat/tc8.0.x/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb  5 15:47:45 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609

Modified: tomcat/tc8.0.x/trunk/BUILDING.txt
URL: 

Re: Tomcat 7.0.55 System Down

2015-02-05 Thread Mark Thomas
On 05/02/2015 07:27, 토로치 wrote:
 Hello.
 
 I am a PLM system developers.
 
 We PLM system operates by JAVA.
 
 We are using the Tomcat version 7.0.55.
 
 The system Down occurs when we are using a PLM system.

This is the wrong list. You want the users list.

Mark

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



svn commit: r1657664 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java webapps/docs/changelog.xml

2015-02-05 Thread fschumacher
Author: fschumacher
Date: Thu Feb  5 19:03:19 2015
New Revision: 1657664

URL: http://svn.apache.org/r1657664
Log:
Guard the digester with its own lock object. Otherwise two threads could create
two digester instances, lock on them and then use still the same one at the
same time. Issue reported by Coverity Scan.

Merge r1657370 from /tomcat/tc8.0.x/trunk (merged r1656319 from /tomcat/trunk)

Modified:
tomcat/tc7.0.x/trunk/   (props changed)

tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsDigesterSource.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb  5 19:03:19 2015
@@ -1,2 +1,2 @@
-/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1647030,1647043,1648816,1651420-1651422,1651844,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1655109,1655112,1655114-1655115,1655117,1655120,1655445,1655467,1656300,1657049,1657356,1657360,1657460
-/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114
 
,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342
 
498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107,1346365,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,1346794,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348357,1348398,1348425,1348461-1348495,1348498,1348752,1348762,1348772,1348776,1348859,1348968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879,1349887,1349893,1349922,1349984,1350124,1350241,1350243,1350294-1350295,1350299,1350864,1350900,1351010,1351054,1351056,1351068,1351134-1351135,1351148,1351259,1351604,1351636-1351640,1351991,1351993,1352011,1352056,1352059,1
 

[Bug 45014] Request and Response classes should have wrappers for use in Valves

2015-02-05 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=45014

--- Comment #2 from mr.oliver.hernan...@gmail.com ---
I 100% agree that this should be added.

I'm running into the use case where I need to read a request's input stream,
and per the javadoc for Valve, I must wrap the request before passing it on.

It would be really convenient to either provide a wrapper in the API, or
re-design the API to the standard servlet interfaces and have invoke() accept a
reference to HttpServletRequest instead of the concrete class Request.

-- 
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 57536] configurable source ip

2015-02-05 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=57536

--- Comment #2 from Rainer Jung rainer.j...@kippdata.de ---
I think he wants an optional IP config attribute per worker. That IP would be a
locally configured ip chosen by the admin. mod_jk would then bind() to that IP
before doing the connect(). One choses port 0 and sets SO_REUSEADDR. bind() is
typicaly used before accept() (server side) and not before connect() (client),
but is is allowed for the client as well and for complex systems can do
something useful. If there are multiple local IPs and/or multiple possible
interfaces and routes form the web server to the backend, you can chose from
which IP the connection from the point of view of the backend comes.

Sometimes you can work around not being able to configure that IP by setting
host routes on the web server but for that solution you need to have root
access.

I think it is a useful extension and not an exotic feature, though most people
will not have a need to use it. The few who need it really need it :)

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



Hi

2015-02-05 Thread Pravallika Peddi
Hi,
I am VIN and newly joined to the apache DEV community. I would like to
contribute in development and bug fixing and chose Tomcat as my first
project. I am good at core java technologies/Servlets. Can some one help me
to guide?

Thanks,
Vin.


Re: Hi

2015-02-05 Thread Mark Thomas
On 05/02/2015 08:56, Pravallika Peddi wrote:
 Hi,
 I am VIN and newly joined to the apache DEV community. I would like to
 contribute in development and bug fixing and chose Tomcat as my first
 project. I am good at core java technologies/Servlets. Can some one help me
 to guide?

Welcome.

The first task is to make sure you can build Tomcat.

Have you checked out trunk (9.0.x). See [1].

Can you build a working Tomcat instance?

Mark


[1] http://tomcat.apache.org/svn.html

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



[Bug 57540] report TLS protocol version

2015-02-05 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=57540

--- Comment #3 from Ralf Hauser hau...@acm.org ---
thanks Mark, so  1a) should rather be:

org.apache.tomcat.util.net.secure_protocol_version

-- 
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: r1657607 - /tomcat/trunk/test/org/apache/catalina/connector/TestResponsePerformance.java

2015-02-05 Thread markt
Author: markt
Date: Thu Feb  5 15:34:34 2015
New Revision: 1657607

URL: http://svn.apache.org/r1657607
Log:
Revert 1657510. Back to the best of n approach.

Modified:
tomcat/trunk/test/org/apache/catalina/connector/TestResponsePerformance.java

Modified: 
tomcat/trunk/test/org/apache/catalina/connector/TestResponsePerformance.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/connector/TestResponsePerformance.java?rev=1657607r1=1657606r2=1657607view=diff
==
--- 
tomcat/trunk/test/org/apache/catalina/connector/TestResponsePerformance.java 
(original)
+++ 
tomcat/trunk/test/org/apache/catalina/connector/TestResponsePerformance.java 
Thu Feb  5 15:34:34 2015
@@ -37,24 +37,23 @@ public class TestResponsePerformance ext
 doHomebrew(resp);
 doUri();
 
-// Performance varies significantly between local testing and CI 
system.
-// This test regularly causes CI failures. Therefore one homebrew win 
is
-// sufficient for this test to pass.
-
-final int attempts = 5;
-boolean homebrewWin = false;
+// To allow for timing differences between runs, a best of n approach
+// is taken for this test
+final int bestOf = 5;
+final int winTarget = (bestOf + 1) / 2;
+int homebrewWin = 0;
 int count = 0;
 
-while (count  attempts  !homebrewWin) {
+while (count  bestOf  homebrewWin  winTarget) {
 long homebrew = doHomebrew(resp);
 long uri = doUri();
 log.info(Current 'home-brew':  + homebrew + ms, Using URI:  + 
uri + ms);
 if (homebrew  uri) {
-homebrewWin = true;
+homebrewWin++;
 }
 count++;
 }
-Assert.assertTrue(homebrewWin);
+Assert.assertTrue(homebrewWin == winTarget);
 }
 
 



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



Re: svn commit: r1657580 - in /tomcat/trunk: build.xml test/org/apache/catalina/valves/TesterAccessLogValve.java

2015-02-05 Thread Mark Thomas
On 05/02/2015 14:36, Konstantin Kolinko wrote:
 2015-02-05 17:28 GMT+03:00  ma...@apache.org:
 Author: markt
 Date: Thu Feb  5 14:28:37 2015
 New Revision: 1657580

 URL: http://svn.apache.org/r1657580
 Log:
 First pass at reducing false failures on CI system.

 Modified:
 tomcat/trunk/build.xml
 tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java

 
 Modified: 
 tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java
 URL: 
 http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java?rev=1657580r1=1657579r2=1657580view=diff
 ==
 --- tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java 
 (original)
 +++ tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java 
 Thu Feb  5 14:28:37 2015
 @@ -31,8 +31,10 @@ import org.apache.catalina.connector.Res

  public class TesterAccessLogValve extends ValveBase implements AccessLog {

 -// Timing tests need a small error margin to prevent failures
 -private static final long ERROR_MARGIN = 500;
 +private static boolean RELAX_TIMING = 
 Boolean.getBoolean(tomcat.test.relaxTiming);
 
 1. final above

Done.

 +// Timing tests need an error margin to prevent failures.
 +private static final long ERROR_MARGIN = RELAX_TIMING ? 1000 : 100;

  private final ListEntry entries = new ArrayList();
 
 
 2. Mention the new test.relaxTiming build property in BUILDING.txt
  - (7.3) Other configuration options

Will do.

 3. System.out.println() added in
 http://svn.apache.org/r1657492
 can be replaced by log.info(). The log is available is the test class
 inherits from o.a.c.startup.LoggingBaseTest.

Grr. That wasn't meant to get committed. It is just me checking that the
config took effect.

Mark

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



svn commit: r1657592 - /tomcat/trunk/test/org/apache/catalina/connector/TestResponsePerformance.java

2015-02-05 Thread markt
Author: markt
Date: Thu Feb  5 14:46:36 2015
New Revision: 1657592

URL: http://svn.apache.org/r1657592
Log:
Use standard logging

Modified:
tomcat/trunk/test/org/apache/catalina/connector/TestResponsePerformance.java

Modified: 
tomcat/trunk/test/org/apache/catalina/connector/TestResponsePerformance.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/connector/TestResponsePerformance.java?rev=1657592r1=1657591r2=1657592view=diff
==
--- 
tomcat/trunk/test/org/apache/catalina/connector/TestResponsePerformance.java 
(original)
+++ 
tomcat/trunk/test/org/apache/catalina/connector/TestResponsePerformance.java 
Thu Feb  5 14:46:36 2015
@@ -18,10 +18,12 @@ package org.apache.catalina.connector;
 
 import java.net.URI;
 
-import static org.junit.Assert.assertTrue;
+import org.junit.Assert;
 import org.junit.Test;
 
-public class TestResponsePerformance {
+import org.apache.catalina.startup.LoggingBaseTest;
+
+public class TestResponsePerformance extends LoggingBaseTest {
 
 private final int ITERATIONS = 10;
 
@@ -46,13 +48,13 @@ public class TestResponsePerformance {
 while (count  attempts  !homebrewWin) {
 long homebrew = doHomebrew(resp);
 long uri = doUri();
-System.out.println(Current 'home-brew':  + homebrew + ms, Using 
URI:  + uri + ms);
+log.info(Current 'home-brew':  + homebrew + ms, Using URI:  + 
uri + ms);
 if (homebrew  uri) {
 homebrewWin = true;
 }
 count++;
 }
-assertTrue(homebrewWin);
+Assert.assertTrue(homebrewWin);
 }
 
 



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



[Bug 57509] maxHttpHeaderSize maybe case ArrayIndexOutOfBoundsException

2015-02-05 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=57509

--- Comment #6 from Konstantin Kolinko knst.koli...@gmail.com ---
Fixed in Tomcat 7 by r1657591, will be in 7.0.60 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: svn commit: r1657565 - /tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java

2015-02-05 Thread Konstantin Kolinko
2015-02-05 17:11 GMT+03:00 Mark Thomas ma...@apache.org:
 On 05/02/2015 13:50, ma...@apache.org wrote:
 Author: markt
 Date: Thu Feb  5 13:50:19 2015
 New Revision: 1657565

 URL: http://svn.apache.org/r1657565
 Log:
 Increase error margin to 500ms in an attempt to reduce false failures on CI 
 system.

 This isn't really a viable approach long term. We have been trying to
 fix things this way for years without complete success.

 I'm going to look at setting a build property that we can use to disable
 performance tests and relax timing tests.

+1.

There are slow machines that just cannot run those tests sensibly.


Best regards,
Konstantin Kolinko

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



svn commit: r1657580 - in /tomcat/trunk: build.xml test/org/apache/catalina/valves/TesterAccessLogValve.java

2015-02-05 Thread markt
Author: markt
Date: Thu Feb  5 14:28:37 2015
New Revision: 1657580

URL: http://svn.apache.org/r1657580
Log:
First pass at reducing false failures on CI system.

Modified:
tomcat/trunk/build.xml
tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java

Modified: tomcat/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1657580r1=1657579r2=1657580view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Thu Feb  5 14:28:37 2015
@@ -168,6 +168,7 @@
   !-- Tests To Run --
   property name=test.name value=**/Test*.java/
   property name=test.formatter 
value=-Dorg.apache.juli.formatter=java.util.logging.SimpleFormatter/
+  property name=test.relaxTiming value=false/
 
   !-- Cobertura code coverage settings --
   property name=cobertura.out value=${tomcat.output}/coverage/
@@ -1413,6 +1414,7 @@
 sysproperty key=tomcat.test.accesslog value=${test.accesslog} /
 sysproperty key=tomcat.test.reports value=${test.reports} /
 sysproperty key=tomcat.test.openssl.path 
value=${test.openssl.path} /
+   sysproperty key=tomcat.test.relaxTiming value=${test.relaxTiming} 
/ 
 !-- File for Cobertura to write coverage results to --
 sysproperty key=net.sourceforge.cobertura.datafile 
file=${cobertura.datafile} /
 
@@ -1436,7 +1438,9 @@
 !-- Exclude the tests known to fail --
 exclude name=org/apache/catalina/tribes/test/** /
 !-- Exclude the OpenSSL tests unless OpenSSL is available --
-exclude name=org/apache/tomcat/util/net/jsse/openssl/** 
unless=${test.openssl.exists}/
+exclude name=org/apache/tomcat/util/net/jsse/openssl/** 
unless=${test.openssl.exists} /
+   !-- Exclude performance tests. E.g. on systems with 
slow/inconsistent timing --
+   exclude name=**/*Performance.java 
if=${test.excludePerformance} /
   /fileset
 /batchtest
   /junit

Modified: tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java?rev=1657580r1=1657579r2=1657580view=diff
==
--- tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java 
(original)
+++ tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java Thu 
Feb  5 14:28:37 2015
@@ -31,8 +31,10 @@ import org.apache.catalina.connector.Res
 
 public class TesterAccessLogValve extends ValveBase implements AccessLog {
 
-// Timing tests need a small error margin to prevent failures
-private static final long ERROR_MARGIN = 500;
+private static boolean RELAX_TIMING = 
Boolean.getBoolean(tomcat.test.relaxTiming);
+
+// Timing tests need an error margin to prevent failures.
+private static final long ERROR_MARGIN = RELAX_TIMING ? 1000 : 100;
 
 private final ListEntry entries = new ArrayList();
 



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



Re: svn commit: r1657580 - in /tomcat/trunk: build.xml test/org/apache/catalina/valves/TesterAccessLogValve.java

2015-02-05 Thread Konstantin Kolinko
2015-02-05 17:28 GMT+03:00  ma...@apache.org:
 Author: markt
 Date: Thu Feb  5 14:28:37 2015
 New Revision: 1657580

 URL: http://svn.apache.org/r1657580
 Log:
 First pass at reducing false failures on CI system.

 Modified:
 tomcat/trunk/build.xml
 tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java


 Modified: 
 tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java
 URL: 
 http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java?rev=1657580r1=1657579r2=1657580view=diff
 ==
 --- tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java 
 (original)
 +++ tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java 
 Thu Feb  5 14:28:37 2015
 @@ -31,8 +31,10 @@ import org.apache.catalina.connector.Res

  public class TesterAccessLogValve extends ValveBase implements AccessLog {

 -// Timing tests need a small error margin to prevent failures
 -private static final long ERROR_MARGIN = 500;
 +private static boolean RELAX_TIMING = 
 Boolean.getBoolean(tomcat.test.relaxTiming);

1. final above

 +// Timing tests need an error margin to prevent failures.
 +private static final long ERROR_MARGIN = RELAX_TIMING ? 1000 : 100;

  private final ListEntry entries = new ArrayList();


2. Mention the new test.relaxTiming build property in BUILDING.txt
 - (7.3) Other configuration options

3. System.out.println() added in
http://svn.apache.org/r1657492
can be replaced by log.info(). The log is available is the test class
inherits from o.a.c.startup.LoggingBaseTest.


Best regards,
Konstantin Kolinko

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



svn commit: r1657589 - /tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java

2015-02-05 Thread markt
Author: markt
Date: Thu Feb  5 14:42:52 2015
New Revision: 1657589

URL: http://svn.apache.org/r1657589
Log:
Make constant final

Modified:
tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java

Modified: tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java?rev=1657589r1=1657588r2=1657589view=diff
==
--- tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java 
(original)
+++ tomcat/trunk/test/org/apache/catalina/valves/TesterAccessLogValve.java Thu 
Feb  5 14:42:52 2015
@@ -31,7 +31,7 @@ import org.apache.catalina.connector.Res
 
 public class TesterAccessLogValve extends ValveBase implements AccessLog {
 
-private static boolean RELAX_TIMING = 
Boolean.getBoolean(tomcat.test.relaxTiming);
+private static final boolean RELAX_TIMING = 
Boolean.getBoolean(tomcat.test.relaxTiming);
 
 // Timing tests need an error margin to prevent failures.
 private static final long ERROR_MARGIN = RELAX_TIMING ? 1000 : 100;



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



svn commit: r1657591 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/http11/AbstractOutputBuffer.java webapps/docs/changelog.xml

2015-02-05 Thread kkolinko
Author: kkolinko
Date: Thu Feb  5 14:45:56 2015
New Revision: 1657591

URL: http://svn.apache.org/r1657591
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57509
Improve length check in OutputBuffer.write() to account for 4 extra bytes that 
are needed to terminates the headers.

Backport of r1657460 from tomcat/tc8.0.x/trunk.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractOutputBuffer.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb  5 14:45:56 2015
@@ -1,2 +1,2 @@
-/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1647030,1647043,1648816,1651420-1651422,1651844,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1655109,1655112,1655114-1655115,1655117,1655120,1655445,1655467,1656300,1657049
+/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1647030,1647043,1648816,1651420-1651422,1651844,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1655109,1655112,1655114-1655115,1655117,1655120,1655445,1655467,1656300,1657049,1657460
 
/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114
 
,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342
 

svn commit: r1657720 - in /tomcat/taglibs/standard/trunk: ./ build-tools/ compat/ impl/ jstlel/ spec/

2015-02-05 Thread kkolinko
Author: kkolinko
Date: Thu Feb  5 23:37:11 2015
New Revision: 1657720

URL: http://svn.apache.org/r1657720
Log:
Add project files of Eclipse IDE to svn:ignore

Modified:
tomcat/taglibs/standard/trunk/   (props changed)
tomcat/taglibs/standard/trunk/build-tools/   (props changed)
tomcat/taglibs/standard/trunk/compat/   (props changed)
tomcat/taglibs/standard/trunk/impl/   (props changed)
tomcat/taglibs/standard/trunk/jstlel/   (props changed)
tomcat/taglibs/standard/trunk/spec/   (props changed)

Propchange: tomcat/taglibs/standard/trunk/
--
--- svn:ignore (original)
+++ svn:ignore Thu Feb  5 23:37:11 2015
@@ -1,4 +1,5 @@
 target
 .idea
 *.iml
-
+.settings
+.project

Propchange: tomcat/taglibs/standard/trunk/build-tools/
--
--- svn:ignore (original)
+++ svn:ignore Thu Feb  5 23:37:11 2015
@@ -1,2 +1,5 @@
 *.iml
 target
+.classpath
+.project
+.settings

Propchange: tomcat/taglibs/standard/trunk/compat/
--
--- svn:ignore (original)
+++ svn:ignore Thu Feb  5 23:37:11 2015
@@ -1,2 +1,5 @@
 *.iml
 target
+.classpath
+.project
+.settings

Propchange: tomcat/taglibs/standard/trunk/impl/
--
--- svn:ignore (original)
+++ svn:ignore Thu Feb  5 23:37:11 2015
@@ -1,2 +1,5 @@
 target
 *.iml
+.classpath
+.project
+.settings

Propchange: tomcat/taglibs/standard/trunk/jstlel/
--
--- svn:ignore (original)
+++ svn:ignore Thu Feb  5 23:37:11 2015
@@ -1,2 +1,5 @@
 *.iml
 target
+.classpath
+.project
+.settings

Propchange: tomcat/taglibs/standard/trunk/spec/
--
--- svn:ignore (original)
+++ svn:ignore Thu Feb  5 23:37:11 2015
@@ -1,2 +1,5 @@
 target
 *.iml
+.classpath
+.project
+.settings



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



Re: svn commit: r1657653 - in /tomcat/taglibs/standard/trunk: impl/src/test/java/org/apache/taglibs/standard/tag/common/xml/ForEachTagTest.java pom.xml

2015-02-05 Thread Konstantin Kolinko
2015-02-05 21:12 GMT+03:00  kkoli...@apache.org:
 Author: kkolinko
 Date: Thu Feb  5 18:12:31 2015
 New Revision: 1657653

 URL: http://svn.apache.org/r1657653
 Log:
 Fix compilation failure in a test class when using JDK 1.5.
 The XPathFactory.newInstance(String, String, ClassLoader) method is @since 
 Java 1.6.

 From code review, the only difference between old and new methods is presence 
 of the second argument, 
 com.sun.org.apache.xpath.internal.jaxp.XPathFactoryImpl. The null class 
 loader is interpreted as TCCL by both methods, so there is no difference.
 This test is @Ignore'd so it is not really tested.

 Modified:
 
 tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/common/xml/ForEachTagTest.java
 tomcat/taglibs/standard/trunk/pom.xml

 Modified: 
 tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/common/xml/ForEachTagTest.java
 URL: 
 http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/common/xml/ForEachTagTest.java?rev=1657653r1=1657652r2=1657653view=diff
 ==
 --- 
 tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/common/xml/ForEachTagTest.java
  (original)
 +++ 
 tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/common/xml/ForEachTagTest.java
  Thu Feb  5 18:12:31 2015
 @@ -218,7 +218,8 @@ public class ForEachTagTest {
  return doc;
  }
  };
 -XPathFactory factory = 
 XPathFactory.newInstance(XPathFactory.DEFAULT_OBJECT_MODEL_URI, 
 com.sun.org.apache.xpath.internal.jaxp.XPathFactoryImpl, null);
 +// XPathFactory factory = 
 XPathFactory.newInstance(XPathFactory.DEFAULT_OBJECT_MODEL_URI, 
 com.sun.org.apache.xpath.internal.jaxp.XPathFactoryImpl, null);
 +XPathFactory factory = 
 XPathFactory.newInstance(XPathFactory.DEFAULT_OBJECT_MODEL_URI);
  System.out.println(factory.getClass() =  + factory.getClass());
  factory.setXPathVariableResolver(resolver);
  XPathExpression select = factory.newXPath().compile($doc/root/a);


For a record,
if I enable the xpathPerformance test (by removing @Ignore annotation)
and run mvn install with JDK 1.6,

using 1-argument version of XPathFactory.newInstance() results in printing
[[[
Running org.apache.taglibs.standard.tag.common.xml.ForEachTagTest
factory.getClass() = class org.apache.xpath.jaxp.XPathFactoryImpl
]]]

using 3-arguments version of XPathFactory.newInstance() results in printing
[[[
Running org.apache.taglibs.standard.tag.common.xml.ForEachTagTest
factory.getClass() = class com.sun.org.apache.xpath.internal.jaxp.XPathFactoryIm
pl
]]]

So there is a difference.
At the same time, in both cases the test does not complete after
running for 1 hour. I had to abort the tests and kill java process
forked by maven/junit. So here is no difference.

A comment for @Ignore is Takes  20s to run, so I was prepared to
wait, but an hour is more than I expected from that comment.

Maybe reducing the size of a sample document
(newBenchmarkDocument(20)) will help.

This is not my priority for now. I just run it as I wanted to verify
whether my code change mattered.


Best regards,
Konstantin Kolinko

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



[Bug 57536] configurable source ip

2015-02-05 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=57536

--- Comment #1 from Christopher Schultz ch...@christopherschultz.net ---
What interfaces do you have on an example server? What interface/IP does mod_jk
currently choose? What interface/IP would you prefer mod_jk use?

-- 
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 57489] java.util.concurrent.ExecutionException: java.io.IOException: Key must be cancelled

2015-02-05 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=57489

--- Comment #8 from Christopher Schultz ch...@christopherschultz.net ---
(In reply to wodencafe from comment #7)
 I ran svn update, then ant, and finally copied the built
 libs into my Tomcat 8 server for testing.

That's the correct procedure. If you are using split CATALINA_BASE and
CATALINA_HOME (a great thing to do IMO), you can just point your CATALINA_HOME
to the directory you have your svn working copy in, under output/build,
something like this:

$ export CATALINA_BASE=[...]
$ export CATALINA_HOME=/path/to/tomcat-svn/output/build
$ $CATALINA_HOME/bin/catalina.sh start

You can always go back to your previous Tomcat (8.0.18, etc.) by switching
CATALINA_HOME back to its previous value.

-- 
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: r1657501 - /tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java

2015-02-05 Thread markt
Author: markt
Date: Thu Feb  5 09:20:34 2015
New Revision: 1657501

URL: http://svn.apache.org/r1657501
Log:
Change read  write interest defaults for NIO. These should only be true once 
the socket has been registered for read/write.

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.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=1657501r1=1657500r2=1657501view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/Nio2Endpoint.java Thu Feb  5 
09:20:34 2015
@@ -732,12 +732,12 @@ public class Nio2Endpoint extends Abstra
 
 private final CompletionHandlerInteger, 
SocketWrapperBaseNio2Channel readCompletionHandler;
 private final Semaphore readPending = new Semaphore(1);
-private boolean readInterest = true; // Guarded by 
readCompletionHandler
+private boolean readInterest = false; // Guarded by 
readCompletionHandler
 
 private final CompletionHandlerInteger, ByteBuffer 
writeCompletionHandler;
 private final CompletionHandlerLong, ByteBuffer[] 
gatheringWriteCompletionHandler;
 private final Semaphore writePending = new Semaphore(1);
-private boolean writeInterest = true; // Guarded by 
writeCompletionHandler
+private boolean writeInterest = false; // Guarded by 
writeCompletionHandler
 private boolean writeNotify = false;
 
 private CompletionHandlerInteger, SocketWrapperBaseNio2Channel 
awaitBytesHandler



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



Re: Hi

2015-02-05 Thread Pravallika Peddi
Hi Mark,

Thanks for your reply.

I downloaded the tomcat source code of apache-tomcat-8.0.18-src but not
from the Trunk. I am able to build it and Tomcat is running successfully in
my environment.

I do not know how to download the Trunk from SVN.

 Thanks,
 VIN.


On Thu, Feb 5, 2015 at 2:31 PM, Mark Thomas ma...@apache.org wrote:

 On 05/02/2015 08:56, Pravallika Peddi wrote:
  Hi,
  I am VIN and newly joined to the apache DEV community. I would like to
  contribute in development and bug fixing and chose Tomcat as my first
  project. I am good at core java technologies/Servlets. Can some one help
 me
  to guide?

 Welcome.

 The first task is to make sure you can build Tomcat.

 Have you checked out trunk (9.0.x). See [1].

 Can you build a working Tomcat instance?

 Mark


 [1] http://tomcat.apache.org/svn.html

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




[Bug 57540] New: report TLS protocol version

2015-02-05 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=57540

Bug ID: 57540
   Summary: report TLS protocol version
   Product: Tomcat 7
   Version: trunk
  Hardware: All
OS: Linux
Status: NEW
  Severity: enhancement
  Priority: P2
 Component: Connectors
  Assignee: dev@tomcat.apache.org
  Reporter: hau...@acm.org

There is org.apache.tomcat.util.net.SSLSupport.CIPHER_SUITE_KEY and with 

request.getAttribute(SSLSupport.CIPHER_SUITE_KEY) , one can find out with
cipher suite has been used between the client and the tomcat.

However, it doesn't seem possible to do the same on the TLS version, therefore
my suggestions:

1) in SSLSuport create
  a) public static final String PROTOCOL_VERSION_KEY =
javax.servlet.request.secure_protocol_version;
  b) public String getProtocol() throws IOException;

2) in org.apache.tomcat.util.net.jsse.JSSESupport add

   public String getProtocol() throws IOException {
 if (session == null)
return null;
return session.getProtocol();
}

   }

3) in  org.apache.coyote.http11.Http11Processor.action() add

sslO = sslSupport.getProtocol();
if (sslO != null) {
request.setAttribute
(SSLSupport.PROTOCOL_VERSION_KEY, sslO);
}

-- 
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: Tomcat 7.0.55 System Down

2015-02-05 Thread 토로치
I made a mistake.

I subscribe to the user list.

Duseong

2015-02-05 17:59 GMT+09:00 Mark Thomas ma...@apache.org:

 On 05/02/2015 07:27, 토로치 wrote:
  Hello.
 
  I am a PLM system developers.
 
  We PLM system operates by JAVA.
 
  We are using the Tomcat version 7.0.55.
 
  The system Down occurs when we are using a PLM system.

 This is the wrong list. You want the users list.

 Mark

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




svn commit: r1657510 - /tomcat/trunk/test/org/apache/catalina/connector/TestResponsePerformance.java

2015-02-05 Thread markt
Author: markt
Date: Thu Feb  5 10:11:54 2015
New Revision: 1657510

URL: http://svn.apache.org/r1657510
Log:
Try a different way to convince the CI system to pass this.

Modified:
tomcat/trunk/test/org/apache/catalina/connector/TestResponsePerformance.java

Modified: 
tomcat/trunk/test/org/apache/catalina/connector/TestResponsePerformance.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/connector/TestResponsePerformance.java?rev=1657510r1=1657509r2=1657510view=diff
==
--- 
tomcat/trunk/test/org/apache/catalina/connector/TestResponsePerformance.java 
(original)
+++ 
tomcat/trunk/test/org/apache/catalina/connector/TestResponsePerformance.java 
Thu Feb  5 10:11:54 2015
@@ -35,21 +35,24 @@ public class TestResponsePerformance {
 doHomebrew(resp);
 doUri();
 
-final int bestOf = 5;
-final int winTarget = (bestOf + 1) / 2;
-int homebrewWin = 0;
+// Performance varies significantly between local testing and CI 
system.
+// This test regularly causes CI failures. Therefore one homebrew win 
is
+// sufficient for this test to pass.
+
+final int attempts = 5;
+boolean homebrewWin = false;
 int count = 0;
 
-while (count  bestOf  homebrewWin  winTarget) {
+while (count  attempts  !homebrewWin) {
 long homebrew = doHomebrew(resp);
 long uri = doUri();
 System.out.println(Current 'home-brew':  + homebrew + ms, Using 
URI:  + uri + ms);
 if (homebrew  uri) {
-homebrewWin++;
+homebrewWin = true;
 }
 count++;
 }
-assertTrue(homebrewWin == winTarget);
+assertTrue(homebrewWin);
 }
 
 



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



[Bug 46902] LoginValve to bypass restrictions of j_security_check

2015-02-05 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=46902

--- Comment #4 from Mark Thomas ma...@apache.org ---
Getting back to this after far too long.

I understand the problem you are trying to solve but I don't think that this
Valveis generic enough to include in Tomcat. My largest concern is that the
requirement that all the protected pages are under a single URL space.

Since this enhancement request was made, the landingPage option has been added
to the FORM authenticator. I believe an additional option of
forceLandingPageAfterAuth that always redirected the user to the landing page
rather than their requested page would meet this requirement. This should be
fairly easy to implement.

-- 
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 57540] report TLS protocol version

2015-02-05 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=57540

--- Comment #1 from Ralf Hauser hau...@acm.org ---
4) furthermore, I suggest to add in
org.apache.tomcat.util.net.jsse.openssl.Protocol

TLSv1_1(TLSv1.1)

-- 
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: svn commit: r1657682 - /tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java

2015-02-05 Thread Christopher Schultz
Felix,

On 2/5/15 3:26 PM, fschumac...@apache.org wrote:
 Author: fschumacher
 Date: Thu Feb  5 20:26:19 2015
 New Revision: 1657682
 
 URL: http://svn.apache.org/r1657682
 Log:
 Don't use instance scoped variables in try-with block, since it will get
 closed, but not nulled.
 
 Modified:
 tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java
 
 Modified: tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java
 URL: 
 http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java?rev=1657682r1=1657681r2=1657682view=diff
 ==
 --- tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java (original)
 +++ tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java Thu Feb  5 
 20:26:19 2015
 @@ -522,8 +522,8 @@ public class JDBCRealm
  // Ensure that we have an open database connection
  open();
  
 -try (PreparedStatement stmt = credentials(dbConnection, 
 username);
 -ResultSet rs = stmt.executeQuery()) {
 +PreparedStatement stmt = credentials(dbConnection, username);
 +try (ResultSet rs = stmt.executeQuery()) {
  if (rs.next()) {
  dbCredentials = rs.getString(1);
  }


What part of this was instance-scoped? Do I misunderstand your commit
comment?

-chris

 @@ -552,7 +552,6 @@ public class JDBCRealm
  return null;
  }
  
 -
  /**
   * Return the Principal associated with the given user name.
   */
 @@ -591,8 +590,8 @@ public class JDBCRealm
  // Ensure that we have an open database connection
  open();
  
 -try (PreparedStatement stmt = roles(dbConnection, username);
 -ResultSet rs = stmt.executeQuery()) {
 +PreparedStatement stmt = roles(dbConnection, username);
 +try (ResultSet rs = stmt.executeQuery()) {
  // Accumulate the user's roles
  ArrayListString roleList = new ArrayList();
  
 
 
 
 -
 To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
 For additional commands, e-mail: dev-h...@tomcat.apache.org
 



signature.asc
Description: OpenPGP digital signature


[Bug 50504] Allow setting query string character set trough request attribute

2015-02-05 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=50504

--- Comment #5 from Christopher Schultz ch...@christopherschultz.net ---
(In reply to Mark Thomas from comment #4)
 Request URI decoding has to bee connector wide since the URI has to be
 decoded before it is mapped.

If it can be assumed that the mapping has been done correctly and won't change,
could the query string itself be re-decoded from the original bytes if the
request contains an attribute that differs from the initial character set used
for decoding?

-- 
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 57532] Session expire message sent to cluster nodes even with DeltaSession configuration not to

2015-02-05 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=57532

--- Comment #2 from andrew jardine andrew.jard...@jardineworks.com ---
Hey Mark,

I'll try to grab those details for you. All I can say for the moment is that if
I set a breakpoint in the DeltaManager class for the expire(boolean) method,
then during shutdown it hits. The only way I was able to preserve my session
replication was to modify that method. Perhaps I have configured my cluster
incorrectly? -- here is my configuration. I'll try to find some time this
weekend to get a thread dump for you. 


server.xml --

Cluster className=org.apache.catalina.ha.tcp.SimpleTcpCluster
channelSendOptions=6
Manager className=org.apache.catalina.ha.session.DeltaManager
  expireSessionsOnShutdown=false
  notifyListenersOnReplication=true/
  Channel className=org.apache.catalina.tribes.group.GroupChannel
Membership
className=org.apache.catalina.tribes.membership.McastService
   address=224.5.0.1
   port=45564
   frequency=500
   dropTime=3000/
   Receiver
className=org.apache.catalina.tribes.transport.nio.NioReceiver
address=auto
port=4000
selectorTimeout=5000
maxThreads=25/
   Sender
className=org.apache.catalina.tribes.transport.ReplicationTransmitter
 Transport
className=org.apache.catalina.tribes.transport.nio.PooledParallelSender/
   /Sender
   Interceptor
className=org.apache.catalina.tribes.group.interceptors.TcpFailureDetector/
   Interceptor
className=org.apache.catalina.tribes.group.interceptors.MessageDispatch15Interceptor/
   Interceptor
className=org.apache.catalina.tribes.group.interceptors.ThroughputInterceptor/
/Channel
ClusterListener
className=org.apache.catalina.ha.session.ClusterSessionListener/
/Cluster

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

2015-02-05 Thread Konstantin Kolinko
2015-02-02 14:05 GMT+03:00 Konstantin Kolinko knst.koli...@gmail.com:
 2015-01-27 19:08 GMT+03:00 Jeremy Boynes jer...@boynes.com:

 On Jan 27, 2015, at 7:59 AM, Konstantin Kolinko knst.koli...@gmail.com 
 wrote:

 Here comes my vote:

 The proposed 1.2.2 release is:
 [ ] Broken - do not release
  [x] Stable - go ahead and release as 1.2.2 Stable


 Tested (taglibs-standard-spec-1.2.2.jar +
 taglibs-standard-impl-1.2.2.jar) on my web applications.


Unfortunately I have to change the above to
[x] Broken - do not release


My tests were on Java 7 and later.

The library breaks when running on Java 5.
E.g. Tomcat 6 + JDK 5u20 + Tomcat examples webapp.

I am looking for a fix.
For starters, the project has a compilation failure under Java 5 in a
test class.

XPathFactory.newInstance(String, String, ClassLoader) method used in
ForEachTagTest is @since Java 1.6.

Best regards,
Konstantin Kolinko

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



svn commit: r1657659 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/LocalStrings.properties java/org/apache/catalina/core/StandardHost.java webapps/docs/changelog.xml

2015-02-05 Thread fschumacher
Author: fschumacher
Date: Thu Feb  5 18:33:09 2015
New Revision: 1657659

URL: http://svn.apache.org/r1657659
Log:
Warn about a problematic appBase setting on StandardHost.

Merged r1657356 from /tomcat/tc8.0.x/trunk (merged r1656345 from /tomcat/trunk)

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/LocalStrings.properties
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/StandardHost.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb  5 18:33:09 2015
@@ -1,2 +1,2 @@
-/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1647030,1647043,1648816,1651420-1651422,1651844,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1655109,1655112,1655114-1655115,1655117,1655120,1655445,1655467,1656300,1657049,1657460
-/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114
 
,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342
 
498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107,1346365,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,1346794,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348357,1348398,1348425,1348461-1348495,1348498,1348752,1348762,1348772,1348776,1348859,1348968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879,1349887,1349893,1349922,1349984,1350124,1350241,1350243,1350294-1350295,1350299,1350864,1350900,1351010,1351054,1351056,1351068,1351134-1351135,1351148,1351259,1351604,1351636-1351640,1351991,1351993,1352011,1352056,1352059,1
 

svn commit: r1657660 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/ApplicationHttpRequest.java

2015-02-05 Thread fschumacher
Author: fschumacher
Date: Thu Feb  5 18:36:15 2015
New Revision: 1657660

URL: http://svn.apache.org/r1657660
Log:
We know, that we only store String[] instances as
values in parameters-map, so no need to check for other types.

Merge r1657360 from /tomcat/tc8.0.x/trunk (merged r1656331 from /tomcat/trunk)

Modified:
tomcat/tc7.0.x/trunk/   (props changed)

tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java

Propchange: tomcat/tc7.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb  5 18:36:15 2015
@@ -1,2 +1,2 @@
-/tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1647030,1647043,1648816,1651420-1651422,1651844,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1655109,1655112,1655114-1655115,1655117,1655120,1655445,1655467,1656300,1657049,1657356,1657460
-/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222329,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114
 
,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342
 
498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107,1346365,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,1346794,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348357,1348398,1348425,1348461-1348495,1348498,1348752,1348762,1348772,1348776,1348859,1348968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879,1349887,1349893,1349922,1349984,1350124,1350241,1350243,1350294-1350295,1350299,1350864,1350900,1351010,1351054,1351056,1351068,1351134-1351135,1351148,1351259,1351604,1351636-1351640,1351991,1351993,1352011,1352056,1352059,1
 

svn commit: r1657653 - in /tomcat/taglibs/standard/trunk: impl/src/test/java/org/apache/taglibs/standard/tag/common/xml/ForEachTagTest.java pom.xml

2015-02-05 Thread kkolinko
Author: kkolinko
Date: Thu Feb  5 18:12:31 2015
New Revision: 1657653

URL: http://svn.apache.org/r1657653
Log:
Fix compilation failure in a test class when using JDK 1.5.
The XPathFactory.newInstance(String, String, ClassLoader) method is @since Java 
1.6.

From code review, the only difference between old and new methods is presence 
of the second argument, 
com.sun.org.apache.xpath.internal.jaxp.XPathFactoryImpl. The null class 
loader is interpreted as TCCL by both methods, so there is no difference.
This test is @Ignore'd so it is not really tested.

Modified:

tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/common/xml/ForEachTagTest.java
tomcat/taglibs/standard/trunk/pom.xml

Modified: 
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/common/xml/ForEachTagTest.java
URL: 
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/common/xml/ForEachTagTest.java?rev=1657653r1=1657652r2=1657653view=diff
==
--- 
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/common/xml/ForEachTagTest.java
 (original)
+++ 
tomcat/taglibs/standard/trunk/impl/src/test/java/org/apache/taglibs/standard/tag/common/xml/ForEachTagTest.java
 Thu Feb  5 18:12:31 2015
@@ -218,7 +218,8 @@ public class ForEachTagTest {
 return doc;
 }
 };
-XPathFactory factory = 
XPathFactory.newInstance(XPathFactory.DEFAULT_OBJECT_MODEL_URI, 
com.sun.org.apache.xpath.internal.jaxp.XPathFactoryImpl, null);
+// XPathFactory factory = 
XPathFactory.newInstance(XPathFactory.DEFAULT_OBJECT_MODEL_URI, 
com.sun.org.apache.xpath.internal.jaxp.XPathFactoryImpl, null);
+XPathFactory factory = 
XPathFactory.newInstance(XPathFactory.DEFAULT_OBJECT_MODEL_URI);
 System.out.println(factory.getClass() =  + factory.getClass());
 factory.setXPathVariableResolver(resolver);
 XPathExpression select = factory.newXPath().compile($doc/root/a);

Modified: tomcat/taglibs/standard/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/pom.xml?rev=1657653r1=1657652r2=1657653view=diff
==
--- tomcat/taglibs/standard/trunk/pom.xml (original)
+++ tomcat/taglibs/standard/trunk/pom.xml Thu Feb  5 18:12:31 2015
@@ -65,6 +65,7 @@
 developernameHenri Yandell/name/developer
 developernameBjorn Townsend/name/developer
 developernameJeremy Boynes/name/developer
+developernameKonstantin Kolinko/name/developer
   /developers
 
   contributors



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



[Bug 57540] report TLS protocol version

2015-02-05 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=57540

--- Comment #5 from Mark Thomas ma...@apache.org ---
(In reply to Christopher Schultz from comment #4)
 (In reply to Ralf Hauser from comment #1)
  4) furthermore, I suggest to add in
  org.apache.tomcat.util.net.jsse.openssl.Protocol
  
  TLSv1_1(TLSv1.1)
 
 And TLSv1.0 and/or TLSv1.
 
 Would you care to prepare a patch? You've filed this against Tomcat 7, but
 if you can do it against the trunk (9.0) if would be easier to deal with.

Please don't waste your time on either of these changes. They will not be
applied as they will never be used. I recommend reading the Javadoc for that
class to understand why.

-- 
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 45014] Request and Response classes should have wrappers for use in Valves

2015-02-05 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=45014

--- Comment #3 from Christopher Schultz ch...@christopherschultz.net ---
Wow, a blast from the past. I had entirely forgotten about this.

I'll re-work the patch for trunk and see how far everything is interested in
back-porting. mr.oliver, what version of Tomcat are you using?

-- 
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 46902] LoginValve to bypass restrictions of j_security_check

2015-02-05 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=46902

--- Comment #7 from Christopher Schultz ch...@christopherschultz.net ---
As much as I like this kind of capability (particularly the addition of
landingPage and something like the proposal to add
forceLandingPageAfterAuth), I don't think is belongs in Tomcat because it's
out-of-spec.

I implemented a bunch of things in securityfilter to get around holes I saw in
the spec and while tempted to bring them into Tomcat, discarded the notion
because of that very fact (out-of-spec). I really hate product lock-in and it
would be a shame for Tomcat to go down that path.

Specifically, I implemented the following features in this area:

1. A landing page if there was no protected-page-access that caused the login
form to be displayed (same as the langingPage feature)
2. The ability for the login page to accept a next page that would basically
take the place of a landing page, or override it
3. The ability for the client to specify whether or not the post-authentication
action would be to REDIRECT or FORWARD to the landing page
4. The ability to pass request parameters to the login page which would then be
forwarded to the landing page

Some of this doesn't make sense unless you have very specific requirements
(which we did). In our use-case, we had two web applications that share a URL
space and one of them does not use sessions at all... it just passes-through
the session-id of the other application when we make loopback-requests to the
other application. If there's no session in the authenticated-application, we
have to sent the user to a login page, but then have them sent back to the
resource they were trying to access (which is in the non-authenticated
application). So, we can't just send the user to the protected resource
because that resource isn't directly-protected... instead, it's
protected-by-proxy.

It sounds outrageously stupid, but I promise it makes sense, and these features
helped us pull it off. :)

These days, with HttpServletRequest.authenticate() and
HttpServletRequest.login() being available, it seems like all of the capability
could be provided by a Filter on an unprotected resource rather than trying to
shoehorn it into the existing authentication valve.

-- 
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: r1657673 - in /tomcat/site/trunk: docs/index.html xdocs/index.xml

2015-02-05 Thread markt
Author: markt
Date: Thu Feb  5 19:46:37 2015
New Revision: 1657673

URL: http://svn.apache.org/r1657673
Log:
Fix copy/paste error in link

Modified:
tomcat/site/trunk/docs/index.html
tomcat/site/trunk/xdocs/index.xml

Modified: tomcat/site/trunk/docs/index.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/index.html?rev=1657673r1=1657672r2=1657673view=diff
==
--- tomcat/site/trunk/docs/index.html (original)
+++ tomcat/site/trunk/docs/index.html Thu Feb  5 19:46:37 2015
@@ -246,7 +246,7 @@ notable changes since 8.0.17 include:/p
 
 p
 Full details of these changes, and all the other changes, are available in the
-a href=tomcat-8.0-doc/changelog.html#Tomcat_8.0.17_(markt)Tomcat 8 
changelog/a.
+a href=tomcat-8.0-doc/changelog.htmlTomcat 8 changelog/a.
 /p
 
 

Modified: tomcat/site/trunk/xdocs/index.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/index.xml?rev=1657673r1=1657672r2=1657673view=diff
==
--- tomcat/site/trunk/xdocs/index.xml (original)
+++ tomcat/site/trunk/xdocs/index.xml Thu Feb  5 19:46:37 2015
@@ -51,7 +51,7 @@ notable changes since 8.0.17 include:/p
 
 p
 Full details of these changes, and all the other changes, are available in the
-a href=tomcat-8.0-doc/changelog.html#Tomcat_8.0.17_(markt)Tomcat 8 
changelog/a.
+a href=tomcat-8.0-doc/changelog.htmlTomcat 8 changelog/a.
 /p
 
 p style=text-align: center;



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



[Bug 57540] report TLS protocol version

2015-02-05 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=57540

--- Comment #4 from Christopher Schultz ch...@christopherschultz.net ---
(In reply to Ralf Hauser from comment #1)
 4) furthermore, I suggest to add in
 org.apache.tomcat.util.net.jsse.openssl.Protocol
 
 TLSv1_1(TLSv1.1)

And TLSv1.0 and/or TLSv1.

Would you care to prepare a patch? You've filed this against Tomcat 7, but if
you can do it against the trunk (9.0) if would be easier to deal with.

-- 
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 45014] Request and Response classes should have wrappers for use in Valves

2015-02-05 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=45014

--- Comment #4 from Remy Maucherat r...@apache.org ---
That is clearly not the point. Up until the filter chain, the core classes
should be used.

-- 
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 57540] report TLS protocol version

2015-02-05 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=57540

--- Comment #6 from Ralf Hauser hau...@acm.org ---
Created attachment 32437
  -- https://issues.apache.org/bugzilla/attachment.cgi?id=32437action=edit
apache.tomcat.tls.protocol.57540.patch

-- 
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: r1657682 - /tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java

2015-02-05 Thread fschumacher
Author: fschumacher
Date: Thu Feb  5 20:26:19 2015
New Revision: 1657682

URL: http://svn.apache.org/r1657682
Log:
Don't use instance scoped variables in try-with block, since it will get
closed, but not nulled.

Modified:
tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java

Modified: tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java?rev=1657682r1=1657681r2=1657682view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java Thu Feb  5 
20:26:19 2015
@@ -522,8 +522,8 @@ public class JDBCRealm
 // Ensure that we have an open database connection
 open();
 
-try (PreparedStatement stmt = credentials(dbConnection, 
username);
-ResultSet rs = stmt.executeQuery()) {
+PreparedStatement stmt = credentials(dbConnection, username);
+try (ResultSet rs = stmt.executeQuery()) {
 if (rs.next()) {
 dbCredentials = rs.getString(1);
 }
@@ -552,7 +552,6 @@ public class JDBCRealm
 return null;
 }
 
-
 /**
  * Return the Principal associated with the given user name.
  */
@@ -591,8 +590,8 @@ public class JDBCRealm
 // Ensure that we have an open database connection
 open();
 
-try (PreparedStatement stmt = roles(dbConnection, username);
-ResultSet rs = stmt.executeQuery()) {
+PreparedStatement stmt = roles(dbConnection, username);
+try (ResultSet rs = stmt.executeQuery()) {
 // Accumulate the user's roles
 ArrayListString roleList = new ArrayList();
 



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



svn commit: r1657683 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/realm/JDBCRealm.java webapps/docs/changelog.xml

2015-02-05 Thread fschumacher
Author: fschumacher
Date: Thu Feb  5 20:29:57 2015
New Revision: 1657683

URL: http://svn.apache.org/r1657683
Log:
Don't use instance scoped variables in try-with block, since it will get
closed, but not nulled.

Merge r1657682 from /tomcat/trunk

Modified:
tomcat/tc8.0.x/trunk/   (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/realm/JDBCRealm.java
tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc8.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb  5 20:29:57 2015
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
 
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657592,1657607,1657609,1657682

Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/realm/JDBCRealm.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/realm/JDBCRealm.java?rev=1657683r1=1657682r2=1657683view=diff
==
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/realm/JDBCRealm.java 
(original)
+++ 

[Bug 50504] Allow setting query string character set trough request attribute

2015-02-05 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=50504

Mark Thomas ma...@apache.org changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |WONTFIX

--- Comment #4 from Mark Thomas ma...@apache.org ---
Request URI decoding has to bee connector wide since the URI has to be decoded
before it is mapped.

If you want per web application control of query string encoding, use a filter
and call ServletRequest.setCharacterEncoding().

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