DO NOT REPLY [Bug 50726] New: Jasper can generate uncompilable source code if genStringAsCharArray is turned on

2011-02-07 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=50726

   Summary: Jasper can generate uncompilable source code if
genStringAsCharArray is turned on
   Product: Tomcat 6
   Version: 6.0.28
  Platform: All
OS/Version: All
Status: NEW
  Severity: normal
  Priority: P2
 Component: Jasper
AssignedTo: dev@tomcat.apache.org
ReportedBy: robert_ist...@epam.com


Our jsp pages are compiled at build time. If I turn on genStringAsCharArray
optimization switch, in some cases there will be longer lines in the generated
java code than the javac compiler can process. It provides the following error
message:

[javac] Compiling 1609 source files to d:\...\jspc\classes
[javac]
d:\...\jspc\src\org\apache\jsp\WEB_002dINF\..._005fAPP\pages\termsconditions\TermsAndConditions_005fms_005fMY_jsp.java:96:
constant string too long

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- 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: r1067949 - in /tomcat/tc5.5.x/trunk: STATUS.txt connectors/util/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java container/webapps/docs/changelog.xml container/webapps/docs/conf

2011-02-07 Thread kkolinko
Author: kkolinko
Date: Mon Feb  7 14:16:42 2011
New Revision: 1067949

URL: http://svn.apache.org/viewvc?rev=1067949&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50325
Use JVM provided solutions to CVE-2009-3555 if available (i.e. RFC 5746 support)

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

tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
tomcat/tc5.5.x/trunk/container/webapps/docs/config/http.xml

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1067949&r1=1067948&r2=1067949&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Mon Feb  7 14:16:42 2011
@@ -25,18 +25,6 @@ $Id$
 PATCHES PROPOSED TO BACKPORT:
   [ New proposals should be added at the end of the list ]
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50325
-  Use JVM provided solutions to CVE-2009-3555 if available (i.e. RFC 5746
-  support)
-  http://svn.apache.org/viewvc?rev=1065859&view=rev
-  +1: markt, kkolinko, pero
-  -1:
-   kkolinko:
- 1) s/for (String cipher : ciphers){/for (int i=0; 
ihttp://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java?rev=1067949&r1=1067948&r2=1067949&view=diff
==
--- 
tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
 Mon Feb  7 14:16:42 2011
@@ -26,9 +26,13 @@ import java.net.InetAddress;
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.net.SocketException;
+import java.security.KeyManagementException;
 import java.security.KeyStore;
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
 import java.util.Vector;
 
+import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLException;
 import javax.net.ssl.SSLServerSocket;
 import javax.net.ssl.SSLServerSocketFactory;
@@ -77,6 +81,29 @@ public abstract class JSSESocketFactory
 protected String[] enabledCiphers;
 protected boolean allowUnsafeLegacyRenegotiation = false;
 
+protected static final boolean RFC_5746_SUPPORTED;
+
+static {
+boolean result = false;
+SSLContext context;
+try {
+context = SSLContext.getInstance("TLS");
+context.init(null, null, new SecureRandom());
+SSLServerSocketFactory ssf = context.getServerSocketFactory();
+String ciphers[] = ssf.getSupportedCipherSuites();
+for (String cipher : ciphers) {
+if ("TLS_EMPTY_RENEGOTIATION_INFO_SCSV".equals(cipher)) {
+result = true;
+break;
+}
+}
+} catch (NoSuchAlgorithmException e) {
+// Assume no RFC 5746 support
+} catch (KeyManagementException e) {
+// Assume no RFC 5746 support
+}
+RFC_5746_SUPPORTED = result;
+}
 
 public JSSESocketFactory () {
 }
@@ -127,7 +154,7 @@ public abstract class JSSESocketFactory
 public void handshake(Socket sock) throws IOException {
 ((SSLSocket)sock).startHandshake();
 
-if (!allowUnsafeLegacyRenegotiation) {
+if (!allowUnsafeLegacyRenegotiation && !RFC_5746_SUPPORTED) {
 // Prevent futher handshakes by removing all cipher suites
 ((SSLSocket) sock).setEnabledCipherSuites(new String[0]);
 }

Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=1067949&r1=1067948&r2=1067949&view=diff
==
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Mon Feb  7 
14:16:42 2011
@@ -84,6 +84,12 @@
 Remove JSSE13Factory, JSSE13SocketFactory
 classes, as Tomcat 5.5 always runs on JRE 1.4 or later. (kkolinko)
   
+  
+50325: When the JVM indicates support for RFC 5746, disable
+Tomcat's allowUnsafeLegacyRenegotiation configuration
+attribute and use the JVM configuration to control renegotiation.
+(markt/kkolinko)
+  
 
   
 

Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/config/http.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/config/http.xml?rev=1067949&r1=1067948&r2=1067949&view=diff
==
--- tomcat/tc5.5.x/trunk/container/webapps/d

svn commit: r1067950 - /tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java

2011-02-07 Thread kkolinko
Author: kkolinko
Date: Mon Feb  7 14:27:49 2011
New Revision: 1067950

URL: http://svn.apache.org/viewvc?rev=1067950&view=rev
Log:
Followup r1067949
Fix loop syntax

Modified:

tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java

Modified: 
tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java?rev=1067950&r1=1067949&r2=1067950&view=diff
==
--- 
tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
 Mon Feb  7 14:27:49 2011
@@ -91,7 +91,8 @@ public abstract class JSSESocketFactory
 context.init(null, null, new SecureRandom());
 SSLServerSocketFactory ssf = context.getServerSocketFactory();
 String ciphers[] = ssf.getSupportedCipherSuites();
-for (String cipher : ciphers) {
+for (int i = 0; i < ciphers.length; i++) {
+String cipher = ciphers[i];
 if ("TLS_EMPTY_RENEGOTIATION_INFO_SCSV".equals(cipher)) {
 result = true;
 break;



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



DO NOT REPLY [Bug 48600] Performance issue with tags

2011-02-07 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=48600

patc...@portaildulibre.fr changed:

   What|Removed |Added

 CC|gilles.bardouillet@atosorig |patc...@portaildulibre.fr
   |in.com  |

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- 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



DO NOT REPLY [Bug 50325] Update Tomcat to use JRE provided solutions for CVE-2009-3555 if available

2011-02-07 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=50325

Konstantin Kolinko  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #3 from Konstantin Kolinko  2011-02-07 
10:03:13 EST ---
Fixed in 5.5 with r1067949 and r1067950 and will be in 5.5.33.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- 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: r1067959 - /tomcat/tc5.5.x/trunk/STATUS.txt

2011-02-07 Thread markt
Author: markt
Date: Mon Feb  7 15:12:14 2011
New Revision: 1067959

URL: http://svn.apache.org/viewvc?rev=1067959&view=rev
Log:
Vote

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

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1067959&r1=1067958&r2=1067959&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Mon Feb  7 15:12:14 2011
@@ -30,5 +30,5 @@ PATCHES PROPOSED TO BACKPORT:
   to allow more fine-grained control over which functionality is accessible,
   like it was done in Tomcat 6.
   http://people.apache.org/~kkolinko/patches/2011-02-03_tc55_roles.patch
-  +1: kkolinko, pero
+  +1: kkolinko, pero, markt
   -1:



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



svn commit: r1067963 - in /tomcat/tc5.5.x/trunk: ./ build/ build/resources/confinstall/ container/catalina/src/conf/ container/webapps/admin/WEB-INF/ container/webapps/docs/ container/webapps/host-man

2011-02-07 Thread markt
Author: markt
Date: Mon Feb  7 15:20:38 2011
New Revision: 1067963

URL: http://svn.apache.org/viewvc?rev=1067963&view=rev
Log:
Add additional roles to the Admin, Manager and Host-Manager applications 
(admin-gui, admin-script; manager-gui, manager-script, manager-jmx, 
manager-status) to allow more fine-grained control over which functionality is 
accessible.

Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc5.5.x/trunk/build/resources/confinstall/tomcat-users_1.xml
tomcat/tc5.5.x/trunk/build/tomcat.nsi
tomcat/tc5.5.x/trunk/container/catalina/src/conf/tomcat-users.xml
tomcat/tc5.5.x/trunk/container/webapps/admin/WEB-INF/web.xml
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
tomcat/tc5.5.x/trunk/container/webapps/host-manager/WEB-INF/web.xml
tomcat/tc5.5.x/trunk/container/webapps/manager/WEB-INF/web.xml

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1067963&r1=1067962&r2=1067963&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Mon Feb  7 15:20:38 2011
@@ -25,10 +25,3 @@ $Id$
 PATCHES PROPOSED TO BACKPORT:
   [ New proposals should be added at the end of the list ]
 
-* Add additional roles to the Admin, Manager and Host-Manager applications
-  (admin-gui, admin-script; manager-gui, manager-script, manager-jmx, 
manager-status)
-  to allow more fine-grained control over which functionality is accessible,
-  like it was done in Tomcat 6.
-  http://people.apache.org/~kkolinko/patches/2011-02-03_tc55_roles.patch
-  +1: kkolinko, pero, markt
-  -1:

Modified: tomcat/tc5.5.x/trunk/build/resources/confinstall/tomcat-users_1.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/build/resources/confinstall/tomcat-users_1.xml?rev=1067963&r1=1067962&r2=1067963&view=diff
==
--- tomcat/tc5.5.x/trunk/build/resources/confinstall/tomcat-users_1.xml 
(original)
+++ tomcat/tc5.5.x/trunk/build/resources/confinstall/tomcat-users_1.xml Mon Feb 
 7 15:20:38 2011
@@ -15,8 +15,8 @@
   limitations under the License.
 -->
 
 

Modified: tomcat/tc5.5.x/trunk/build/tomcat.nsi
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/build/tomcat.nsi?rev=1067963&r1=1067962&r2=1067963&view=diff
==
--- tomcat/tc5.5.x/trunk/build/tomcat.nsi (original)
+++ tomcat/tc5.5.x/trunk/build/tomcat.nsi Mon Feb  7 15:20:38 2011
@@ -433,7 +433,7 @@ Function pageComponentsLeave
   IntOp $0 $0 & ${SF_SELECTED}
   ${If} $0 <> 0
 StrCpy $TomcatAdminEnable "1"
-StrCpy $TomcatAdminRoles "manager"
+StrCpy $TomcatAdminRoles "manager-gui"
   ${EndIf}
 
   SectionGetFlags ${SecHostManager} $0
@@ -441,9 +441,9 @@ Function pageComponentsLeave
   ${If} $0 <> 0
 StrCpy $TomcatAdminEnable "1"
 ${If} $TomcatAdminRoles != ""
-  StrCpy $TomcatAdminRoles "admin,$TomcatAdminRoles"
+  StrCpy $TomcatAdminRoles "admin-gui,$TomcatAdminRoles"
 ${Else}
-  StrCpy $TomcatAdminRoles "admin"
+  StrCpy $TomcatAdminRoles "admin-gui"
 ${EndIf}
   ${EndIf}
 FunctionEnd

Modified: tomcat/tc5.5.x/trunk/container/catalina/src/conf/tomcat-users.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/conf/tomcat-users.xml?rev=1067963&r1=1067962&r2=1067963&view=diff
==
--- tomcat/tc5.5.x/trunk/container/catalina/src/conf/tomcat-users.xml (original)
+++ tomcat/tc5.5.x/trunk/container/catalina/src/conf/tomcat-users.xml Mon Feb  
7 15:20:38 2011
@@ -16,8 +16,8 @@
   limitations under the License.
 -->
 
 

Modified: tomcat/tc5.5.x/trunk/container/webapps/admin/WEB-INF/web.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/admin/WEB-INF/web.xml?rev=1067963&r1=1067962&r2=1067963&view=diff
==
--- tomcat/tc5.5.x/trunk/container/webapps/admin/WEB-INF/web.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/admin/WEB-INF/web.xml Mon Feb  7 
15:20:38 2011
@@ -129,6 +129,7 @@
 
 
   
+  admin-gui
   admin
 
   
@@ -148,6 +149,12 @@
 
   The role that is required to log in to the Administration Application
 
+admin-gui
+  
+  
+
+  Deprecated role name, that provides the same access as the "admin-gui" 
role.
+
 admin
   
 

Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=1067963&r1=1067962&r2=1067963&view=diff
==
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/web

DO NOT REPLY [Bug 50700] Context parameters are being overridden with parameters from the web application deployment descriptor

2011-02-07 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=50700

ch...@derham.me.uk changed:

   What|Removed |Added

 CC||ch...@derham.me.uk

--- Comment #2 from ch...@derham.me.uk 2011-02-07 11:22:09 EST ---
can reproduce using apache-tomcat-7.0.8-windows-x86.zip, jdk1.6.0_23, windows 7

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- 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



DO NOT REPLY [Bug 39740] semi-colon ; isn't allowed as a query argument separator

2011-02-07 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=39740

--- Comment #4 from Leigh L. Klotz, Jr.  2011-02-07 
13:43:44 EST ---
RFC 2616 is a red herring.  The character "&" doesn't appear in it, nor does
the word "ampersand."  HTTP is agnostic about the meaning of characters in
URIs; that's up to the applications on both ends.

There are many ways of forming URIs with meaning, and the query-string format
used by HTML4 is just one of them.  Granted W3C recommendations suggest
semicolon instead of ampersand, yet no desktop browsers do this.  However,
desktop browsers aren't the only users of HTTP or of Tomcat.  Many web-based
REST applications use HTTP to transport XML, JSON, ProtocolBuffers, and other
application data, and allowing Tomcat to handle other forms of query string
parsing would be a boon to these applications.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- 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



DO NOT REPLY [Bug 39740] semi-colon ; isn't allowed as a query argument separator

2011-02-07 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=39740

--- Comment #5 from Leigh L. Klotz, Jr.  2011-02-07 
14:39:11 EST ---
See http://www.restlet.org/documentation/2.0/jse/api/org/restlet/data/Form.html
Constructor Form(java.lang.String, org.restlet.data.CharacterSet, char)

Note that it also provides Matrix URL decoding.

-- 
Configure bugmail: https://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- 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: r1068078 - /tomcat/tc5.5.x/tags/TOMCAT_5_5_33/

2011-02-07 Thread jim
Author: jim
Date: Mon Feb  7 19:51:09 2011
New Revision: 1068078

URL: http://svn.apache.org/viewvc?rev=1068078&view=rev
Log:
Tagging Tomcat version TOMCAT_5_5_33.

Added:
tomcat/tc5.5.x/tags/TOMCAT_5_5_33/
  - copied from r1068077, tomcat/tc5.5.x/trunk/


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



[VOTE] Release Tomcat 5.5.33 Build

2011-02-07 Thread Jim Jagielski
The builds for Tomcat 5.5.33 are ready for testing and approval.
The candidates binaries are available here:

http://people.apache.org/~jim/tomcat-5.5/

According to the release process, the 5.5.33 build corresponding to the
tag TOMCAT_5_5_33 [1] is:

[ ] Broken
[ ] Alpha
[ ] Beta
[ ] Stable
+++

1. http://svn.apache.org/viewvc/tomcat/tc5.5.x/tags/TOMCAT_5_5_33/



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



Re: [VOTE] Release Tomcat 5.5.33 Build

2011-02-07 Thread Mladen Turk

On 02/07/2011 09:17 PM, Jim Jagielski wrote:


According to the release process, the 5.5.33 build corresponding to the
tag TOMCAT_5_5_33 [1] is:

[X] Stable


Dists look fine.


Cheers
--
^TM

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



svn commit: r1068143 - /tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/ExceptionUtils.java

2011-02-07 Thread rjung
Author: rjung
Date: Mon Feb  7 21:21:52 2011
New Revision: 1068143

URL: http://svn.apache.org/viewvc?rev=1068143&view=rev
Log:
Fix svn properties for new file. CTR.

Modified:

tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/ExceptionUtils.java
   (contents, props changed)

Modified: 
tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/ExceptionUtils.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/ExceptionUtils.java?rev=1068143&r1=1068142&r2=1068143&view=diff
==
--- 
tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/ExceptionUtils.java
 (original)
+++ 
tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/ExceptionUtils.java
 Mon Feb  7 21:21:52 2011
@@ -1,38 +1,38 @@
-/*
- * 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.tomcat.util;
-
-/**
- * Utilities for handling Throwables and Exceptions.
- */
-public class ExceptionUtils {
-
-/**
- * Checks whether the supplied Throwable is one that needs to be 
- * rethrown and swallows all others.
- * @param t the Throwable to check
- */
-public static void handleThrowable(Throwable t) {
-if (t instanceof ThreadDeath) {
-throw (ThreadDeath) t;
-}
-if (t instanceof VirtualMachineError) {
-throw (VirtualMachineError) t;
-}
-// All other instances of Throwable will be silently swallowed
-}
-}
+/*
+ * 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.tomcat.util;
+
+/**
+ * Utilities for handling Throwables and Exceptions.
+ */
+public class ExceptionUtils {
+
+/**
+ * Checks whether the supplied Throwable is one that needs to be 
+ * rethrown and swallows all others.
+ * @param t the Throwable to check
+ */
+public static void handleThrowable(Throwable t) {
+if (t instanceof ThreadDeath) {
+throw (ThreadDeath) t;
+}
+if (t instanceof VirtualMachineError) {
+throw (VirtualMachineError) t;
+}
+// All other instances of Throwable will be silently swallowed
+}
+}

Propchange: 
tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/ExceptionUtils.java
--
svn:eol-style = native

Propchange: 
tomcat/tc5.5.x/trunk/connectors/util/java/org/apache/tomcat/util/ExceptionUtils.java
--
svn:keywords = Author Date Id Revision



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



Re: [VOTE] Release Tomcat 5.5.33 Build

2011-02-07 Thread Rainer Jung

On 07.02.2011 21:17, Jim Jagielski wrote:

The builds for Tomcat 5.5.33 are ready for testing and approval.
The candidates binaries are available here:

http://people.apache.org/~jim/tomcat-5.5/

According to the release process, the 5.5.33 build corresponding to the
tag TOMCAT_5_5_33 [1] is:

[ ] Broken
[ ] Alpha
[ ] Beta
[ ] Stable
+++

1. http://svn.apache.org/viewvc/tomcat/tc5.5.x/tags/TOMCAT_5_5_33/


"version" in build.properties.default wasn't updated (still 5.5.32), but 
the compiled properties file contains the right version 5.5.33. So I 
would say it's acceptable. I'm voting later, because tests still run.


Regards,

Rainer

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



Re: [VOTE] Release Tomcat 5.5.33 Build

2011-02-07 Thread Rainer Jung

On 07.02.2011 21:17, Jim Jagielski wrote:

The builds for Tomcat 5.5.33 are ready for testing and approval.
The candidates binaries are available here:

http://people.apache.org/~jim/tomcat-5.5/

According to the release process, the 5.5.33 build corresponding to the
tag TOMCAT_5_5_33 [1] is:

[ ] Broken
[ ] Alpha
[ ] Beta
[X] Stable
+++

1. http://svn.apache.org/viewvc/tomcat/tc5.5.x/tags/TOMCAT_5_5_33/


Rainer

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



Re: svn commit: r1067498 - in /tomcat/site/trunk: docs/security-7.html xdocs/security-7.xml

2011-02-07 Thread Jim Riggs
On Feb 5, 2011, at 2:09 PM, ma...@apache.org wrote:

> This was identified by the Tomcat security team on 27 Feb 2011 and
>made public on 5 Feb 2011.

> This was identified by the Tomcat security team on 27 Feb 2011 and
>made public on 5 Feb 2011.


I'm guessing these should be 27 Jan not 27 Feb?


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



svn commit: r1068276 - /tomcat/tc5.5.x/trunk/build/build.properties.default

2011-02-07 Thread kkolinko
Author: kkolinko
Date: Tue Feb  8 06:59:49 2011
New Revision: 1068276

URL: http://svn.apache.org/viewvc?rev=1068276&view=rev
Log:
bump version number

Modified:
tomcat/tc5.5.x/trunk/build/build.properties.default

Modified: tomcat/tc5.5.x/trunk/build/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/build/build.properties.default?rev=1068276&r1=1068275&r2=1068276&view=diff
==
--- tomcat/tc5.5.x/trunk/build/build.properties.default (original)
+++ tomcat/tc5.5.x/trunk/build/build.properties.default Tue Feb  8 06:59:49 2011
@@ -12,10 +12,10 @@
 # - Vesion Control Flags -
 version.major=5
 version.minor=5
-version.build=32
+version.build=33
 version.patch=0
 #Set the pretty version name
-version=5.5.32
+version=5.5.33
 
 # - Compile Control Flags -
 compile.debug=on



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



Re: [VOTE] Release Tomcat 5.5.33 Build

2011-02-07 Thread Konstantin Kolinko
2011/2/7 Jim Jagielski :
> The builds for Tomcat 5.5.33 are ready for testing and approval.
> The candidates binaries are available here:
>
> http://people.apache.org/~jim/tomcat-5.5/
>
> According to the release process, the 5.5.33 build corresponding to the
> tag TOMCAT_5_5_33 [1] is:
>
> [ ] Broken
> [ ] Alpha
> [ ] Beta
> [ ] Stable

Runs good, but as Rainer already noted,  build.properties.default both
in the src bundles and in the svn tag says that it is 5.5.32

Thus whoever will try to build it from the sources will get wrong
version number.


I think it would be better to re-tag (or update the
build.properties.default inside the tag) and to rebuild the packages.
Is it possible?

I updated  build.properties.default in tc5.5.x/trunk in r1068276

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: r1068282 - in /tomcat/site/trunk: docs/security-6.html docs/security-7.html xdocs/security-6.xml xdocs/security-7.xml

2011-02-07 Thread kkolinko
Author: kkolinko
Date: Tue Feb  8 07:37:26 2011
New Revision: 1068282

URL: http://svn.apache.org/viewvc?rev=1068282&view=rev
Log:
Correct the date
thanks to Jim Riggs for noting it

Modified:
tomcat/site/trunk/docs/security-6.html
tomcat/site/trunk/docs/security-7.html
tomcat/site/trunk/xdocs/security-6.xml
tomcat/site/trunk/xdocs/security-7.xml

Modified: tomcat/site/trunk/docs/security-6.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-6.html?rev=1068282&r1=1068281&r2=1068282&view=diff
==
--- tomcat/site/trunk/docs/security-6.html (original)
+++ tomcat/site/trunk/docs/security-6.html Tue Feb  8 07:37:26 2011
@@ -337,7 +337,7 @@
http://svn.apache.org/viewvc?rev=1066313&view=rev";>
revision 1066313.
 
-This was identified by the Tomcat security team on 27 Feb 2011 and
+This was identified by the Tomcat security team on 27 Jan 2011 and
made public on 5 Feb 2011.
 
 Affects: 6.0.0-6.0.30

Modified: tomcat/site/trunk/docs/security-7.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-7.html?rev=1068282&r1=1068281&r2=1068282&view=diff
==
--- tomcat/site/trunk/docs/security-7.html (original)
+++ tomcat/site/trunk/docs/security-7.html Tue Feb  8 07:37:26 2011
@@ -306,7 +306,7 @@
http://svn.apache.org/viewvc?rev=1065939&view=rev";>
revision 1065939.
 
-This was identified by the Tomcat security team on 27 Feb 2011 and
+This was identified by the Tomcat security team on 27 Jan 2011 and
made public on 5 Feb 2011.
 
 Affects: 7.0.0-7.0.6

Modified: tomcat/site/trunk/xdocs/security-6.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-6.xml?rev=1068282&r1=1068281&r2=1068282&view=diff
==
--- tomcat/site/trunk/xdocs/security-6.xml (original)
+++ tomcat/site/trunk/xdocs/security-6.xml Tue Feb  8 07:37:26 2011
@@ -50,7 +50,7 @@
http://svn.apache.org/viewvc?rev=1066313&view=rev";>
revision 1066313.
 
-This was identified by the Tomcat security team on 27 Feb 2011 and
+This was identified by the Tomcat security team on 27 Jan 2011 and
made public on 5 Feb 2011.
 
 Affects: 6.0.0-6.0.30

Modified: tomcat/site/trunk/xdocs/security-7.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-7.xml?rev=1068282&r1=1068281&r2=1068282&view=diff
==
--- tomcat/site/trunk/xdocs/security-7.xml (original)
+++ tomcat/site/trunk/xdocs/security-7.xml Tue Feb  8 07:37:26 2011
@@ -45,7 +45,7 @@
http://svn.apache.org/viewvc?rev=1065939&view=rev";>
revision 1065939.
 
-This was identified by the Tomcat security team on 27 Feb 2011 and
+This was identified by the Tomcat security team on 27 Jan 2011 and
made public on 5 Feb 2011.
 
 Affects: 7.0.0-7.0.6



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



Re: svn commit: r1067498 - in /tomcat/site/trunk: docs/security-7.html xdocs/security-7.xml

2011-02-07 Thread Konstantin Kolinko
2011/2/8 Jim Riggs :
> On Feb 5, 2011, at 2:09 PM, ma...@apache.org wrote:
>
>>     This was identified by the Tomcat security team on 27 Feb 2011 and
>>        made public on 5 Feb 2011.
>
>>     This was identified by the Tomcat security team on 27 Feb 2011 and
>>        made public on 5 Feb 2011.
>
>
> I'm guessing these should be 27 Jan not 27 Feb?

Yes, January. Thank you for noting.

Best regards,
Konstantin Kolinko

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