svn commit: r1142904 - in /tomcat/trunk: java/org/apache/catalina/security/SecurityConfig.java webapps/docs/changelog.xml
Author: kkolinko
Date: Tue Jul 5 07:10:31 2011
New Revision: 1142904
URL: http://svn.apache.org/viewvc?rev=1142904&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51473
Fix concatenation of values in SecurityConfig.setSecurityProperty()
when the value provided by JRE is null.
Modified:
tomcat/trunk/java/org/apache/catalina/security/SecurityConfig.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/security/SecurityConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/security/SecurityConfig.java?rev=1142904&r1=1142903&r2=1142904&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/security/SecurityConfig.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/security/SecurityConfig.java Tue Jul
5 07:10:31 2011
@@ -39,6 +39,8 @@ public final class SecurityConfig{
+ ",org.apache.coyote."
+ ",org.apache.tomcat.";
+// FIX ME package "javax." was removed to prevent HotSpot
+// fatal internal errors
private static final String PACKAGE_DEFINITION= "java.,sun."
+ ",org.apache.catalina."
+ ",org.apache.coyote."
@@ -117,13 +119,14 @@ public final class SecurityConfig{
if (System.getSecurityManager() != null){
String definition = Security.getProperty(properties);
if( definition != null && definition.length() > 0 ){
-definition += ",";
+if (packageList.length() > 0) {
+definition = definition + ',' + packageList;
+}
+} else {
+definition = packageList;
}
-Security.setProperty(properties,
-// FIX ME package "javax." was removed to prevent HotSpot
-// fatal internal errors
-definition + packageList);
+Security.setProperty(properties, definition);
}
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1142904&r1=1142903&r2=1142904&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Jul 5 07:10:31 2011
@@ -70,6 +70,10 @@
listeners and filters are stopped in a separate thread rather than the
current thread. Patch provided by Felix Schumacher. (markt)
+
+51473: Fix concatenation of values in
+SecurityConfig.setSecurityProperty(). (kkolinko)
+
@@ -89,7 +93,7 @@
-
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1142906 - in /tomcat: tc5.5.x/trunk/STATUS.txt tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Tue Jul 5 07:13:07 2011 New Revision: 1142906 URL: http://svn.apache.org/viewvc?rev=1142906&view=rev Log: proposal Modified: tomcat/tc5.5.x/trunk/STATUS.txt tomcat/tc6.0.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=1142906&r1=1142905&r2=1142906&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Tue Jul 5 07:13:07 2011 @@ -120,3 +120,10 @@ PATCHES PROPOSED TO BACKPORT: http://svn.apache.org/viewvc?rev=1142784&view=rev +1: markt -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51473 + Fix concatenation of values in SecurityConfig.setSecurityProperty() + when the value provided by JRE is null. + http://svn.apache.org/viewvc?rev=1142904&view=rev + +1: kkolinko + -1: Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1142906&r1=1142905&r2=1142906&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jul 5 07:13:07 2011 @@ -224,3 +224,10 @@ PATCHES PROPOSED TO BACKPORT: Changelog: http://commons.apache.org/pool/changes-report.html +1: kkolinko -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51473 + Fix concatenation of values in SecurityConfig.setSecurityProperty() + when the value provided by JRE is null. + http://svn.apache.org/viewvc?rev=1142904&view=rev + +1: kkolinko + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51473] SecurityConfig，set "package.definition" security property to "nullsun.,java.,..."
https://issues.apache.org/bugzilla/show_bug.cgi?id=51473 Konstantin Kolinko changed: What|Removed |Added Component|Catalina|Catalina Version|7.0.16 |5.5.33 Product|Tomcat 7|Tomcat 5 --- Comment #2 from Konstantin Kolinko 2011-07-05 07:14:01 UTC --- Fixed in Tomcat 7 - will be in 7.0.18. Proposed for 6.0 and 5.5. -- 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: r1142923 - in /tomcat/trunk: res/tomcat.nsi webapps/docs/changelog.xml
Author: kkolinko
Date: Tue Jul 5 08:31:52 2011
New Revision: 1142923
URL: http://svn.apache.org/viewvc?rev=1142923&view=rev
Log:
Further improvements to the Windows installer
1. Install into "**/Tomcat7.0_servicename" when service name differs from
default,
but install into "**/Tomcat7.0" if the name is the default one.
This is to be in line with 7.0.16 and earlier versions, but
differs from 7.0.17 which used "**/Tomcat7.0/servicename".
2. Changed name of registry key for running of Tomcat Monitor
3. Do not forget to delete Tomcat Monitor running entry from HKCU in 32-bit
part of registry
Modified:
tomcat/trunk/res/tomcat.nsi
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/res/tomcat.nsi
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/tomcat.nsi?rev=1142923&r1=1142922&r2=1142923&view=diff
==
--- tomcat/trunk/res/tomcat.nsi (original)
+++ tomcat/trunk/res/tomcat.nsi Tue Jul 5 08:31:52 2011
@@ -51,6 +51,7 @@ Var TomcatPortAjp
Var TomcatMenuEntriesEnable
Var TomcatShortcutAllUsers
Var TomcatServiceName
+Var TomcatServiceDefaultName
Var TomcatServiceFileName
Var TomcatServiceManagerFileName
Var TomcatAdminEnable
@@ -215,11 +216,11 @@ Section "Core" SecTomcatCore
FileSeek $ServiceInstallLog 0 END
InstallRetry:
- FileWrite $ServiceInstallLog '"$INSTDIR\bin\$TomcatServiceFileName"
//IS//$TomcatServiceName --DisplayName "Apache Tomcat @VERSION_MAJOR@
$TomcatServiceName" --Description "Apache Tomcat @VERSION@ Server -
http://tomcat.apache.org/"; --LogPath "$INSTDIR\logs" --Install
"$INSTDIR\bin\$TomcatServiceFileName" --Jvm "$JvmDll" --StartPath "$INSTDIR"
--StopPath "$INSTDIR"'
+ FileWrite $ServiceInstallLog '"$INSTDIR\bin\$TomcatServiceFileName"
//IS//$TomcatServiceName --DisplayName "Apache Tomcat @VERSION_MAJOR_MINOR@
$TomcatServiceName" --Description "Apache Tomcat @VERSION@ Server -
http://tomcat.apache.org/"; --LogPath "$INSTDIR\logs" --Install
"$INSTDIR\bin\$TomcatServiceFileName" --Jvm "$JvmDll" --StartPath "$INSTDIR"
--StopPath "$INSTDIR"'
FileWrite $ServiceInstallLog "$\r$\n"
ClearErrors
DetailPrint "Installing $TomcatServiceName service"
- nsExec::ExecToStack '"$INSTDIR\bin\$TomcatServiceFileName"
//IS//$TomcatServiceName --DisplayName "Apache Tomcat @VERSION_MAJOR@
$TomcatServiceName" --Description "Apache Tomcat @VERSION@ Server -
http://tomcat.apache.org/"; --LogPath "$INSTDIR\logs" --Install
"$INSTDIR\bin\$TomcatServiceFileName" --Jvm "$JvmDll" --StartPath "$INSTDIR"
--StopPath "$INSTDIR"'
+ nsExec::ExecToStack '"$INSTDIR\bin\$TomcatServiceFileName"
//IS//$TomcatServiceName --DisplayName "Apache Tomcat @VERSION_MAJOR_MINOR@
$TomcatServiceName" --Description "Apache Tomcat @VERSION@ Server -
http://tomcat.apache.org/"; --LogPath "$INSTDIR\logs" --Install
"$INSTDIR\bin\$TomcatServiceFileName" --Jvm "$JvmDll" --StartPath "$INSTDIR"
--StopPath "$INSTDIR"'
Pop $0
Pop $1
StrCmp $0 "0" InstallOk
@@ -331,9 +332,9 @@ Section -post
nsExec::ExecToLog '"$INSTDIR\bin\$TomcatServiceFileName"
//US//$TomcatServiceName --StdOutput auto --StdError auto'
${If} $TomcatShortcutAllUsers == "1"
-WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Run"
"ApacheTomcatMonitor@VERSION_MAJOR_MINOR@$TomcatServiceName"
'"$INSTDIR\bin\$TomcatServiceManagerFileName" //MS//$TomcatServiceName'
+WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Run"
"ApacheTomcatMonitor@VERSION_MAJOR_MINOR@_$TomcatServiceName"
'"$INSTDIR\bin\$TomcatServiceManagerFileName" //MS//$TomcatServiceName'
${Else}
-WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Run"
"ApacheTomcatMonitor@VERSION_MAJOR_MINOR@$TomcatServiceName"
'"$INSTDIR\bin\$TomcatServiceManagerFileName" //MS//$TomcatServiceName'
+WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Run"
"ApacheTomcatMonitor@VERSION_MAJOR_MINOR@_$TomcatServiceName"
'"$INSTDIR\bin\$TomcatServiceManagerFileName" //MS//$TomcatServiceName'
${EndIf}
${If} $TomcatMenuEntriesEnable == "1"
@@ -373,7 +374,8 @@ Function .onInit
StrCpy $TomcatPortAjp "8009"
StrCpy $TomcatMenuEntriesEnable "0"
StrCpy $TomcatShortcutAllUsers "0"
- StrCpy $TomcatServiceName "Tomcat@VERSION_MAJOR@"
+ StrCpy $TomcatServiceDefaultName "Tomcat@VERSION_MAJOR@"
+ StrCpy $TomcatServiceName $TomcatServiceDefaultName
StrCpy $TomcatServiceFileName "Tomcat@VERSION_MAJOR@.exe"
StrCpy $TomcatServiceManagerFileName "Tomcat@version_ma...@w.exe"
StrCpy $TomcatAdminEnable "0"
@@ -546,7 +548,13 @@ Function pageConfigurationLeave
${NSD_GetText} $CtlTomcatAdminPassword $TomcatAdminPassword
${NSD_GetText} $CtlTomcatAdminRoles $TomcatAdminRoles
${EndIf}
-
+
+ ${If} $TomcatServiceName == ""
+MessageBox MB_ICONEXCLAMATION|MB_OK 'The Service Name may not be empty'
+Abort "Config not right"
+Goto exit
+ ${EndIf}
+
Push $TomcatServiceName
Call validateServiceName
svn commit: r1142925 - in /tomcat: tc5.5.x/trunk/STATUS.txt tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Tue Jul 5 08:36:04 2011 New Revision: 1142925 URL: http://svn.apache.org/viewvc?rev=1142925&view=rev Log: add recent commit to installer enhancements backport proposal Modified: tomcat/tc5.5.x/trunk/STATUS.txt tomcat/tc6.0.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=1142925&r1=1142924&r2=1142925&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Tue Jul 5 08:36:04 2011 @@ -118,6 +118,7 @@ PATCHES PROPOSED TO BACKPORT: http://svn.apache.org/viewvc?rev=1142001&view=rev http://svn.apache.org/viewvc?rev=1142012&view=rev http://svn.apache.org/viewvc?rev=1142784&view=rev + http://svn.apache.org/viewvc?rev=1142923&view=rev +1: markt -1: Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1142925&r1=1142924&r2=1142925&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jul 5 08:36:04 2011 @@ -183,6 +183,7 @@ PATCHES PROPOSED TO BACKPORT: http://svn.apache.org/viewvc?rev=1142001&view=rev http://svn.apache.org/viewvc?rev=1142012&view=rev http://svn.apache.org/viewvc?rev=1142784&view=rev + http://svn.apache.org/viewvc?rev=1142923&view=rev +1: markt -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat 7.0.17
2011/7/3 Konstantin Kolinko : > 2011/7/3 Mark Thomas : > > 1) "Windows Service Name" field does not restrict you from putting > anything there. >(...) > > 2) Tomcat 7 now by default installs into > "%ProgramFiles%\Apache Software Foundation\Tomcat 7.0\Tomcat7". >(...) > BTW, an alternative could be to use sibling folders instead of nested > ones, adding a suffix to the name, e.g.: > "%ProgramFiles%\Apache Software Foundation\Tomcat 7.0_servicename" > and remove the "_servicename" part if the name is the default one. > For the record: 1) was addressed by r1142784 2) was addresses by r1142923 7.0.18 will install to the same directory as 7.0.16 and earlier, unless one changes the service name. 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: r1142930 - in /tomcat: tc5.5.x/trunk/STATUS.txt tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Tue Jul 5 08:58:19 2011 New Revision: 1142930 URL: http://svn.apache.org/viewvc?rev=1142930&view=rev Log: propose backport of fix for BZ 51324 Modified: tomcat/tc5.5.x/trunk/STATUS.txt tomcat/tc6.0.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=1142930&r1=1142929&r2=1142930&view=diff == --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Tue Jul 5 08:58:19 2011 @@ -128,3 +128,11 @@ PATCHES PROPOSED TO BACKPORT: http://svn.apache.org/viewvc?rev=1142904&view=rev +1: kkolinko -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51324 + Improve handling of exceptions when flushing the response buffer to + ensure that the doFlush flag does not get stuck in the enabled state. + Patch by Jeremy Norris. + http://svn.apache.org/viewvc?rev=1133014&view=rev + +1: kkolinko + -1: Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1142930&r1=1142929&r2=1142930&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jul 5 08:58:19 2011 @@ -232,3 +232,11 @@ PATCHES PROPOSED TO BACKPORT: http://svn.apache.org/viewvc?rev=1142904&view=rev +1: kkolinko -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51324 + Improve handling of exceptions when flushing the response buffer to + ensure that the doFlush flag does not get stuck in the enabled state. + Patch by Jeremy Norris. + http://svn.apache.org/viewvc?rev=1133014&view=rev + +1: kkolinko + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51324] When OutputBuffer.doFlush gets Exception, doFlush gets stuck to true
https://issues.apache.org/bugzilla/show_bug.cgi?id=51324 --- Comment #4 from Konstantin Kolinko 2011-07-05 08:59:07 UTC --- Proposed for backport to 6.0 and 5.5. -- 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 51475] New: GzipInterceptor#decompress is not completly implemented
https://issues.apache.org/bugzilla/show_bug.cgi?id=51475 Bug #: 51475 Summary: GzipInterceptor#decompress is not completly implemented Product: Tomcat 6 Version: 6.0.29 Platform: PC OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: Cluster AssignedTo: dev@tomcat.apache.org ReportedBy: cstoe...@amaris.de Classification: Unclassified Created attachment 27254 --> https://issues.apache.org/bugzilla/attachment.cgi?id=27254 Patch file für GzipInterceptor While testing the GzipInterceptor I was wondering about the strange errors: "Unable to decompress byte contents". At first I thougt, I was using the interceptor in wrong order. But taking a look the source shows a TODO at method decompress: "Fix to create an automatically growing buffer." Because we have session properties which are compressed larger than 2048 bytes, the interceptor didn't work, in our case. I've created a patch. See my attachement. -- 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 51475] GzipInterceptor#decompress is not completly implemented
https://issues.apache.org/bugzilla/show_bug.cgi?id=51475 Christian Stöber changed: What|Removed |Added CC||cstoe...@amaris.de -- 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: r1142953 - in /tomcat/trunk: java/javax/el/BeanELResolver.java webapps/docs/changelog.xml
Author: markt
Date: Tue Jul 5 10:03:06 2011
New Revision: 1142953
URL: http://svn.apache.org/viewvc?rev=1142953&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51472
Correctly test modifiers when resolving bean methods with the BeanELResolver.
Patch provided by Friedhelm Kuehn.
Modified:
tomcat/trunk/java/javax/el/BeanELResolver.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/javax/el/BeanELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/BeanELResolver.java?rev=1142953&r1=1142952&r2=1142953&view=diff
==
--- tomcat/trunk/java/javax/el/BeanELResolver.java (original)
+++ tomcat/trunk/java/javax/el/BeanELResolver.java Tue Jul 5 10:03:06 2011
@@ -312,7 +312,7 @@ public class BeanELResolver extends ELRe
}
private static final Method getMethod(Class type, Method m) {
-if (m == null || Modifier.isPublic(type.getModifiers())) {
+if (m == null || Modifier.isPublic(m.getModifiers())) {
return m;
}
Class[] inf = type.getInterfaces();
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1142953&r1=1142952&r2=1142953&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Jul 5 10:03:06 2011
@@ -84,6 +84,14 @@
+
+
+
+51472: Correctly test modifiers when resolving bean methods
+with the BeanELResolver. Patch provided by Friedhelm Kuehn. (markt)
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1142955 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Tue Jul 5 10:04:44 2011 New Revision: 1142955 URL: http://svn.apache.org/viewvc?rev=1142955&view=rev Log: Proposal Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1142955&r1=1142954&r2=1142955&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jul 5 10:04:44 2011 @@ -240,3 +240,9 @@ PATCHES PROPOSED TO BACKPORT: http://svn.apache.org/viewvc?rev=1133014&view=rev +1: kkolinko -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51472 + Correctly test modifiers when resolving bean methods with the BeanELResolver. + Patch provided by Friedhelm Kuehn. + +1: markt + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51472] Bugin ? in BeanELResolver.getMethod()
https://issues.apache.org/bugzilla/show_bug.cgi?id=51472 Mark Thomas changed: What|Removed |Added Component|Servlet & JSP API |Jasper Version|7.0.16 |6.0.32 Product|Tomcat 7|Tomcat 6 Target Milestone|--- |default OS/Version||All --- Comment #1 from Mark Thomas 2011-07-05 10:05:18 UTC --- Thanks for the patch. Fixed in 7.0.x and will be included in 7.0.18 onwards. Proposed for 6.0.x -- 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: r1142959 - in /tomcat/trunk: java/org/apache/catalina/connector/Response.java webapps/docs/changelog.xml
Author: rjung
Date: Tue Jul 5 10:08:00 2011
New Revision: 1142959
URL: http://svn.apache.org/viewvc?rev=1142959&view=rev
Log:
Fix response.encodeURL() for the special case of
an absolute URL with no path segment (http://name).
Modified:
tomcat/trunk/java/org/apache/catalina/connector/Response.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/connector/Response.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Response.java?rev=1142959&r1=1142958&r2=1142959&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/Response.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Response.java Tue Jul 5
10:08:00 2011
@@ -1198,8 +1198,10 @@ public class Response
String absolute = toAbsolute(url);
if (isEncodeable(absolute)) {
// W3c spec clearly said
-if (url.equalsIgnoreCase("")){
+if (url.equalsIgnoreCase("")) {
url = absolute;
+} else if (url.equals(absolute) && !hasPath(url)) {
+url += '/';
}
return (toEncoded(url,
request.getSessionInternal().getIdInternal()));
} else {
@@ -1648,6 +1650,21 @@ public class Response
/**
+ * Determine if an absolute URL has a path component
+ */
+private boolean hasPath(String uri) {
+int pos = uri.indexOf("://");
+if (pos < 0) {
+return false;
+}
+pos = uri.indexOf('/', pos + 3);
+if (pos < 0) {
+return false;
+}
+return true;
+}
+
+/**
* Determine if a URI string has a scheme component.
*/
private boolean hasScheme(String uri) {
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1142959&r1=1142958&r2=1142959&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Jul 5 10:08:00 2011
@@ -74,6 +74,10 @@
51473: Fix concatenation of values in
SecurityConfig.setSecurityProperty(). (kkolinko)
+
+Fix response.encodeURL() for the special case of an absolute URL
+with no path segment (http://name). (rjung)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1142962 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Tue Jul 5 10:12:53 2011 New Revision: 1142962 URL: http://svn.apache.org/viewvc?rev=1142962&view=rev Log: Votes, withdraw proposal Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1142962&r1=1142961&r2=1142962&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jul 5 10:12:53 2011 @@ -137,7 +137,7 @@ PATCHES PROPOSED TO BACKPORT: * https://issues.apache.org/bugzilla/show_bug.cgi?id=51403 Avoid NPE in JULI FileHandler if formatter is misconfigured http://svn.apache.org/viewvc?rev=1137996&view=rev - +1: kkolinko, schultz + +1: kkolinko, schultz, markt -1: * Fix truncated cookies. @@ -159,7 +159,7 @@ PATCHES PROPOSED TO BACKPORT: Additional patch: http://svn.apache.org/viewvc?rev=1142043&view=rev - +1: kkolinko + +1: kkolinko, markt -1: * Multiple improvements to the Windows Installer @@ -187,20 +187,12 @@ PATCHES PROPOSED TO BACKPORT: +1: markt -1: -* Notifications of changes in session ID to other nodes in the cluster should be - controlled by notifySessionListenersOnReplication rather than - notifyListenersOnReplication. - http://svn.apache.org/viewvc?rev=1140801&view=rev - +1: markt +* The change in session ID is notified to not the session listener but the + container event listener. + http://svn.apache.org/viewvc?view=revision&revision=1141441 + +1: kfujino, markt -1: - Alternative patch. - The change in session ID is notified to not the session listener but the - container event listener. - http://svn.apache.org/viewvc?view=revision&revision=1141441 - +1: kfujino - -1: - * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49929 No definitive information that this is the fix but back-porting Mladen's fix from 7.0.x can't hurt and may help @@ -223,14 +215,14 @@ PATCHES PROPOSED TO BACKPORT: http://svn.apache.org/viewvc?rev=1095138&view=rev It is used in TC7 since 7.0.14 Changelog: http://commons.apache.org/pool/changes-report.html - +1: kkolinko + +1: kkolinko, markt -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51473 Fix concatenation of values in SecurityConfig.setSecurityProperty() when the value provided by JRE is null. http://svn.apache.org/viewvc?rev=1142904&view=rev - +1: kkolinko + +1: kkolinko, markt -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51324 @@ -238,7 +230,7 @@ PATCHES PROPOSED TO BACKPORT: ensure that the doFlush flag does not get stuck in the enabled state. Patch by Jeremy Norris. http://svn.apache.org/viewvc?rev=1133014&view=rev - +1: kkolinko + +1: kkolinko, markt -1: * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51472 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: response.encodeURL("http://localhost:8080") produces an invalid URL?
On 29.06.2011 13:55, Konstantin Kolinko wrote:
> 2011/6/29 Rainer Jung :
>> Motivated by
>>
>> https://issues.apache.org/jira/browse/WICKET-3841
>>
>> I tested response.encodeURL("http://localhost:8080";) and I get
>> http://localhost:8080;jsessionid=... (cookies off).
>>
>> Note that there is no slash between the port and the sessionid path info.
>>
>> According to my reading of RFC3986 (URIs), the input URI is a correct
>> URI, the resulting URI is not: because it has an authority, the rest
>> must be zero or more path-abempty, which always start with a slash.
>>
>> Did anyone stumble over this yet? If there's no objections, I'll write a
>> patch and check, what the TCK has to say.
>>
>> The spec does not see to contain any specification of encodeURL apart
>> from the JavaDoc.
>>
>
> From RFC3986 alone I agree that
> 1) http://localhost:8080
> looks like a valid URL by RFC3986.
> (like any other URL without a trailing slash, e.g. mailto:)
>
> From HTTP standpoint it should be http://localhost:8080/ and in my
> experience browsers add the trailing slash automatically. I have not
> looked whether the actual HTTP spec is more strict regarding such
> URLs.
>
> 2) http://localhost:8080;jsessionid=...
> is an invalid URL.
>
> I am +1 to use "/" as the path if it is an absolute URL, scheme is
> http or https and the path is empty. (I guess that there is a check
> for the scheme name already?).
If the URI doesn't point to the application itself, encodeURL() doesn't
change the URL. This is especially true, for any non-http(s) scheme.
> So that it becomes
> http://localhost:8080/;jsessionid=...
Implemented in r1142959.
Now the next question is about encodeRedirectURL(). It behaves like
encodeURL() except it doesn't fix empty URLs ("") and does not yet have
the empty path fix. This difference seems to go back long in time (I
checked back until 2003). Should we keep this difference (don't fix if
it ain't broken), or should encodeRedirectURL() behave exactly the same
as encodeURL()?
Regards,
Rainer
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1142953 - in /tomcat/trunk: java/javax/el/BeanELResolver.java webapps/docs/changelog.xml
2011/7/5 :
> Author: markt
> Date: Tue Jul 5 10:03:06 2011
> New Revision: 1142953
>
> URL: http://svn.apache.org/viewvc?rev=1142953&view=rev
> Log:
> Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51472
> Correctly test modifiers when resolving bean methods with the BeanELResolver.
> Patch provided by Friedhelm Kuehn.
>
> Modified:
> tomcat/trunk/java/javax/el/BeanELResolver.java
> tomcat/trunk/webapps/docs/changelog.xml
> private static final Method getMethod(Class type, Method m) {
> - if (m == null || Modifier.isPublic(type.getModifiers())) {
> + if (m == null || Modifier.isPublic(m.getModifiers())) {
I think the old code is the correct one.
See that below that in BeanELResolver.getMethod() we call
Class..getMethod(...) which returns only public methods.
If I understand it correctly BeanELResolver.getMethod() checks that
- either the class declaring the method is public, or
- the method is a public one declared in a public parent or public
interface implemented by this class.
Best regards,
Konstantin Kolinko
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51475] GzipInterceptor#decompress is not completly implemented
https://issues.apache.org/bugzilla/show_bug.cgi?id=51475 --- Comment #1 from Mark Thomas 2011-07-05 10:29:53 UTC --- There are a number of issues with the patch as currently proposed. - It uses tabs rather than spaces - In includes whitespace changes that add noise - Tests should be provided as JUnit tests in the separate tests directory in the source tree -- 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
Re: svn commit: r1142953 - in /tomcat/trunk: java/javax/el/BeanELResolver.java webapps/docs/changelog.xml
On 05/07/2011 11:21, Konstantin Kolinko wrote:
> 2011/7/5 :
>> Author: markt
>> Date: Tue Jul 5 10:03:06 2011
>> New Revision: 1142953
>>
>> URL: http://svn.apache.org/viewvc?rev=1142953&view=rev
>> Log:
>> Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51472
>> Correctly test modifiers when resolving bean methods with the BeanELResolver.
>> Patch provided by Friedhelm Kuehn.
>>
>> Modified:
>>tomcat/trunk/java/javax/el/BeanELResolver.java
>>tomcat/trunk/webapps/docs/changelog.xml
>
>
>
>> private static final Method getMethod(Class type, Method m) {
>> -if (m == null || Modifier.isPublic(type.getModifiers())) {
>> +if (m == null || Modifier.isPublic(m.getModifiers())) {
>
> I think the old code is the correct one.
I think you're right.
> See that below that in BeanELResolver.getMethod() we call
> Class..getMethod(...) which returns only public methods.
I was looking at the calls to desciptor.get[Read|Write]Method and didn't
follow the code far enough to find the limit to just public methods.
I'll revert the patch.
Mark
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1142972 - in /tomcat/trunk: java/javax/el/BeanELResolver.java webapps/docs/changelog.xml
Author: markt
Date: Tue Jul 5 10:42:15 2011
New Revision: 1142972
URL: http://svn.apache.org/viewvc?rev=1142972&view=rev
Log:
Revert r1142953. The analysis was incorrect.
Modified:
tomcat/trunk/java/javax/el/BeanELResolver.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/javax/el/BeanELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/BeanELResolver.java?rev=1142972&r1=1142971&r2=1142972&view=diff
==
--- tomcat/trunk/java/javax/el/BeanELResolver.java (original)
+++ tomcat/trunk/java/javax/el/BeanELResolver.java Tue Jul 5 10:42:15 2011
@@ -312,7 +312,7 @@ public class BeanELResolver extends ELRe
}
private static final Method getMethod(Class type, Method m) {
-if (m == null || Modifier.isPublic(m.getModifiers())) {
+if (m == null || Modifier.isPublic(type.getModifiers())) {
return m;
}
Class[] inf = type.getInterfaces();
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1142972&r1=1142971&r2=1142972&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Jul 5 10:42:15 2011
@@ -88,14 +88,6 @@
-
-
-
-51472: Correctly test modifiers when resolving bean methods
-with the BeanELResolver. Patch provided by Friedhelm Kuehn. (markt)
-
-
-
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1142974 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Tue Jul 5 10:42:41 2011 New Revision: 1142974 URL: http://svn.apache.org/viewvc?rev=1142974&view=rev Log: Withdraw patch Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1142974&r1=1142973&r2=1142974&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jul 5 10:42:41 2011 @@ -232,9 +232,3 @@ PATCHES PROPOSED TO BACKPORT: http://svn.apache.org/viewvc?rev=1133014&view=rev +1: kkolinko, markt -1: - -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51472 - Correctly test modifiers when resolving bean methods with the BeanELResolver. - Patch provided by Friedhelm Kuehn. - +1: markt - -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51472] Bugin ? in BeanELResolver.getMethod()
https://issues.apache.org/bugzilla/show_bug.cgi?id=51472 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Comment #2 from Mark Thomas 2011-07-05 10:43:40 UTC --- The patch has been reverted from 7.0.x and the proposed patch for 6.0.x withdrawn. The analysis is incorrect. The current code is correct. Detailed discussion on the dev list. -- 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: r1142996 - /tomcat/trunk/build.xml
Author: markt Date: Tue Jul 5 11:36:41 2011 New Revision: 1142996 URL: http://svn.apache.org/viewvc?rev=1142996&view=rev Log: Limit exclusion to 'old' tests so tests added to o.a.catalina.tribes will execute Modified: tomcat/trunk/build.xml Modified: tomcat/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1142996&r1=1142995&r2=1142996&view=diff == --- tomcat/trunk/build.xml (original) +++ tomcat/trunk/build.xml Tue Jul 5 11:36:41 2011 @@ -1093,7 +1093,7 @@ - + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51472] Bugin ? in BeanELResolver.getMethod()
https://issues.apache.org/bugzilla/show_bug.cgi?id=51472
--- Comment #3 from friedhelm.ku...@cms-it-services.de 2011-07-05 11:38:50 UTC
---
Sorry for my proposal, in case it is truely not correct.
However, I was not able to get the follwing bean working:
class xyz {
public getAbc(){
...
}
}
because I forgot to explcitly mark the class 'public'.
- getAbc was not defined in an Interface (as normally is)
- getAbc was not defined in superClass
After marking class 'public' it worked.
Works as designed ?
--
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: r1143016 - in /tomcat/trunk/test/org/apache/catalina/tribes: group/ group/interceptors/ io/ membership/ test/ test/channel/ test/interceptors/ test/io/ test/membership/
Author: markt Date: Tue Jul 5 12:06:04 2011 New Revision: 1143016 URL: http://svn.apache.org/viewvc?rev=1143016&view=rev Log: Move working JUnit tests to align with package of class being tested. Added: tomcat/trunk/test/org/apache/catalina/tribes/group/ tomcat/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java - copied, changed from r1142970, tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestMemberArrival.java tomcat/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelOptionFlag.java - copied, changed from r1142970, tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestChannelOptionFlag.java tomcat/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelSenderConnections.java - copied, changed from r1142970, tomcat/trunk/test/org/apache/catalina/tribes/test/io/TestSenderConnections.java tomcat/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelStartStop.java - copied, changed from r1142970, tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestChannelStartStop.java tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/ - copied from r1142970, tomcat/trunk/test/org/apache/catalina/tribes/test/interceptors/ tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/TestDomainFilterInterceptor.java - copied, changed from r1142970, tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestDomainFilter.java tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/TestTcpFailureDetector.java - copied, changed from r1142970, tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestTcpFailureDetector.java tomcat/trunk/test/org/apache/catalina/tribes/io/ - copied from r1142970, tomcat/trunk/test/org/apache/catalina/tribes/test/io/ tomcat/trunk/test/org/apache/catalina/tribes/io/TestXByteBuffer.java - copied, changed from r1142970, tomcat/trunk/test/org/apache/catalina/tribes/test/io/TestSerialization.java tomcat/trunk/test/org/apache/catalina/tribes/membership/ - copied from r1142970, tomcat/trunk/test/org/apache/catalina/tribes/test/membership/ tomcat/trunk/test/org/apache/catalina/tribes/membership/TestMemberImplSerialization.java - copied, changed from r1142970, tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestMemberSerialization.java Removed: tomcat/trunk/test/org/apache/catalina/tribes/io/TestSenderConnections.java tomcat/trunk/test/org/apache/catalina/tribes/io/TestSerialization.java tomcat/trunk/test/org/apache/catalina/tribes/membership/TestDomainFilter.java tomcat/trunk/test/org/apache/catalina/tribes/membership/TestMemberArrival.java tomcat/trunk/test/org/apache/catalina/tribes/membership/TestMemberSerialization.java tomcat/trunk/test/org/apache/catalina/tribes/membership/TestTcpFailureDetector.java tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestChannelOptionFlag.java tomcat/trunk/test/org/apache/catalina/tribes/test/channel/TestChannelStartStop.java tomcat/trunk/test/org/apache/catalina/tribes/test/interceptors/ tomcat/trunk/test/org/apache/catalina/tribes/test/io/ tomcat/trunk/test/org/apache/catalina/tribes/test/membership/ Modified: tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/TestNonBlockingCoordinator.java tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/TestOrderInterceptor.java tomcat/trunk/test/org/apache/catalina/tribes/test/TribesTestSuite.java Copied: tomcat/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java (from r1142970, tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestMemberArrival.java) URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java?p2=tomcat/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java&p1=tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestMemberArrival.java&r1=1142970&r2=1143016&rev=1143016&view=diff == --- tomcat/trunk/test/org/apache/catalina/tribes/test/membership/TestMemberArrival.java (original) +++ tomcat/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java Tue Jul 5 12:06:04 2011 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.catalina.tribes.test.membership; +package org.apache.catalina.tribes.group; import java.util.ArrayList; @@ -24,9 +24,8 @@ import org.apache.catalina.tribes.Channe import org.apache.catalina.tribes.ManagedChannel; import org.apache.catalina.tribes.Member; import org.apache.catalina.tribes.MembershipListener; -import org.apache.catalina.tribes.group.GroupChannel; -public class TestMemberArrival +public c
DO NOT REPLY [Bug 51475] GzipInterceptor#decompress is not completly implemented
https://issues.apache.org/bugzilla/show_bug.cgi?id=51475 --- Comment #2 from Christian Stöber 2011-07-05 12:08:55 UTC --- Created attachment 27256 --> https://issues.apache.org/bugzilla/attachment.cgi?id=27256 Patch file for GzipInterceptor, TestGzipInterceptor and TribesTestSuite Okay. I've checked out Tomcat 6.0.x from subversion in my ecplise and created a new patch through eclipse. For me the patch looks better now. I've also removed the test code from GzipInterceptor and have written a small JUnit test case. -- 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: r1143019 - /tomcat/trunk/test/org/apache/catalina/tribes/io/TestXByteBuffer.java
Author: markt
Date: Tue Jul 5 12:21:37 2011
New Revision: 1143019
URL: http://svn.apache.org/viewvc?rev=1143019&view=rev
Log:
Remove ununsed methods.
Convert from using main() to a unit test
Use valid test data
Modified:
tomcat/trunk/test/org/apache/catalina/tribes/io/TestXByteBuffer.java
Modified: tomcat/trunk/test/org/apache/catalina/tribes/io/TestXByteBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/io/TestXByteBuffer.java?rev=1143019&r1=1143018&r2=1143019&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/tribes/io/TestXByteBuffer.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/tribes/io/TestXByteBuffer.java Tue
Jul 5 12:21:37 2011
@@ -19,20 +19,19 @@ package org.apache.catalina.tribes.io;
import junit.framework.TestCase;
public class TestXByteBuffer extends TestCase {
-@Override
-protected void setUp() throws Exception {
-super.setUp();
-}
-
+
public void testEmptyArray() throws Exception {
// TODO
}
-@Override
-protected void tearDown() throws Exception {
-super.tearDown();
+public void testSerializationString() throws Exception {
+String test = "This is as test.";
+byte[] msg = XByteBuffer.serialize(test);
+Object obj = XByteBuffer.deserialize(msg);
+assertTrue(obj instanceof String);
+assertEquals(test, obj);
}
-
+
public static void main(String[] args) throws Exception {
//XByteBuffer.deserialize(new byte[0]);
XByteBuffer.deserialize(new byte[] {-84, -19, 0, 5, 115, 114, 0, 17,
106});
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1143020 - /tomcat/trunk/test/org/apache/catalina/tribes/io/TestXByteBuffer.java
Author: markt
Date: Tue Jul 5 12:22:03 2011
New Revision: 1143020
URL: http://svn.apache.org/viewvc?rev=1143020&view=rev
Log:
Remove main method
Modified:
tomcat/trunk/test/org/apache/catalina/tribes/io/TestXByteBuffer.java
Modified: tomcat/trunk/test/org/apache/catalina/tribes/io/TestXByteBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/io/TestXByteBuffer.java?rev=1143020&r1=1143019&r2=1143020&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/tribes/io/TestXByteBuffer.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/tribes/io/TestXByteBuffer.java Tue
Jul 5 12:22:03 2011
@@ -31,10 +31,4 @@ public class TestXByteBuffer extends Tes
assertTrue(obj instanceof String);
assertEquals(test, obj);
}
-
-public static void main(String[] args) throws Exception {
-//XByteBuffer.deserialize(new byte[0]);
-XByteBuffer.deserialize(new byte[] {-84, -19, 0, 5, 115, 114, 0, 17,
106});
-}
-
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1143022 - in /tomcat/trunk: java/org/apache/catalina/tribes/io/XByteBuffer.java test/org/apache/catalina/tribes/io/TestXByteBuffer.java
Author: markt
Date: Tue Jul 5 12:25:38 2011
New Revision: 1143022
URL: http://svn.apache.org/viewvc?rev=1143022&view=rev
Log:
Based on current usage within Tomcat, message length of 0 should result in null.
Populate the test for this and ensure the test passes.
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java
tomcat/trunk/test/org/apache/catalina/tribes/io/TestXByteBuffer.java
Modified: tomcat/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java?rev=1143022&r1=1143021&r2=1143022&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/io/XByteBuffer.java Tue Jul 5
12:25:38 2011
@@ -561,7 +561,7 @@ public class XByteBuffer
invokecount.addAndGet(1);
Object message = null;
if ( cls == null ) cls = new ClassLoader[0];
-if (data != null) {
+if (data != null && length > 0) {
InputStream instream = new
ByteArrayInputStream(data,offset,length);
ObjectInputStream stream = null;
stream = (cls.length>0)? new ReplicationStream(instream,cls):new
ObjectInputStream(instream);
Modified: tomcat/trunk/test/org/apache/catalina/tribes/io/TestXByteBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/io/TestXByteBuffer.java?rev=1143022&r1=1143021&r2=1143022&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/tribes/io/TestXByteBuffer.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/tribes/io/TestXByteBuffer.java Tue
Jul 5 12:25:38 2011
@@ -21,7 +21,8 @@ import junit.framework.TestCase;
public class TestXByteBuffer extends TestCase {
public void testEmptyArray() throws Exception {
-// TODO
+Object obj = XByteBuffer.deserialize(new byte[0]);
+assertNull(obj);
}
public void testSerializationString() throws Exception {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1143023 - /tomcat/trunk/test/org/apache/catalina/tribes/membership/TestMemberImplSerialization.java
Author: markt
Date: Tue Jul 5 12:26:09 2011
New Revision: 1143023
URL: http://svn.apache.org/viewvc?rev=1143023&view=rev
Log:
Remove unused code
Modified:
tomcat/trunk/test/org/apache/catalina/tribes/membership/TestMemberImplSerialization.java
Modified:
tomcat/trunk/test/org/apache/catalina/tribes/membership/TestMemberImplSerialization.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/membership/TestMemberImplSerialization.java?rev=1143023&r1=1143022&r2=1143023&view=diff
==
---
tomcat/trunk/test/org/apache/catalina/tribes/membership/TestMemberImplSerialization.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/tribes/membership/TestMemberImplSerialization.java
Tue Jul 5 12:26:09 2011
@@ -107,10 +107,4 @@ public class TestMemberImplSerialization
result = result && impl1.getPort() == impl2.getPort();
return result;
}
-
-@Override
-protected void tearDown() throws Exception {
-super.tearDown();
-}
-
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1143025 - /tomcat/trunk/webapps/docs/changelog.xml
Author: markt Date: Tue Jul 5 12:28:50 2011 New Revision: 1143025 URL: http://svn.apache.org/viewvc?rev=1143025&view=rev Log: Update changelog Modified: tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1143025&r1=1143024&r2=1143025&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Tue Jul 5 12:28:50 2011 @@ -88,6 +88,15 @@ + + + +Re-factor tests to align packages for tests with the classes under test. +Start to convert non-JUnit tests to JUnit. Remove unnecessary code. +(markt) + + + - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51468] Redirect Valve
https://issues.apache.org/bugzilla/show_bug.cgi?id=51468 --- Comment #6 from Christopher Schultz 2011-07-05 14:45:04 UTC --- A few questions: 1. Why a Valve and not a Filter? 2. Why not use urlrewrite like everyone else? -- 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: r1143126 - /tomcat/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java
Author: markt Date: Tue Jul 5 16:21:51 2011 New Revision: 1143126 URL: http://svn.apache.org/viewvc?rev=1143126&view=rev Log: Prevent test failures on Linux Modified: tomcat/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java Modified: tomcat/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java?rev=1143126&r1=1143125&r2=1143126&view=diff == --- tomcat/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java (original) +++ tomcat/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java Tue Jul 5 16:21:51 2011 @@ -67,7 +67,11 @@ public class TestGroupChannelMemberArriv }; threads[i] = t; } -for (int i=0; i
svn commit: r1143130 - in /tomcat/trunk: java/org/apache/catalina/tribes/group/interceptors/GzipInterceptor.java test/org/apache/catalina/tribes/group/interceptors/TestGzipInterceptor.java
Author: markt
Date: Tue Jul 5 16:32:28 2011
New Revision: 1143130
URL: http://svn.apache.org/viewvc?rev=1143130&view=rev
Log:
Extract test to a test case
Added:
tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/TestGzipInterceptor.java
(with props)
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/GzipInterceptor.java
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/GzipInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/GzipInterceptor.java?rev=1143130&r1=1143129&r2=1143130&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/GzipInterceptor.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/GzipInterceptor.java
Tue Jul 5 16:32:28 2011
@@ -20,7 +20,6 @@ package org.apache.catalina.tribes.group
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
-import java.util.Arrays;
import java.util.zip.GZIPInputStream;
import java.util.zip.GZIPOutputStream;
@@ -33,10 +32,7 @@ import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
-
/**
- *
- *
* @author Filip Hanik
* @version 1.0
*/
@@ -95,14 +91,4 @@ public class GzipInterceptor extends Cha
System.arraycopy(tmp,0,result,0,length);
return result;
}
-
-public static void main(String[] arg) throws Exception {
-byte[] data = new byte[1024];
-Arrays.fill(data,(byte)1);
-byte[] compress = compress(data);
-decompress(compress);
-System.out.println("Debug test");
-
-}
-
}
Added:
tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/TestGzipInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/TestGzipInterceptor.java?rev=1143130&view=auto
==
---
tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/TestGzipInterceptor.java
(added)
+++
tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/TestGzipInterceptor.java
Tue Jul 5 16:32:28 2011
@@ -0,0 +1,32 @@
+/*
+ * 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.tribes.group.interceptors;
+
+import java.util.Arrays;
+
+import junit.framework.TestCase;
+
+public class TestGzipInterceptor extends TestCase {
+
+public void testBasic() throws Exception {
+byte[] data = new byte[1024];
+Arrays.fill(data,(byte)1);
+byte[] compress = GzipInterceptor.compress(data);
+byte[] result = GzipInterceptor.decompress(compress);
+assertTrue(Arrays.equals(data, result));
+}
+}
Propchange:
tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/TestGzipInterceptor.java
--
svn:eol-style = native
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1143134 - in /tomcat/trunk: java/org/apache/catalina/tribes/group/interceptors/GzipInterceptor.java test/org/apache/catalina/tribes/group/interceptors/TestGzipInterceptor.java
Author: markt
Date: Tue Jul 5 16:45:38 2011
New Revision: 1143134
URL: http://svn.apache.org/viewvc?rev=1143134&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51475
Handle messages larger than the buffer size. Expand test cases to cover this.
Based on a patch by Christian Stöber.
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/GzipInterceptor.java
tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/TestGzipInterceptor.java
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/GzipInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/GzipInterceptor.java?rev=1143134&r1=1143133&r2=1143134&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/GzipInterceptor.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/GzipInterceptor.java
Tue Jul 5 16:45:38 2011
@@ -77,18 +77,20 @@ public class GzipInterceptor extends Cha
}
/**
- * TODO Fix to create an automatically growing buffer.
- * @param data byte[]
- * @return byte[]
+ * @param data Data to decompress
+ * @return Decompressed data
* @throws IOException
*/
public static byte[] decompress(byte[] data) throws IOException {
+ByteArrayOutputStream bout = new ByteArrayOutputStream();
ByteArrayInputStream bin = new ByteArrayInputStream(data);
GZIPInputStream gin = new GZIPInputStream(bin);
byte[] tmp = new byte[DEFAULT_BUFFER_SIZE];
-int length = gin.read(tmp);
-byte[] result = new byte[length];
-System.arraycopy(tmp,0,result,0,length);
-return result;
+int length = 0;
+while (length > -1) {
+bout.write(tmp, 0, length);
+length = gin.read(tmp);
+}
+return bout.toByteArray();
}
}
Modified:
tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/TestGzipInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/TestGzipInterceptor.java?rev=1143134&r1=1143133&r2=1143134&view=diff
==
---
tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/TestGzipInterceptor.java
(original)
+++
tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/TestGzipInterceptor.java
Tue Jul 5 16:45:38 2011
@@ -22,9 +22,37 @@ import junit.framework.TestCase;
public class TestGzipInterceptor extends TestCase {
-public void testBasic() throws Exception {
-byte[] data = new byte[1024];
-Arrays.fill(data,(byte)1);
+public void testSmallerThanBufferSize() throws Exception {
+doCompressDecompress(GzipInterceptor.DEFAULT_BUFFER_SIZE / 2);
+}
+
+public void testJustSmallerThanBufferSize() throws Exception {
+doCompressDecompress(GzipInterceptor.DEFAULT_BUFFER_SIZE -1);
+}
+
+public void testExactBufferSize() throws Exception {
+doCompressDecompress(GzipInterceptor.DEFAULT_BUFFER_SIZE);
+}
+
+public void testJustLargerThanBufferSize() throws Exception {
+doCompressDecompress(GzipInterceptor.DEFAULT_BUFFER_SIZE + 1);
+}
+
+public void testFactor2BufferSize() throws Exception {
+doCompressDecompress(GzipInterceptor.DEFAULT_BUFFER_SIZE * 2);
+}
+
+public void testFactor4BufferSize() throws Exception {
+doCompressDecompress(GzipInterceptor.DEFAULT_BUFFER_SIZE * 4);
+}
+
+public void testMuchLargerThanBufferSize() throws Exception {
+doCompressDecompress(GzipInterceptor.DEFAULT_BUFFER_SIZE * 10 + 1000);
+}
+
+private void doCompressDecompress(int size) throws Exception {
+byte[] data = new byte[size];
+Arrays.fill(data, (byte)1);
byte[] compress = GzipInterceptor.compress(data);
byte[] result = GzipInterceptor.decompress(compress);
assertTrue(Arrays.equals(data, result));
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1143136 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: markt Date: Tue Jul 5 16:47:02 2011 New Revision: 1143136 URL: http://svn.apache.org/viewvc?rev=1143136&view=rev Log: Propose patch Modified: tomcat/tc6.0.x/trunk/STATUS.txt Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1143136&r1=1143135&r2=1143136&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jul 5 16:47:02 2011 @@ -232,3 +232,10 @@ PATCHES PROPOSED TO BACKPORT: http://svn.apache.org/viewvc?rev=1133014&view=rev +1: kkolinko, markt -1: + +* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51475 + Handle Gzip messages larger than the default buffer size + Based on a patch by Christian Stöber + http://svn.apache.org/viewvc?rev=1143134&view=rev (GzipInterceptor.java only) + +1: markt + -1: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51475] GzipInterceptor#decompress is not completly implemented
https://issues.apache.org/bugzilla/show_bug.cgi?id=51475 --- Comment #3 from Mark Thomas 2011-07-05 16:48:34 UTC --- Thanks for the updated patch. There are still some unnecessary changes in that patch that distract from the changes that fix the problem. Also, new files need to include a license header. I have fixed 7.0.x based on your patch and the fix will be included in 7.0.18 onwards. I have also proposed the fix for 6.0.x. -- 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 51477] New: Fix for 51073 Breaks SSLv3+TLSv1 Protocol Support in APR Connector
https://issues.apache.org/bugzilla/show_bug.cgi?id=51477 Bug #: 51477 Summary: Fix for 51073 Breaks SSLv3+TLSv1 Protocol Support in APR Connector Product: Tomcat 7 Version: unspecified Platform: PC OS/Version: Linux Status: NEW Severity: normal Priority: P2 Component: Connectors AssignedTo: dev@tomcat.apache.org ReportedBy: marvin.addi...@gmail.com Classification: Unclassified We have used SSLProtocol="SSLv3+TLSv1" with the APR connectors in 6.0.x and 7.0.x successfully to support both SSLv3 and TLSv1 protocols exclusively (no SSLv2 support). The following openssl s_client connection tests demonstrate this functionality with 7.0.8: $ openssl s_client -connect eiger.middleware.vt.edu:443 -tls1 CONNECTED(0003) ... SSL handshake has read 6158 bytes and written 293 bytes --- New, TLSv1/SSLv3, Cipher is DHE-RSA-AES256-SHA Server public key is 2048 bit Secure Renegotiation IS supported Compression: zlib compression Expansion: zlib compression SSL-Session: Protocol : TLSv1 ... $ openssl s_client -connect eiger.middleware.vt.edu:443 -ssl3 CONNECTED(0003) ... SSL handshake has read 6027 bytes and written 319 bytes --- New, TLSv1/SSLv3, Cipher is DHE-RSA-AES256-SHA Server public key is 2048 bit Secure Renegotiation IS supported Compression: zlib compression Expansion: zlib compression SSL-Session: Protocol : SSLv3 ... $ openssl s_client -connect eiger.middleware.vt.edu:443 -ssl2 15389:error:140A90C4:SSL routines:SSL_CTX_new:null ssl method passed:ssl_lib.c:1453: Upon upgrading to Tomcat 7.0.16, which includes the fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=51073, our desired protocol combination fails with the expected "unsupported protocol" message. Unfortunately, none of the officially supported strings mentioned at http://tomcat.apache.org/tomcat-7.0-doc/config/http.html#SSL%20Support provide the desired protocol support. In particular the protocol values are exclusive, where setting SSLProtocol="SSLv3" prevents TLSv1 connections and vice versa. The following s_client tests confirm this behavior: (7.0.16 with SSLProtocol="SSLv3") $ openssl s_client -connect eiger.middleware.vt.edu:443 -tls1 CONNECTED(0003) 15696:error:1408F10B:SSL routines:SSL3_GET_RECORD:wrong version number:s3_pkt.c:293: $ openssl s_client -connect eiger.middleware.vt.edu:443 -ssl3 CONNECTED(0003) ... SSL handshake has read 6027 bytes and written 319 bytes --- New, TLSv1/SSLv3, Cipher is DHE-RSA-AES256-SHA Server public key is 2048 bit Secure Renegotiation IS supported Compression: zlib compression Expansion: zlib compression SSL-Session: Protocol : SSLv3 ... (7.0.16 with SSLProtocol="TLSv1") $ openssl s_client -connect eiger.middleware.vt.edu:443 -tls1 CONNECTED(0003) ... SSL handshake has read 6158 bytes and written 293 bytes --- New, TLSv1/SSLv3, Cipher is DHE-RSA-AES256-SHA Server public key is 2048 bit Secure Renegotiation IS supported Compression: zlib compression Expansion: zlib compression SSL-Session: Protocol : TLSv1 ... $ openssl s_client -connect eiger.middleware.vt.edu:443 -ssl3 CONNECTED(0003) 15816:error:14094410:SSL routines:SSL3_READ_BYTES:sslv3 alert handshake failure:s3_pkt.c:1102:SSL alert number 40 15816:error:1409E0E5:SSL routines:SSL3_WRITE_BYTES:ssl handshake failure:s3_pkt.c:539: -- 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 51477] Fix for 51073 Breaks SSLv3+TLSv1 Protocol Support in APR Connector
https://issues.apache.org/bugzilla/show_bug.cgi?id=51477 Marvin Addison changed: What|Removed |Added Version|unspecified |7.0.16 --- Comment #1 from Marvin Addison 2011-07-05 16:53:58 UTC --- Set Tomcat version to 7.0.16. -- 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
Re: svn commit: r1143134 - in /tomcat/trunk: java/org/apache/catalina/tribes/group/interceptors/GzipInterceptor.java test/org/apache/catalina/tribes/group/interceptors/TestGzipInterceptor.java
2011/7/5 :
> Author: markt
> Date: Tue Jul 5 16:45:38 2011
> New Revision: 1143134
>
> URL: http://svn.apache.org/viewvc?rev=1143134&view=rev
> Log:
> Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51475
> Handle messages larger than the buffer size. Expand test cases to cover this.
> Based on a patch by Christian Stöber.
>
> Modified:
>
> tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/GzipInterceptor.java
>
> tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/TestGzipInterceptor.java
>
> public static byte[] decompress(byte[] data) throws IOException {
> + ByteArrayOutputStream bout = new ByteArrayOutputStream();
The above has initial size of 32 bytes.
It looks too short but I do not know what typical sizes are in tribes here.
DEFAULT_BUFFER_SIZE will be 2Kb.
> ByteArrayInputStream bin = new ByteArrayInputStream(data);
> GZIPInputStream gin = new GZIPInputStream(bin);
> byte[] tmp = new byte[DEFAULT_BUFFER_SIZE];
> - int length = gin.read(tmp);
> - byte[] result = new byte[length];
> - System.arraycopy(tmp,0,result,0,length);
> - return result;
> + int length = 0;
Just
int length = gin.read(tmp);
will save an iteration.
> + while (length > -1) {
> + bout.write(tmp, 0, length);
> + length = gin.read(tmp);
> + }
> + return bout.toByteArray();
> }
> }
Best regards,
Konstantin Kolinko
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1143134 - in /tomcat/trunk: java/org/apache/catalina/tribes/group/interceptors/GzipInterceptor.java test/org/apache/catalina/tribes/group/interceptors/TestGzipInterceptor.java
On 05/07/2011 18:23, Konstantin Kolinko wrote:
> 2011/7/5 :
>> Author: markt
>> Date: Tue Jul 5 16:45:38 2011
>> New Revision: 1143134
>>
>> URL: http://svn.apache.org/viewvc?rev=1143134&view=rev
>> Log:
>> Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51475
>> Handle messages larger than the buffer size. Expand test cases to cover this.
>> Based on a patch by Christian Stöber.
>>
>> Modified:
>>
>> tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/GzipInterceptor.java
>>
>> tomcat/trunk/test/org/apache/catalina/tribes/group/interceptors/TestGzipInterceptor.java
>>
>
>> public static byte[] decompress(byte[] data) throws IOException {
>> +ByteArrayOutputStream bout = new ByteArrayOutputStream();
>
> The above has initial size of 32 bytes.
> It looks too short but I do not know what typical sizes are in tribes here.
Nor me, but assuming there was a reason for the 2k lets go with that.
> DEFAULT_BUFFER_SIZE will be 2Kb.
>
>
>> ByteArrayInputStream bin = new ByteArrayInputStream(data);
>> GZIPInputStream gin = new GZIPInputStream(bin);
>> byte[] tmp = new byte[DEFAULT_BUFFER_SIZE];
>> -int length = gin.read(tmp);
>> -byte[] result = new byte[length];
>> -System.arraycopy(tmp,0,result,0,length);
>> -return result;
>> +int length = 0;
>
> Just
> int length = gin.read(tmp);
> will save an iteration.
ack.
Cheers.
Mark
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1143150 - /tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/GzipInterceptor.java
Author: markt
Date: Tue Jul 5 17:28:44 2011
New Revision: 1143150
URL: http://svn.apache.org/viewvc?rev=1143150&view=rev
Log:
Review comments
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/GzipInterceptor.java
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/GzipInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/GzipInterceptor.java?rev=1143150&r1=1143149&r2=1143150&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/GzipInterceptor.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/GzipInterceptor.java
Tue Jul 5 17:28:44 2011
@@ -82,11 +82,12 @@ public class GzipInterceptor extends Cha
* @throws IOException
*/
public static byte[] decompress(byte[] data) throws IOException {
-ByteArrayOutputStream bout = new ByteArrayOutputStream();
+ByteArrayOutputStream bout =
+new ByteArrayOutputStream(DEFAULT_BUFFER_SIZE);
ByteArrayInputStream bin = new ByteArrayInputStream(data);
GZIPInputStream gin = new GZIPInputStream(bin);
byte[] tmp = new byte[DEFAULT_BUFFER_SIZE];
-int length = 0;
+int length = gin.read(tmp);
while (length > -1) {
bout.write(tmp, 0, length);
length = gin.read(tmp);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51477] Fix for 51073 Breaks SSLv3+TLSv1 Protocol Support in APR Connector
https://issues.apache.org/bugzilla/show_bug.cgi?id=51477 Rainer Jung changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Comment #2 from Rainer Jung 2011-07-05 17:39:34 UTC --- Bugzilla is not a support form. Please subscribe to the Tomcat users list and post your question there. Some hints: if you want the server to speak SSLv3 and TLSv1, you need to set the SSLProtocol to "all". To ensure secure communication you also need to set SSLCipherSuite to something sensible, like e.g. RC4-SHA:AES128-SHA:ALL:!aNULL:!EXP:!LOW:!MD5:!SSLV2:!NULL Please don't proceed the discussion here. If the discussion on the users list gives reason to believe you really hit a bug, you can reopen this issue. Regards, Rainer -- 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 51478] New: mod_jk-1.2.31-httpd-2.2.x.so 32bit binaries not available for RHEL 32bit OS
https://issues.apache.org/bugzilla/show_bug.cgi?id=51478 Bug #: 51478 Summary: mod_jk-1.2.31-httpd-2.2.x.so 32bit binaries not available for RHEL 32bit OS Product: Tomcat Connectors Version: 1.2.31 Platform: Other OS/Version: Linux Status: NEW Severity: critical Priority: P2 Component: mod_jk AssignedTo: dev@tomcat.apache.org ReportedBy: samb...@amazon.com Classification: Unclassified Only 64 bit binaries are available -- 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 51478] mod_jk-1.2.31-httpd-2.2.x.so 32bit binaries not available for RHEL 32bit OS
https://issues.apache.org/bugzilla/show_bug.cgi?id=51478 Sambhram changed: What|Removed |Added CC||samb...@amazon.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 51478] mod_jk-1.2.31-httpd-2.2.x.so 32bit binaries not available for RHEL 32bit OS
https://issues.apache.org/bugzilla/show_bug.cgi?id=51478 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Comment #1 from Mark Thomas 2011-07-05 17:51:00 UTC --- You need to build from source. If the ASF provides binaries, it is done as a convenience only. -- 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 51478] mod_jk-1.2.31-httpd-2.2.x.so 32bit binaries not available for RHEL 32bit OS
https://issues.apache.org/bugzilla/show_bug.cgi?id=51478 --- Comment #2 from Sambhram 2011-07-05 17:52:29 UTC --- How do I build it from source? -- 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 51478] mod_jk-1.2.31-httpd-2.2.x.so 32bit binaries not available for RHEL 32bit OS
https://issues.apache.org/bugzilla/show_bug.cgi?id=51478 --- Comment #3 from Mladen Turk 2011-07-05 17:53:36 UTC --- We produce source code. Binaries are for user convenience. Because there are so many os/os-version/cpu combination we will provide only Windows binaries starting from 1.2.32 -- 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 51477] Fix for 51073 Breaks SSLv3+TLSv1 Protocol Support in APR Connector
https://issues.apache.org/bugzilla/show_bug.cgi?id=51477 --- Comment #3 from Konstantin Kolinko 2011-07-05 17:55:18 UTC --- According to the source code, before bug 51073 was fixed (r1094089 or r1124211), the "SSLv3+TLSv1" value just worked as a synonym to "all". What happens with ssl2 connections if you configure SSLProtocol="all" - in 7.0.16 - in 7.0.8 does it accept ssl2 connections or rejects them? -- Anyway, I do not mind to add "SSLv3+TLSv1" as an allowed value, if it is actually supported by the library. Looking at implementation of SSLContext.make in sslcontext.c of tc-native 1.1.x, there is code for this combination of flags. http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/sslcontext.c?view=markup#l85 -- 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 51477] Fix for 51073 Breaks SSLv3+TLSv1 Protocol Support in APR Connector
https://issues.apache.org/bugzilla/show_bug.cgi?id=51477 --- Comment #4 from Rainer Jung 2011-07-05 18:15:52 UTC --- But I *think* OpenSSL does not support it: http://www.openssl.org/docs/ssl/SSL_CTX_new.html It looks like you have to do what I already posted here: choose "all" for the protocol and disable any SSLV2 ciphers. Rainer -- 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 51477] Fix for 51073 Breaks SSLv3+TLSv1 Protocol Support in APR Connector
https://issues.apache.org/bugzilla/show_bug.cgi?id=51477 --- Comment #5 from Marvin Addison 2011-07-05 18:19:26 UTC --- "SSLv3+TLSv1" value just worked as a synonym to "all" Appears this is correct based on my testing. Setting SSLProtocol="all" in both 7.0.8 and 7.0.16 produced exactly the same results: TLSv1 and SSLv3 are supported but not SSLv2. It appears that our SSLCipherSuite parameter is actually providing the desired behavior: SSLCipherSuite="HIGH:MEDIUM:-SSLv2" So we'll be able to preserve the desired functionality with SSLProtocol="all" in versions 7.0.16 and later. I think there's merit in supporting other protocol combinations that make sense if for no other reason to maintain consistency with mod_ssl directives of the same name, which are eerily similar to APR connector attributes. (I've assumed that similarity is intentional.) -- 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 51478] mod_jk-1.2.31-httpd-2.2.x.so 32bit binaries not available for RHEL 32bit OS
https://issues.apache.org/bugzilla/show_bug.cgi?id=51478 Sambhram changed: What|Removed |Added Status|RESOLVED|REOPENED Resolution|INVALID | --- Comment #4 from Sambhram 2011-07-05 18:19:33 UTC --- Is there any workaround? How do we use it in 32 bit linux m/cs? -- 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 51477] Fix for 51073 Breaks SSLv3+TLSv1 Protocol Support in APR Connector
https://issues.apache.org/bugzilla/show_bug.cgi?id=51477 --- Comment #6 from Marvin Addison 2011-07-05 18:31:40 UTC --- I verified the following mod_ssl directives provide equivalent behavior (no SSLv2): SSLProtocol +SSLv3 +TLSv1 SSLCipherSuite HIGH:MEDIUM -- 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 51478] mod_jk-1.2.31-httpd-2.2.x.so 32bit binaries not available for RHEL 32bit OS
https://issues.apache.org/bugzilla/show_bug.cgi?id=51478 Chuck Caldarale changed: What|Removed |Added Priority|P2 |P5 Status|REOPENED|RESOLVED Resolution||INVALID Severity|critical|trivial --- Comment #5 from Chuck Caldarale 2011-07-05 18:43:53 UTC --- To repeat: build it from source. Download the source bundle, untar it, and follow the directions included in the package. -- 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 51477] Fix for 51073 Breaks SSLv3+TLSv1 Protocol Support in APR Connector
https://issues.apache.org/bugzilla/show_bug.cgi?id=51477 Rainer Jung changed: What|Removed |Added Status|RESOLVED|REOPENED Resolution|INVALID | --- Comment #7 from Rainer Jung 2011-07-05 18:50:45 UTC --- I checked the code of tcnative and of mod_ssl. Both have provisions for arbitrary combinations in SSLProtocol. The way it works is there's a basic protocol selection in OpenSSL and then you can remove parts by adding an option. The possible basic settings are SSLv2, SSLv3, TLSv1 and SSLv23. All except for the last one *only* understand that specific protocol, the last one understand SSLv2, SSLv3 *and* TLSv1, so this is "all". For arbitrary combinations one chooses SSLv23 and then removes the protocols one doesn't want via SSL_CTX_set_options() using the options SSL_OP_NO_SSLv2, SSL_OP_NO_SSLv3 and/or SSL_OP_NO_TLSv1. In tcnative in sslcontext.c there seems to be a bug in choosing SSLv2 if the configured protocol is SSLv2+TLSv1 and choosing SSLv3 if it is SSLv3+TLSv1. I'd say in both cases it should be SSLv23, because neither SSLV2 not SSLV3 support TLSv1. The additional protocol in SSLv23 is later removed via the options. Fortunately those combinations do not yet get passed down by AprEndpoint.java. But yes, it'd be easy to support any combination. -- 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 51477] Support all protocol combinations in SSLProtocol of APR Connector
https://issues.apache.org/bugzilla/show_bug.cgi?id=51477 Rainer Jung changed: What|Removed |Added Summary|Fix for 51073 Breaks|Support all protocol |SSLv3+TLSv1 Protocol|combinations in SSLProtocol |Support in APR Connector|of APR Connector Severity|normal |enhancement -- 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 51477] Support all protocol combinations in SSLProtocol of APR Connector
https://issues.apache.org/bugzilla/show_bug.cgi?id=51477 --- Comment #8 from Rainer Jung 2011-07-05 19:29:12 UTC --- Created attachment 27260 --> https://issues.apache.org/bugzilla/attachment.cgi?id=27260 Support for arbitrary protocol combinations The combinations SSLv2+TLSv1 and SSLv3+TLSv1 will only work, if tcnative is patched as well. Patch is untested. -- 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 51477] Support all protocol combinations in SSLProtocol of APR Connector
https://issues.apache.org/bugzilla/show_bug.cgi?id=51477 Rainer Jung changed: What|Removed |Added Keywords||PatchAvailable -- 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 51477] Support all protocol combinations in SSLProtocol of APR Connector
https://issues.apache.org/bugzilla/show_bug.cgi?id=51477 --- Comment #9 from Marvin Addison 2011-07-05 19:49:48 UTC --- I've reviewed the patch and it appears that it doesn't do the work of removing protocols via SSL_CTX_set_options() as you mentioned. At this point it appears all supported strings will end up supporting SSLv2+SSLv3+TLSv1 due to the use of SSLv23_client_method(), which is not the equivalent behavior of similar mod_ssl directives. -- 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: r1143188 - in /tomcat/trunk/java/org/apache/coyote: ajp/AjpNioProtocol.java http11/Http11NioProtocol.java
Author: markt
Date: Tue Jul 5 19:53:53 2011
New Revision: 1143188
URL: http://svn.apache.org/viewvc?rev=1143188&view=rev
Log:
Javadoc fixes
Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java?rev=1143188&r1=1143187&r2=1143188&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java Tue Jul 5
19:53:53 2011
@@ -148,7 +148,7 @@ public class AjpNioProtocol extends Abst
/**
* Use this only if the processor is not available, otherwise use
- * {@link #release(SocketWrapper, AjpNioProcessor)}.
+ * {@link #release(SocketWrapper, AjpNioProcessor)}.
*/
@Override
public void release(SocketWrapper socket) {
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java?rev=1143188&r1=1143187&r2=1143188&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java Tue Jul
5 19:53:53 2011
@@ -210,7 +210,7 @@ public class Http11NioProtocol extends A
/**
* Use this only if the processor is not available, otherwise use
- * {@link #release(SocketWrapper, Http11NioProcessor)}.
+ * {@link #release(SocketWrapper, Http11NioProcessor)}.
*/
@Override
public void release(SocketWrapper socket) {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51477] Support all protocol combinations in SSLProtocol of APR Connector
https://issues.apache.org/bugzilla/show_bug.cgi?id=51477 --- Comment #10 from Marvin Addison 2011-07-05 19:58:09 UTC --- I dug a little further and found that the requisite SSL_CTX_set_options() calls are already in sslcontext.c. I'll test the patch and report back. -- 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: r1143197 - /tomcat/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java
Author: markt Date: Tue Jul 5 20:33:28 2011 New Revision: 1143197 URL: http://svn.apache.org/viewvc?rev=1143197&view=rev Log: Not just this test failing. Need a better solution. Revert r1143126. Modified: tomcat/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java Modified: tomcat/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java?rev=1143197&r1=1143196&r2=1143197&view=diff == --- tomcat/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java (original) +++ tomcat/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java Tue Jul 5 20:33:28 2011 @@ -67,11 +67,7 @@ public class TestGroupChannelMemberArriv }; threads[i] = t; } -for (int i=0; i
Re: svn commit: r1143197 - /tomcat/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java
On 05/07/2011 21:33, ma...@apache.org wrote: > Author: markt > Date: Tue Jul 5 20:33:28 2011 > New Revision: 1143197 > > URL: http://svn.apache.org/viewvc?rev=1143197&view=rev > Log: > Not just this test failing. Need a better solution. Revert r1143126. There is something odd going on with these tests and my Linux test VM. It looks like something is going wrong at the JVM level. An update to 1.6.0_26 seems to have helped but hasn't fully fixed this. The common factor across all of the failures is that they go wrong in o.a.c.tribes.transport.ReceiverBase.bind in the recursive re-try calls (essentially all the retires fail even though there are ports available). I am going to experiment with different re-try approaches, probably introducing a little delay since it looks like a timing issue. I've tried and failed to produce a simple test case that recreates the bind failure. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51468] Redirect Valve
https://issues.apache.org/bugzilla/show_bug.cgi?id=51468 --- Comment #7 from Sergey Ushakov 2011-07-05 20:54:22 UTC --- (In reply to comment #6) Well, there is nothing wrong about UrlRewriteFilter except it is a filter :) It looks perfect and mature, but it is good for webapp-level tasks rather than container-level tasks. A filter being a part of a webapp belongs to the responsibility of a developer, while there may be quite a variety of redirection tasks that belong to the administration domain. So one of the motivations for a valve is separation of responsibilities of a developer and an administrator. Another motivation is that there may be quite a lot of various redirection tasks common for different webapps at a server, which might be better taken care of in a centralized manner with a valve... Regards, Sergey -- 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
Re: svn commit: r1143197 - /tomcat/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java
On 05/07/2011 21:38, Mark Thomas wrote: > On 05/07/2011 21:33, ma...@apache.org wrote: >> Author: markt >> Date: Tue Jul 5 20:33:28 2011 >> New Revision: 1143197 >> >> URL: http://svn.apache.org/viewvc?rev=1143197&view=rev >> Log: >> Not just this test failing. Need a better solution. Revert r1143126. > > There is something odd going on with these tests and my Linux test VM. > It looks like something is going wrong at the JVM level. An update to > 1.6.0_26 seems to have helped but hasn't fully fixed this. > > The common factor across all of the failures is that they go wrong in > o.a.c.tribes.transport.ReceiverBase.bind in the recursive re-try calls > (essentially all the retires fail even though there are ports available). > > I am going to experiment with different re-try approaches, probably > introducing a little delay since it looks like a timing issue. > > I've tried and failed to produce a simple test case that recreates the > bind failure. OK, with a silly amount of concurrency, I can reproduce this on Windows. Next step, getting the test case to use ReceiverBase. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 50570] Allow explicit use of FIPS mode in APR lifecycle listener
https://issues.apache.org/bugzilla/show_bug.cgi?id=50570 Christopher Schultz changed: What|Removed |Added Keywords||PatchAvailable -- 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 51468] Redirect Valve
https://issues.apache.org/bugzilla/show_bug.cgi?id=51468 --- Comment #8 from Christopher Schultz 2011-07-05 21:50:20 UTC --- (In reply to comment #7) > Well, there is nothing wrong about UrlRewriteFilter except it is a filter :) > It looks perfect and mature, but it is good for webapp-level tasks rather than > container-level tasks. Tomcat 7 can use Filters at the container level. Configure them just as you configure Valves, except that you use instead of . -- 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 51468] Redirect Valve
https://issues.apache.org/bugzilla/show_bug.cgi?id=51468 --- Comment #9 from Mark Thomas 2011-07-05 21:54:52 UTC --- (In reply to comment #8) > Tomcat 7 can use Filters at the container level. Configure them just as you > configure Valves, except that you use instead of . Where did that come from? It is news to me. Filters can be defined in the global web.xml, the host level web.xml or an app's web.xml (although you do get one instance per application). I am struggling to see the benefit of this Valve compared to the urlrewrite, particularly given the features that urlrewrite has compared to this patch. -- 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 50570] Allow explicit use of FIPS mode in APR lifecycle listener
https://issues.apache.org/bugzilla/show_bug.cgi?id=50570
--- Comment #18 from Konstantin Kolinko 2011-07-05
21:57:06 UTC ---
(In reply to comment #16)
Regarding attachment 27225 (Java patch) I have two comments:
1) Code formatting.
We usually have "{" on the same line as previous statement (like in Java coding
style).
2) I go not get why there are two methods in SSL.java:
fipsModeSet(Integer mode) and fipsModeSet(int mode).
If you need class object of "int" to do lookup of the method, it is available
as Integer.TYPE.
--
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 51468] Redirect Valve
https://issues.apache.org/bugzilla/show_bug.cgi?id=51468 --- Comment #10 from Christopher Schultz 2011-07-05 22:33:53 UTC --- (In reply to comment #9) > (In reply to comment #8) > > Tomcat 7 can use Filters at the container level. Configure them just as you > > configure Valves, except that you use instead of . > > Where did that come from? It is news to me. I thought filters could be configured in elements in META-INF/context.xml, hence the (slight) push to re-write Valves as Filters so they would be more portable. > I am struggling to see the benefit of this Valve compared to the urlrewrite, > particularly given the features that urlrewrite has compared to this patch. I completely agree. I'm sure it would be useful for /some/ people to incorporate all kinds of things from other projects into Tomcat, but it's not really appropriate if they already exist, are well-known, and well-supported. -- 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 50570] Allow explicit use of FIPS mode in APR lifecycle listener
https://issues.apache.org/bugzilla/show_bug.cgi?id=50570
--- Comment #19 from Christopher Schultz
2011-07-05 22:54:15 UTC ---
Thanks for the comments. Very helpful!
(In reply to comment #18)
> (In reply to comment #16)
>
> Regarding attachment 27225 [details] (Java patch) I have two comments:
>
> 1) Code formatting.
> We usually have "{" on the same line as previous statement (like in Java
> coding
> style).
I'm happy to change the use of whitespace, but "usually" is somewhat subjective
in the TC code base :)
> 2) I go not get why there are two methods in SSL.java:
> fipsModeSet(Integer mode) and fipsModeSet(int mode).
>
> If you need class object of "int" to do lookup of the method, it is available
> as Integer.TYPE.
I mostly reduced the patch provided by (the other) Chris and I remember
thinking about the overloaded methods but can't remember why I decided to leave
them there. Certainly the rest of the code does not require both methods.
Come to think of it, I'm not sure why the method call needs to be done using
reflection at all... both AprLifecycleListener.java and SSL.java are in the
Tomcat project (as opposed to tcnative) and thus should never be out of sync.
The only potential problem is if the native call fails because of a mismatched
tcnative library, but that would fail in a way that reflection wouldn't solve,
anyway.
I'll update the patch.
--
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
Re: svn commit: r1143197 - /tomcat/trunk/test/org/apache/catalina/tribes/group/TestGroupChannelMemberArrival.java
On 05/07/2011 22:04, Mark Thomas wrote: > On 05/07/2011 21:38, Mark Thomas wrote: >> On 05/07/2011 21:33, ma...@apache.org wrote: >>> Author: markt >>> Date: Tue Jul 5 20:33:28 2011 >>> New Revision: 1143197 >>> >>> URL: http://svn.apache.org/viewvc?rev=1143197&view=rev >>> Log: >>> Not just this test failing. Need a better solution. Revert r1143126. >> >> There is something odd going on with these tests and my Linux test VM. >> It looks like something is going wrong at the JVM level. An update to >> 1.6.0_26 seems to have helped but hasn't fully fixed this. >> >> The common factor across all of the failures is that they go wrong in >> o.a.c.tribes.transport.ReceiverBase.bind in the recursive re-try calls >> (essentially all the retires fail even though there are ports available). >> >> I am going to experiment with different re-try approaches, probably >> introducing a little delay since it looks like a timing issue. >> >> I've tried and failed to produce a simple test case that recreates the >> bind failure. > > OK, with a silly amount of concurrency, I can reproduce this on Windows. > Next step, getting the test case to use ReceiverBase. Or maybe not. Looks like I was hitting some sort of limit for open server sockets. Odd number though - 598. Anyway, I'm experimenting with some alternative ReceiverBase implementations. I may have something tomorrow. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
DO NOT REPLY [Bug 51468] Redirect Valve
https://issues.apache.org/bugzilla/show_bug.cgi?id=51468 --- Comment #11 from Sergey Ushakov 2011-07-06 04:41:47 UTC --- (In reply to comment #9) > I am struggling to see the benefit of this Valve compared to the urlrewrite, > particularly given the features that urlrewrite has compared to this patch. Well, let's consider a task of mapping/redirecting a Tomcat app to a virtual directory at a front-end server. To start with, it is an administrative task, not a developer's one, so the app's WEB-INF does not look the right place to set it up. The server admin is not likely to be happy tinkering with the war file or the unpacked folder every time the developer issues a new version of the app. The next place to consider for a filter is the the global web.xml or host-level web.xml. This is likely to do the job, but the fact that the appropriate filter is going to be instantiated in multiple useless copies for every app, makes the whole construct strange-looking too. So a valve looks the most straightforward approach to do the job... (In reply to comment #10) > I'm sure it would be useful for /some/ people to incorporate all kinds of > things from other projects into Tomcat, but it's not really appropriate if > they > already exist, are well-known, and well-supported. Well, to my mind it's not incorporating existing functionality from other projects into Tomcat, but rather adding something new and missing. This first implementation maybe does not look great, but it may eventually get more flesh, as new requirements get outlined by the practice... -- 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
Re: svn commit: r1135088 - in /tomcat/trunk: java/org/apache/coyote/AbstractProtocol.java webapps/docs/changelog.xml
1. JavaDoc for the method has to be updated. It still says that the
name is quoted.
2. If I understand correctly, the name _is_ used directly, in
AbstractConnectionHandler.register():
... ",worker=" + getProtocol().getName() + ",name=" ...
and MBeanUtils.destroyMBean(Connector,Service)
worker = ((**Protocol)*).getName()
new ObjectName(domain + ":type=RequestProcessor,worker=" + worker + ",*")
So if quotes are to be removed, let's do before appending the "-exec-"
suffix to them.
The name is passed to Endpoint (AbstractEndpoint.setName()) and the
"-exec-" suffix is added in AbstractEndpoint.createExecutor(). There
are also other suffixes elsewhere ("-Poller-", "-CometPoller-"), ...
2011/6/13 :
> Author: rjung
> Date: Mon Jun 13 11:19:23 2011
> New Revision: 1135088
>
> URL: http://svn.apache.org/viewvc?rev=1135088&view=rev
> Log:
> Remove superfluous quotes from thread names for
> connection pools.
>
> Example broken thread name: "http-apr-8001"-exec-2
> (including leading and intermediate quotes).
>
> Since we never use the names as a full ObjectName,
> only as a part of an ObjectName, it is safe to
> remove the surrounding quotes from the Protocol name.
>
> Modified:
> tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
> tomcat/trunk/webapps/docs/changelog.xml
>
> Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1135088&r1=1135087&r2=1135088&view=diff
> ==
> --- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
> +++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Mon Jun 13
> 11:19:23 2011
> @@ -229,7 +229,8 @@ public abstract class AbstractProtocol i
> name.append('-');
> }
> name.append(endpoint.getPort());
> - return ObjectName.quote(name.toString());
> + String quotedName = ObjectName.quote(name.toString());
> + return quotedName.substring(1, quotedName.length()-1);
> }
>
>
>
> Modified: tomcat/trunk/webapps/docs/changelog.xml
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1135088&r1=1135087&r2=1135088&view=diff
> ==
> --- tomcat/trunk/webapps/docs/changelog.xml (original)
> +++ tomcat/trunk/webapps/docs/changelog.xml Mon Jun 13 11:19:23 2011
> @@ -53,6 +53,10 @@
> Fix unit test for bindOnInit which was failing for APR on some
> platforms. (rjung)
>
> +
> + Remove superfluous quotes from thread names for connection pools.
> + (rjung)
> +
>
>
>
>
>
>
> -
> 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
svn propchange: r1136028 - svn:log
Author: kkolinko Revision: 1136028 Modified property: svn:log Modified: svn:log at Wed Jul 6 06:07:56 2011 -- --- svn:log (original) +++ svn:log Wed Jul 6 06:07:56 2011 @@ -0,0 +1,2 @@ +Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51376 +Dynamically added Servlet instances were ignoring setLoadOnStartup(), @ServletSecurity, etc.: When adding a Servlet via ServletContext#addServlet(String, Servlet), the Servlet was not initialized when the web application started and a load on startup value was set. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
