[Bug 56363] OpenSSL security advisory - Heartbleed bug
https://issues.apache.org/bugzilla/show_bug.cgi?id=56363 Thomas Gelzh changed: What|Removed |Added CC||tho...@gelzhaeuser.de -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56387] New: tomcat shutdown throw a NoClassDefFoundError
https://issues.apache.org/bugzilla/show_bug.cgi?id=56387 Bug ID: 56387 Summary: tomcat shutdown throw a NoClassDefFoundError Product: Tomcat 8 Version: trunk Hardware: All OS: All Status: NEW Severity: normal Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: qiubo...@qq.com org.apache.catalina.loader.WebappClassLoader#started field isn't volatile,when org.apache.catalina.loader.WebappClassLoader#stop is executing by thread A,and thread B is loading class, thread b could see non-updated value started=false. and then cause a NoClassDefFoundError. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat Native 1.1.30
On 10/04/2014, at 11:50 pm, Mladen Turk wrote: > Version 1.1.30 is bug fixing release with added ECDH > if supported by OpenSSL library. > The proposed release artefacts can be found at [1], > and the build was done using tag [2]. > > The VOTE will remain open for at least 48 hours. > > The Apache Tomcat Native 1.1.30 is > [X] Stable, go ahead and release > [ ] Broken because of ... Tested on OS X Mavericks with Tomcat 7.0.x. Builds cleanly against OpenSSL 1.0.1g and APR 1.50. HTTP and HTTPS APR connectors tested. Testing with Firefox, Chrome, Safari and openssl s_client shows TLSv1.2 and ECDHE cipher suites being used. Testing with https://github.com/FiloSottile/Heartbleed shows SAFE from Heartbleed (as expected, linking against 1.0.1g). There’s one problem using APR/HTTPS in Tomcat on OS X, where SSL_library_init needs to be called on the same thread that invokes SSLContext.make to make things work, but that’s not a tcnative issue. cheers tim - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56382] Add logging of deployment time
https://issues.apache.org/bugzilla/show_bug.cgi?id=56382 --- Comment #4 from Danila Galimov --- Created attachment 31511 --> https://issues.apache.org/bugzilla/attachment.cgi?id=31511&action=edit Proposed patch - corrected -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56382] Add logging of deployment time
https://issues.apache.org/bugzilla/show_bug.cgi?id=56382
Danila Galimov changed:
What|Removed |Added
OS||All
--- Comment #3 from Danila Galimov ---
(In reply to Konstantin Kolinko from comment #2)
> Comment on attachment 31506 [details]
> Proposed patch
>
> In reply to attachment 31506 [details]
>
> > if( log.isInfoEnabled() )
> > +startTime = System.currentTimeMillis();
> > log.info(sm.getString("hostConfig.deployDir",
> > dir.getAbsolutePath()));
>
> 1. The above change breaks the code, because of missing '{' after an 'if'
> above.
Fixed.
> > System.currentTimeMillis() - startTime
>
> 2. Boxing and unboxing have to be explicit, per our coding rules.
Fixed.
> 3. This covers only 'deployDirectory(..)' method. What about the others?
Done for deployDirectory, deployWAR and deployDescriptor methods.
--
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56382] Add logging of deployment time
https://issues.apache.org/bugzilla/show_bug.cgi?id=56382 Danila Galimov changed: What|Removed |Added Attachment #31506|0 |1 is obsolete|| Attachment #31511|0 |1 is obsolete|| --- Comment #5 from Danila Galimov --- Created attachment 31512 --> https://issues.apache.org/bugzilla/attachment.cgi?id=31512&action=edit Proposed patch - corrected 2 -- 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
Tomcat 6 End of life plan
Hi all, I'm wondering if there is any plan regarding the EOL of Tomcat 6. Debian Jessie is due to be released next year and should be supported until at least 2017. If Tomcat 6 was to be EOLed during this time frame the Debian maintainers would have to support it without the help of the upstream developers which is not desirable. In this case it might be preferable to drop Tomcat 6 from the next Debian release. Do you know how long Tomcat 6 will be supported? I guess that's somewhat related to the first stable release of Tomcat 8? Emmanuel Bourg - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1586618 - /tomcat/jk/trunk/native/common/jk_version.h
Author: mturk Date: Fri Apr 11 12:08:47 2014 New Revision: 1586618 URL: http://svn.apache.org/r1586618 Log: Promote to release before tagging Modified: tomcat/jk/trunk/native/common/jk_version.h Modified: tomcat/jk/trunk/native/common/jk_version.h URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_version.h?rev=1586618&r1=1586617&r2=1586618&view=diff == --- tomcat/jk/trunk/native/common/jk_version.h (original) +++ tomcat/jk/trunk/native/common/jk_version.h Fri Apr 11 12:08:47 2014 @@ -29,7 +29,7 @@ #define JK_VERFIX 40 /* set JK_VERISRELEASE to 1 when release (do not forget to commit!) */ -#define JK_VERISRELEASE 0 +#define JK_VERISRELEASE 1 /* Beta number */ #define JK_VERBETA 0 #define JK_BETASTRING "0" - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1586619 - /tomcat/jk/tags/JK_1_2_40/
Author: mturk Date: Fri Apr 11 12:09:57 2014 New Revision: 1586619 URL: http://svn.apache.org/r1586619 Log: Tag 1.2.40 Added: tomcat/jk/tags/JK_1_2_40/ - copied from r1586618, tomcat/jk/trunk/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1586623 - /tomcat/jk/tags/JK_1_2_40/
Author: mturk Date: Fri Apr 11 12:16:52 2014 New Revision: 1586623 URL: http://svn.apache.org/r1586623 Log: Axe tag Removed: tomcat/jk/tags/JK_1_2_40/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1586627 - /tomcat/jk/trunk/native/common/jk_connect.c
Author: mturk
Date: Fri Apr 11 12:23:44 2014
New Revision: 1586627
URL: http://svn.apache.org/r1586627
Log:
Cannot do pointer arithmetic on void
Modified:
tomcat/jk/trunk/native/common/jk_connect.c
Modified: tomcat/jk/trunk/native/common/jk_connect.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/common/jk_connect.c?rev=1586627&r1=1586626&r2=1586627&view=diff
==
--- tomcat/jk/trunk/native/common/jk_connect.c (original)
+++ tomcat/jk/trunk/native/common/jk_connect.c Fri Apr 11 12:23:44 2014
@@ -339,7 +339,7 @@ void jk_clone_sockaddr(jk_sockaddr_t *ou
* Do not copy the pointer but use the same offset relative
* to the struct start
*/
-out->ipaddr_ptr = (void *)out + (in->ipaddr_ptr - (void *)in);
+out->ipaddr_ptr = (char *)out + ((char *)in->ipaddr_ptr - (char *)in);
}
/** Resolve the host IP
@@ -443,7 +443,7 @@ int jk_resolve(const char *host, int por
#endif
hints.ai_family = JK_INET;
if (port > 0) {
-snprintf(pbuf, port, sizeof(pbuf));
+snprintf(pbuf, sizeof(pbuf), "%d", port);
pbufptr = pbuf;
}
error = getaddrinfo(host, pbufptr, &hints, &ai_list);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1586629 - /tomcat/jk/tags/JK_1_2_40/
Author: mturk Date: Fri Apr 11 12:25:41 2014 New Revision: 1586629 URL: http://svn.apache.org/r1586629 Log: Tag 1.2.40 Added: tomcat/jk/tags/JK_1_2_40/ - copied from r1586628, tomcat/jk/trunk/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Tomcat Wiki] Update of "ContributorsGroup" by markt
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change notification. The "ContributorsGroup" page has been changed by markt: https://wiki.apache.org/tomcat/ContributorsGroup?action=diff&rev1=20&rev2=21 * GaryBriggs * JeanFredericClere * KeiichiFujino + * SiegfriedGoeschl - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Java 8 compatibility for Tomcat 7
On 11/04/2014 00:07, Emmanuel Bourg wrote: > Le 11/04/2014 01:19, Mark Thomas a écrit : > >> I spoke with Filip at ApacheCon. This is meant to be an internal API >> so the refactoring should be safe. >> >> I've done the back-port and fixed a handful of IDE warnings while I >> was at it. > > Thank you Mark. Do you think this could be backported to Tomcat 6 too? > It fails with the same error: > > http://87.98.165.193/debian/openjdk8-rebuild/logs-failed-jdk8/tomcat6_6.0.39-1_unstable_jdk8.log I'll take a look. Mark > > Emmanuel Bourg > > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tomcat 6 End of life plan
On 11/04/2014 05:29, Emmanuel Bourg wrote: > Hi all, > > I'm wondering if there is any plan regarding the EOL of Tomcat 6. Debian > Jessie is due to be released next year and should be supported until at > least 2017. If Tomcat 6 was to be EOLed during this time frame the > Debian maintainers would have to support it without the help of the > upstream developers which is not desirable. In this case it might be > preferable to drop Tomcat 6 from the next Debian release. > > Do you know how long Tomcat 6 will be supported? I guess that's somewhat > related to the first stable release of Tomcat 8? Generally, we keep 3 major version in development. So at the moment that is 6, 7 and 8. I'd expect a 6.0.x EOL once we start thinking about Tomcat 9. When we do EOL it we will give at least 12 months notice. Best guess is that Tomcat 9 work will start towards the beginning of next year, the EOL announcement will be towards the end of next year will EOL being end of 2016. Those dates are only guesses though at this point. A lot of it depends on the timing of the Java EE 8 specs. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56390] New: Tomcat keeps jar files in /WEB-INF/lib opened and app cannot be fully undeployed
https://issues.apache.org/bugzilla/show_bug.cgi?id=56390
Bug ID: 56390
Summary: Tomcat keeps jar files in /WEB-INF/lib opened and
app cannot be fully undeployed
Product: Tomcat 8
Version: trunk
Hardware: PC
Status: NEW
Severity: normal
Priority: P2
Component: Catalina
Assignee: dev@tomcat.apache.org
Reporter: violet...@apache.org
Created attachment 31513
--> https://issues.apache.org/bugzilla/attachment.cgi?id=31513&action=edit
Profiling analyses
Hi,
If there are jar files in /WEB-INF/lib, Tomcat keeps them opened and
during undeploy they cannot be cleared. The following error appears:
"SEVERE [ContainerBackgroundProcessor[StandardEngine[Catalina]]]
org.apache.catalina.startup.ExpandWar.delete [...] could not be completely
deleted. The presence of the remaining files may cause problems"
The problem is because during startup of the application, a call to
o.a.catalina.loader.WebappClassLoader.findResource is made, which opens the
files. See the profiling analyses that are attached. (openedfiles.jpg)
A possible solution would be to invoke java.net.URLClassLoader.close() in
org.apache.catalina.loader.WebappClassLoader.stop method:
Index: C:/tc8.0.x/java/org/apache/catalina/loader/WebappClassLoader.java
===
--- C:/tc8.0.x/java/org/apache/catalina/loader/WebappClassLoader.java
(revision 1585681)
+++ C:/tc8.0.x/java/org/apache/catalina/loader/WebappClassLoader.java
(working copy)
@@ -1497,6 +1497,12 @@
permissionList.clear();
loaderPC.clear();
+
+try {
+super.close();
+} catch (IOException e) {
+throw new LifecycleException(e);
+}
}
What do you think?
Regards
Violeta
--
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: r1586641 - /tomcat/tc6.0.x/trunk/res/tomcat.nsi
Author: kkolinko
Date: Fri Apr 11 13:08:46 2014
New Revision: 1586641
URL: http://svn.apache.org/r1586641
Log:
CTR: whitespaces
Aligning this file with Tomcat 7 one before proposing a patch
Modified:
tomcat/tc6.0.x/trunk/res/tomcat.nsi
Modified: tomcat/tc6.0.x/trunk/res/tomcat.nsi
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/tomcat.nsi?rev=1586641&r1=1586640&r2=1586641&view=diff
==
--- tomcat/tc6.0.x/trunk/res/tomcat.nsi (original)
+++ tomcat/tc6.0.x/trunk/res/tomcat.nsi Fri Apr 11 13:08:46 2014
@@ -333,7 +333,7 @@ Section -post
${Else}
WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Run"
"ApacheTomcatMonitor@VERSION_MAJOR_MINOR@_$TomcatServiceName"
'"$INSTDIR\bin\$TomcatServiceManagerFileName" //MS//$TomcatServiceName'
${EndIf}
-
+
${If} $TomcatMenuEntriesEnable == "1"
Call createShortcuts
${EndIf}
@@ -453,7 +453,7 @@ Function pageComponentsLeave
StrCpy $TomcatAdminRoles "admin-gui"
${EndIf}
${EndIf}
-
+
SectionGetFlags ${SecMenu} $0
IntOp $0 $0 & ${SF_SELECTED}
${If} $0 <> 0
@@ -575,7 +575,7 @@ Function pageConfigurationLeave
Push $TomcatServiceName
Call validateServiceName
Pop $0
-
+
IntCmp $0 1 exit
MessageBox MB_ICONEXCLAMATION|MB_OK 'The Service Name may not contain a
space or any of the following characters: <>:"/\:|?*'
Abort "Config not right"
@@ -595,7 +595,7 @@ Function validateServiceName
StrLen $1 $0
StrCpy $3 '<>:"/\:|?* '
StrLen $4 $3
-
+
loopInput:
IntOp $1 $1 - 1
IntCmp $1 -1 valid
@@ -612,7 +612,7 @@ Function validateServiceName
invalid:
Push 0
Goto exit
-
+
valid:
Push 1
exit:
@@ -814,7 +814,7 @@ Function findJavaHome
IfErrors 0 +2
StrCpy $1 ""
ClearErrors
-
+
; If using 64-bit, go back to using 64-bit registry
${If} $0 != "%PROGRAMW6432%"
SetRegView 64
@@ -914,7 +914,7 @@ Function configure
Call copyFile
FileClose $R9
Delete "$INSTDIR\conf\server.xml.new"
-
+
DetailPrint 'Server shutdown listener configured on port
"$TomcatPortShutdown"'
DetailPrint 'HTTP/1.1 Connector configured on port "$TomcatPortHttp"'
DetailPrint 'AJP/1.3 Connector configured on port "$TomcatPortAjp"'
@@ -1023,7 +1023,7 @@ Function createShortcuts
${If} $TomcatShortcutAllUsers == ${BST_CHECKED}
SetShellVarContext all
${EndIf}
-
+
SetOutPath "$SMPROGRAMS\Apache Tomcat @VERSION_MAJOR_MINOR@
$TomcatServiceName"
CreateShortCut "$SMPROGRAMS\Apache Tomcat @VERSION_MAJOR_MINOR@
$TomcatServiceName\Tomcat Home Page.lnk" \
@@ -1091,7 +1091,7 @@ Section Uninstall
the command line with -ServiceName=$\"$\"."
Quit
${EndIf}
-
+
Delete "$INSTDIR\Uninstall.exe"
; Stop Tomcat service monitor if running
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56391] New: test error for NIO and org.apache.tomcat.util.net.TestSsl
https://issues.apache.org/bugzilla/show_bug.cgi?id=56391 Bug ID: 56391 Summary: test error for NIO and org.apache.tomcat.util.net.TestSsl Product: Tomcat 8 Version: 8.0.5 Hardware: Sun OS: Solaris Status: NEW Severity: normal Priority: P2 Component: Util Assignee: dev@tomcat.apache.org Reporter: petr.sumb...@oracle.com Created attachment 31514 --> https://issues.apache.org/bugzilla/attachment.cgi?id=31514&action=edit test log While this is the only error I see in whole Tomcat test suite it might be real issue. Please see attached report. java version "1.7.0_51" -- 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: r1586644 - /tomcat/trunk/res/tomcat.nsi
Author: kkolinko
Date: Fri Apr 11 13:13:09 2014
New Revision: 1586644
URL: http://svn.apache.org/r1586644
Log:
Replace double space with single one.
Modified:
tomcat/trunk/res/tomcat.nsi
Modified: tomcat/trunk/res/tomcat.nsi
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/tomcat.nsi?rev=1586644&r1=1586643&r2=1586644&view=diff
==
--- tomcat/trunk/res/tomcat.nsi (original)
+++ tomcat/trunk/res/tomcat.nsi Fri Apr 11 13:13:09 2014
@@ -326,7 +326,7 @@ Section -post
DetailPrint "Configuring $TomcatServiceName service"
nsExec::ExecToLog '"$INSTDIR\bin\$TomcatServiceFileName"
//US//$TomcatServiceName --Classpath
"$INSTDIR\bin\bootstrap.jar;$INSTDIR\bin\tomcat-juli.jar" --StartClass
org.apache.catalina.startup.Bootstrap --StopClass
org.apache.catalina.startup.Bootstrap --StartParams start --StopParams stop
--StartMode jvm --StopMode jvm'
nsExec::ExecToLog '"$INSTDIR\bin\$TomcatServiceFileName"
//US//$TomcatServiceName --JvmOptions
"-Dcatalina.home=$INSTDIR#-Dcatalina.base=$INSTDIR#-Djava.endorsed.dirs=$INSTDIR\endorsed#-Djava.io.tmpdir=$INSTDIR\temp#-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager#-Djava.util.logging.config.file=$INSTDIR\conf\logging.properties"'
- nsExec::ExecToLog '"$INSTDIR\bin\$TomcatServiceFileName"
//US//$TomcatServiceName --StdOutput auto --StdError auto --JvmMs 128 --JvmMx
256'
+ nsExec::ExecToLog '"$INSTDIR\bin\$TomcatServiceFileName"
//US//$TomcatServiceName --StdOutput auto --StdError auto --JvmMs 128 --JvmMx
256'
${If} $TomcatShortcutAllUsers == "1"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Run"
"ApacheTomcatMonitor@VERSION_MAJOR_MINOR@_$TomcatServiceName"
'"$INSTDIR\bin\$TomcatServiceManagerFileName" //MS//$TomcatServiceName'
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56391] test error for NIO and org.apache.tomcat.util.net.TestSsl
https://issues.apache.org/bugzilla/show_bug.cgi?id=56391 --- Comment #1 from Konstantin Kolinko --- JDK version = ? -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56390] Tomcat keeps jar files in /WEB-INF/lib opened and app cannot be fully undeployed
https://issues.apache.org/bugzilla/show_bug.cgi?id=56390 Mark Thomas changed: What|Removed |Added OS||All --- Comment #1 from Mark Thomas --- Steps to reproduce? -- 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: r1586645 - in /tomcat/tc7.0.x/trunk: ./ res/tomcat.nsi
Author: kkolinko
Date: Fri Apr 11 13:16:49 2014
New Revision: 1586645
URL: http://svn.apache.org/r1586645
Log:
Replace double space before '-JvmMs' with single one.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/res/tomcat.nsi
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1586644
Modified: tomcat/tc7.0.x/trunk/res/tomcat.nsi
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/tomcat.nsi?rev=1586645&r1=1586644&r2=1586645&view=diff
==
--- tomcat/tc7.0.x/trunk/res/tomcat.nsi (original)
+++ tomcat/tc7.0.x/trunk/res/tomcat.nsi Fri Apr 11 13:16:49 2014
@@ -326,7 +326,7 @@ Section -post
DetailPrint "Configuring $TomcatServiceName service"
nsExec::ExecToLog '"$INSTDIR\bin\$TomcatServiceFileName"
//US//$TomcatServiceName --Classpath
"$INSTDIR\bin\bootstrap.jar;$INSTDIR\bin\tomcat-juli.jar" --StartClass
org.apache.catalina.startup.Bootstrap --StopClass
org.apache.catalina.startup.Bootstrap --StartParams start --StopParams stop
--StartMode jvm --StopMode jvm'
nsExec::ExecToLog '"$INSTDIR\bin\$TomcatServiceFileName"
//US//$TomcatServiceName --JvmOptions
"-Dcatalina.home=$INSTDIR#-Dcatalina.base=$INSTDIR#-Djava.endorsed.dirs=$INSTDIR\endorsed#-Djava.io.tmpdir=$INSTDIR\temp#-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager#-Djava.util.logging.config.file=$INSTDIR\conf\logging.properties"'
- nsExec::ExecToLog '"$INSTDIR\bin\$TomcatServiceFileName"
//US//$TomcatServiceName --StdOutput auto --StdError auto --JvmMs 128 --JvmMx
256'
+ nsExec::ExecToLog '"$INSTDIR\bin\$TomcatServiceFileName"
//US//$TomcatServiceName --StdOutput auto --StdError auto --JvmMs 128 --JvmMx
256'
${If} $TomcatShortcutAllUsers == "1"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Run"
"ApacheTomcatMonitor@VERSION_MAJOR_MINOR@_$TomcatServiceName"
'"$INSTDIR\bin\$TomcatServiceManagerFileName" //MS//$TomcatServiceName'
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
VOTE] Release Apache Tomcat Connectors 1.2.40
Hi, Apache Tomcat Connectors 1.2.40 release candidate is ready for vote at [1]. The build was done using tag [2]. This version is bugfix release, fixing some issues found in version 1.2.39. The VOTE will remain open for at least 48 hours. The Apache Tomcat Connectors 1.2.40 is [ ] Stable, go ahead and release [ ] Broken because of ... [1] http://people.apache.org/~mturk/tomcat-connectors/jk-1.2.40/ [2] https://svn.apache.org/repos/asf/tomcat/jk/tags/JK_1_2_40/ Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56391] test error for NIO and org.apache.tomcat.util.net.TestSsl
https://issues.apache.org/bugzilla/show_bug.cgi?id=56391 --- Comment #2 from Petr Sumbera --- jdk1.7.0 -- 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: r1586650 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Fri Apr 11 13:29:05 2014 New Revision: 1586650 URL: http://svn.apache.org/r1586650 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=1586650&r1=1586649&r2=1586650&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Fri Apr 11 13:29:05 2014 @@ -28,6 +28,15 @@ None PATCHES PROPOSED TO BACKPORT: [ New proposals should be added at the end of the list ] +* Improvements to exe installer: + Specify explicit JVM memory sizes when installing the service (--JvmMs, + --JvmMx) with values of 128 Mb and 256 Mb respectively, the same as used + by service.bat file. + Explicitly specify --LogPath path when uninstalling Windows service. (The + default value for that option was "%SystemRoot%\System32\LogFiles\Apache".) + https://people.apache.org/~kkolinko/patches/2014-04-11_tc6_tomcat_nsi.patch + +1: kkolinko + -1: PATCHES/ISSUES THAT ARE STALLED: - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56391] test error for NIO and org.apache.tomcat.util.net.TestSsl
https://issues.apache.org/bugzilla/show_bug.cgi?id=56391 --- Comment #3 from Chuck Caldarale --- (In reply to Petr Sumbera from comment #2) > jdk1.7.0 The exact version please (e.g., 1.7.0_25). -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56391] test error for NIO and org.apache.tomcat.util.net.TestSsl
https://issues.apache.org/bugzilla/show_bug.cgi?id=56391 --- Comment #4 from Petr Sumbera --- $ /usr/jdk/instances/jdk1.7.0/bin/java -version java version "1.7.0_51" Java(TM) SE Runtime Environment (build 1.7.0_51-b34) Java HotSpot(TM) Server VM (build 24.51-b04, mixed mode) -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56390] Tomcat keeps jar files in /WEB-INF/lib opened and app cannot be fully undeployed
https://issues.apache.org/bugzilla/show_bug.cgi?id=56390 --- Comment #2 from Sebb --- May not be directly relevant, but I've noticed that Java on Windows keeps an OS lock on files that it has got open - even when read-only. So one cannot delete jars that are in use (and it makes tailing log files tricky in Windows!) Unix Java does not seem to have this restriction. -- 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: r1586658 - in /tomcat/trunk/webapps/docs: changelog.xml windows-service-howto.xml
Author: kkolinko Date: Fri Apr 11 14:03:49 2014 New Revision: 1586658 URL: http://svn.apache.org/r1586658 Log: Correct windows-service-howto.xml according to Apache Commons Daemon procrun documentation. E.g. the default value for LogPath option was documented incorrectly. Modified: tomcat/trunk/webapps/docs/changelog.xml tomcat/trunk/webapps/docs/windows-service-howto.xml Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1586658&r1=1586657&r2=1586658&view=diff == --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Fri Apr 11 14:03:49 2014 @@ -171,6 +171,10 @@ host if "webapps" request parameter is not set when adding host in HostManager Application. (kfujino) + +Correct documentation on Windows service options, aligning it with +Apache Commons Daemon documentation. (kkolinko) + Modified: tomcat/trunk/webapps/docs/windows-service-howto.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/windows-service-howto.xml?rev=1586658&r1=1586657&r2=1586658&view=diff == --- tomcat/trunk/webapps/docs/windows-service-howto.xml (original) +++ tomcat/trunk/webapps/docs/windows-service-howto.xml Fri Apr 11 14:03:49 2014 @@ -136,13 +136,13 @@ Service startup mode can be either auto or manual ---DependsOn +++DependsOn List of services that this service depend on. Dependent services are separated using either # or ; characters ---Environment +++Environment List of environment variables that will be provided to the service in the form key=value. They are separated using either @@ -171,40 +171,56 @@ --Jvm auto -Use either auto or specify the full path to the jvm.dll. +Use either auto (i.e. find the JVM from the Windows registry) +or specify the full path to the jvm.dll. You can use the environment variable expansion here. ---JvmOptions +++JvmOptions -Xrs List of options in the form of -D or -X that will be passed to the JVM. The options are separated using either -# or ; characters. +# or ; characters. (Not used in exe mode.) --Classpath -Set the Java classpath +Set the Java classpath. (Not used in exe mode.) --JvmMs -Initial memory pool size in MB +Initial memory pool size in MB. (Not used in exe mode.) --JvmMx -Maximum memory pool size in MB +Maximum memory pool size in MB. (Not used in exe mode.) --JvmSs -Thread stack size in KB +Thread stack size in KB. (Not used in exe mode.) + + +--StartMode + +One of jvm, Java or exe. The modes are: + +jvm - start Java in-process. Depends on jvm.dll, see --Jvm. +Java - same as exe, but automatically uses the default Java + executable, i.e. %JAVA_HOME%\bin\java.exe. Make sure JAVA_HOME is set + correctly, or use --JavaHome to provide the correct location. + If neither is set, procrun will try to find the default JDK (not JRE) + from the Windows registry. +exe - run the image as a separate process + + --StartImage -Executable that will be run. +Executable that will be run. Only applies to exe mode. --StartPath @@ -213,57 +229,57 @@ --StartClass - -Class that will be used for startup. +Main +Class that contains the startup method. Applies to the jvm and +Java modes. (Not used in exe mode.) + + +--StartMethod +main +Method name if differs then main ---StartParams +++StartParams List of parameters that will be passed to either StartImage or StartClass. Parameters are separated using either # or ; character. ---StartMethod -Main -Method name if differs then main - - ---StartMode -executable -Can one of jvm java or exe +--StopMode + +One of jvm, Java or exe. See --StartMode +for further details. --StopImage -Executable that will be run on Stop service signal. +Executable that will be run on Stop service signal. Only applies to +exe mode. --StopPath -Working path for the stop image executable. +Working path for the stop image executable. Does not apply to jvm +mode. --StopClass - -Class that will be used on Stop service signal. - - ---StopParams - -List of parameters that will be passed to either Sto
svn commit: r1586659 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/changelog.xml webapps/docs/windows-service-howto.xml
Author: kkolinko Date: Fri Apr 11 14:13:08 2014 New Revision: 1586659 URL: http://svn.apache.org/r1586659 Log: Merged r1586658 from tomcat/trunk: Correct windows-service-howto.xml according to Apache Commons Daemon procrun documentation. E.g. the default value for LogPath option was documented incorrectly. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml tomcat/tc7.0.x/trunk/webapps/docs/windows-service-howto.xml Propchange: tomcat/tc7.0.x/trunk/ -- Merged /tomcat/trunk:r1586658 Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1586659&r1=1586658&r2=1586659&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Fri Apr 11 14:13:08 2014 @@ -139,6 +139,10 @@ host if "webapps" request parameter is not set when adding host in HostManager Application. (kfujino) + +Correct documentation on Windows service options, aligning it with +Apache Commons Daemon documentation. (kkolinko) + Modified: tomcat/tc7.0.x/trunk/webapps/docs/windows-service-howto.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/windows-service-howto.xml?rev=1586659&r1=1586658&r2=1586659&view=diff == --- tomcat/tc7.0.x/trunk/webapps/docs/windows-service-howto.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/windows-service-howto.xml Fri Apr 11 14:13:08 2014 @@ -136,13 +136,13 @@ Service startup mode can be either auto or manual ---DependsOn +++DependsOn List of services that this service depend on. Dependent services are separated using either # or ; characters ---Environment +++Environment List of environment variables that will be provided to the service in the form key=value. They are separated using either @@ -171,41 +171,56 @@ --Jvm auto -Use either auto or specify the full path to the jvm.dll. +Use either auto (i.e. find the JVM from the Windows registry) +or specify the full path to the jvm.dll. You can use the environment variable expansion here. ---JvmOptions +++JvmOptions -Xrs List of options in the form of -D or -X that will be passed to the JVM. The options are separated using either -# or ; characters. +# or ; characters. (Not used in exe mode.) --Classpath -Set the Java classpath +Set the Java classpath. (Not used in exe mode.) --JvmMs -Initial memory pool size in MB +Initial memory pool size in MB. (Not used in exe mode.) --JvmMx -Maximum memory pool size in MB +Maximum memory pool size in MB. (Not used in exe mode.) --JvmSs -Thread stack size in KB +Thread stack size in KB. (Not used in exe mode.) +--StartMode + +One of jvm, Java or exe. The modes are: + +jvm - start Java in-process. Depends on jvm.dll, see --Jvm. +Java - same as exe, but automatically uses the default Java + executable, i.e. %JAVA_HOME%\bin\java.exe. Make sure JAVA_HOME is set + correctly, or use --JavaHome to provide the correct location. + If neither is set, procrun will try to find the default JDK (not JRE) + from the Windows registry. +exe - run the image as a separate process + + + --StartImage -Executable that will be run. +Executable that will be run. Only applies to exe mode. --StartPath @@ -214,56 +229,57 @@ --StartClass - -Class that will be used for startup. +Main +Class that contains the startup method. Applies to the jvm and +Java modes. (Not used in exe mode.) + + +--StartMethod +main +Method name if differs then main ---StartParams +++StartParams List of parameters that will be passed to either StartImage or StartClass. Parameters are separated using either # or ; character. ---StartMethod -Main -Method name if differs then main +--StopMode + +One of jvm, Java or exe. See --StartMode +for further details. ---StartMode -executable -Can one of jvm java or exe - --StopImage -Executable that will be run on Stop service signal. +Executable that will be run on Stop service signal. Only applies to +exe mode. --StopPath -Working path f
svn commit: r1586661 - in /tomcat/tc6.0.x/trunk: ./ webapps/docs/changelog.xml webapps/docs/windows-service-howto.xml
Author: kkolinko Date: Fri Apr 11 14:19:49 2014 New Revision: 1586661 URL: http://svn.apache.org/r1586661 Log: CTR: documentation Merged r1586659 from tomcat/tc7.0.x/trunk: Correct windows-service-howto.xml according to Apache Commons Daemon procrun documentation. E.g. the default value for LogPath option was documented incorrectly. Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml tomcat/tc6.0.x/trunk/webapps/docs/windows-service-howto.xml Propchange: tomcat/tc6.0.x/trunk/ -- Merged /tomcat/trunk:r1586658 Merged /tomcat/tc7.0.x/trunk:r1586659 Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1586661&r1=1586660&r2=1586661&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Fri Apr 11 14:19:49 2014 @@ -142,6 +142,10 @@ 56093: Documentation for SSLValve. (markt/kkolinko) + +Correct documentation on Windows service options, aligning it with +Apache Commons Daemon documentation. (kkolinko) + Modified: tomcat/tc6.0.x/trunk/webapps/docs/windows-service-howto.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/windows-service-howto.xml?rev=1586661&r1=1586660&r2=1586661&view=diff == --- tomcat/tc6.0.x/trunk/webapps/docs/windows-service-howto.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/windows-service-howto.xml Fri Apr 11 14:19:49 2014 @@ -136,13 +136,13 @@ Service startup mode can be either auto or manual ---DependsOn +++DependsOn List of services that this service depend on. Dependent services are separated using either # or ; characters ---Environment +++Environment List of environment variables that will be provided to the service in the form key=value. They are separated using either @@ -171,41 +171,56 @@ --Jvm auto -Use either auto or specify the full path to the jvm.dll. +Use either auto (i.e. find the JVM from the Windows registry) +or specify the full path to the jvm.dll. You can use the environment variable expansion here. ---JvmOptions +++JvmOptions -Xrs List of options in the form of -D or -X that will be passed to the JVM. The options are separated using either -# or ; characters. +# or ; characters. (Not used in exe mode.) --Classpath -Set the Java classpath +Set the Java classpath. (Not used in exe mode.) --JvmMs -Initial memory pool size in MB +Initial memory pool size in MB. (Not used in exe mode.) --JvmMx -Maximum memory pool size in MB +Maximum memory pool size in MB. (Not used in exe mode.) --JvmSs -Thread stack size in KB +Thread stack size in KB. (Not used in exe mode.) +--StartMode + +One of jvm, Java or exe. The modes are: + +jvm - start Java in-process. Depends on jvm.dll, see --Jvm. +Java - same as exe, but automatically uses the default Java + executable, i.e. %JAVA_HOME%\bin\java.exe. Make sure JAVA_HOME is set + correctly, or use --JavaHome to provide the correct location. + If neither is set, procrun will try to find the default JDK (not JRE) + from the Windows registry. +exe - run the image as a separate process + + + --StartImage -Executable that will be run. +Executable that will be run. Only applies to exe mode. --StartPath @@ -214,56 +229,57 @@ --StartClass - -Class that will be used for startup. +Main +Class that contains the startup method. Applies to the jvm and +Java modes. (Not used in exe mode.) + + +--StartMethod +main +Method name if differs then main ---StartParams +++StartParams List of parameters that will be passed to either StartImage or StartClass. Parameters are separated using either # or ; character. ---StartMethod -Main -Method name if differs then main +--StopMode + +One of jvm, Java or exe. See --StartMode +for further details. ---StartMode -executable -Can one of jvm java or exe - --StopImage -Executable that will be run on Stop service signal. +Executable that will be run on Stop service signal. Only applies to +exe mode. --StopPath -
Re: VOTE] Release Apache Tomcat Connectors 1.2.40
2014-04-11 17:17 GMT+04:00 Mladen Turk : > Hi, > > Apache Tomcat Connectors 1.2.40 release candidate is ready > for vote at [1]. The build was done using tag [2]. > This version is bugfix release, fixing some issues > found in version 1.2.39. > > > The VOTE will remain open for at least 48 hours. > > The Apache Tomcat Connectors 1.2.40 is > [ ] Stable, go ahead and release > [ ] Broken because of ... > > > > [1] http://people.apache.org/~mturk/tomcat-connectors/jk-1.2.40/ > [2] https://svn.apache.org/repos/asf/tomcat/jk/tags/JK_1_2_40/ There are no asc/md5/sha1 files for the -src.zip and -src.tar.gz at [1]. Are they missing, or just unreadable? Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56390] Tomcat keeps jar files in /WEB-INF/lib opened and app cannot be fully undeployed
https://issues.apache.org/bugzilla/show_bug.cgi?id=56390 --- Comment #3 from Konstantin Kolinko --- > A possible solution would be to invoke java.net.URLClassLoader.close() in > org.apache.catalina.loader.WebappClassLoader.stop method: 1. What will be an effect of calling stop(),start() (I have not checked if anything calls those methods in a pair). If URLClassLoader cannot recover after a call to close() then it should be done in destroy() instead of stop(). 2. Are you running without a JreMemoryLeakPreventionListener ? -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 54802] Provide location information for exceptions thrown by JspDocumentParser [PATCH]
https://issues.apache.org/bugzilla/show_bug.cgi?id=54802 Christopher Schultz changed: What|Removed |Added Summary|Provide location|Provide location |information for exceptions |information for exceptions |thrown by JspDocumentParser |thrown by JspDocumentParser ||[PATCH] -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53930] allow capture of catalina stdout/stderr to a command instead of just a file [PATCH]
https://issues.apache.org/bugzilla/show_bug.cgi?id=53930 Christopher Schultz changed: What|Removed |Added Summary|allow capture of catalina |allow capture of catalina |stdout/stderr to a command |stdout/stderr to a command |instead of just a file |instead of just a file ||[PATCH] -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 52448] Cache jar indexes in WebappClassLoader to speed up resources lookup [PATCH]
https://issues.apache.org/bugzilla/show_bug.cgi?id=52448 Christopher Schultz changed: What|Removed |Added Summary|Cache jar indexes in|Cache jar indexes in |WebappClassLoader to speed |WebappClassLoader to speed |up resources lookup |up resources lookup [PATCH] -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 55470] Help users for ClassNotFoundExceptions during startup [PATCH]
https://issues.apache.org/bugzilla/show_bug.cgi?id=55470 Christopher Schultz changed: What|Removed |Added Summary|Help users for |Help users for |ClassNotFoundExceptions |ClassNotFoundExceptions |during startup |during startup [PATCH] -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 54700] Improvement: Add support for system property to specify location of APR/native library [PATCH]
https://issues.apache.org/bugzilla/show_bug.cgi?id=54700 Christopher Schultz changed: What|Removed |Added Summary|Improvement: Add support|Improvement: Add support |for system property to |for system property to |specify location of |specify location of |APR/native library |APR/native library [PATCH] -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 49821] Tomcat CLI [PATCH/Contribution]
https://issues.apache.org/bugzilla/show_bug.cgi?id=49821 Christopher Schultz changed: What|Removed |Added Summary|Tomcat CLI |Tomcat CLI ||[PATCH/Contribution] -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 52688] Add ability to remove old access log files [PATCHES]
https://issues.apache.org/bugzilla/show_bug.cgi?id=52688 Christopher Schultz changed: What|Removed |Added Summary|Add ability to remove old |Add ability to remove old |access log files|access log files [PATCHES] -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 55006] Add http proxy support for ClientEndpoint using system properties [PATCH]
https://issues.apache.org/bugzilla/show_bug.cgi?id=55006 Christopher Schultz changed: What|Removed |Added Summary|Add http proxy support for |Add http proxy support for |ClientEndpoint using system |ClientEndpoint using system |properties |properties [PATCH] -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56387] tomcat shutdown throw a NoClassDefFoundError
https://issues.apache.org/bugzilla/show_bug.cgi?id=56387 Konstantin Kolinko changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |INVALID --- Comment #1 from Konstantin Kolinko --- 1. You are confusing 'false' and 'true'. It is just wrong. 2. At best it is just a theory. Can you demonstrate it with a testcase? 3. When webapp stops, all its processing threads should have already been stopped. There are plenty of syncs involved when that happens, thus volatility is not an issue. -- 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
buildbot failure in ASF Buildbot on tomcat-7-trunk
The Buildbot has detected a new failure on builder tomcat-7-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-7-trunk/builds/1851 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1586659 Blamelist: kkolinko BUILD FAILED: failed compile_1 sincerely, -The Buildbot
[Bug 54330] Patch with some refactoring of Member.java [PATCH proposed for TC7]
https://issues.apache.org/bugzilla/show_bug.cgi?id=54330 Christopher Schultz changed: What|Removed |Added Summary|Patch with some refactoring |Patch with some refactoring |of Member.java |of Member.java [PATCH ||proposed for TC7] -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56383] Securing ErrorReportValve [PATCH]
https://issues.apache.org/bugzilla/show_bug.cgi?id=56383 Christopher Schultz changed: What|Removed |Added Summary|Securing ErrorReportValve |Securing ErrorReportValve ||[PATCH] -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 50175] Enhance memory leak detection by selectively applying methods [PATCH?]
https://issues.apache.org/bugzilla/show_bug.cgi?id=50175 Christopher Schultz changed: What|Removed |Added Summary|Enhance memory leak |Enhance memory leak |detection by selectively|detection by selectively |applying methods, |applying methods [PATCH?] -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56393] New: Implement RFC6265 for Cookie parsing
https://issues.apache.org/bugzilla/show_bug.cgi?id=56393 Bug ID: 56393 Summary: Implement RFC6265 for Cookie parsing Product: Tomcat 8 Version: trunk Hardware: PC OS: Mac OS X 10.4 Status: NEW Severity: enhancement Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: ch...@christopherschultz.net Lots of documentation can be found here: http://wiki.apache.org/tomcat/Cookies -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56394] New: Allow cookie-parsing to be pluggable
https://issues.apache.org/bugzilla/show_bug.cgi?id=56394 Bug ID: 56394 Summary: Allow cookie-parsing to be pluggable Product: Tomcat 8 Version: trunk Hardware: PC OS: Mac OS X 10.4 Status: NEW Severity: enhancement Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: ch...@christopherschultz.net Specifically to support bug #56393 while allowing a roll-back to current behavior. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 54330] Patch with some refactoring of Member.java [PATCH proposed for TC7]
https://issues.apache.org/bugzilla/show_bug.cgi?id=54330 --- Comment #4 from Filip Hanik --- Patch looks good to me. I like the cleanup of using the interface. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56393] Implement RFC6265 for Cookie parsing
https://issues.apache.org/bugzilla/show_bug.cgi?id=56393 Christopher Schultz changed: What|Removed |Added Depends on||56394 -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56394] Allow cookie-parsing to be pluggable
https://issues.apache.org/bugzilla/show_bug.cgi?id=56394 Christopher Schultz changed: What|Removed |Added Blocks||56393 -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 55988] Add parameter useCipherSuitesOrder to JSSE (BIO and NIO) connectors [PATCH]
https://issues.apache.org/bugzilla/show_bug.cgi?id=55988 Christopher Schultz changed: What|Removed |Added Summary|Add parameter |Add parameter |useCipherSuitesOrder to |useCipherSuitesOrder to |JSSE (BIO and NIO) |JSSE (BIO and NIO) |connectors |connectors [PATCH] -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 51953] Proposal: netmask filtering valve and filter [PATCH]
https://issues.apache.org/bugzilla/show_bug.cgi?id=51953 Christopher Schultz changed: What|Removed |Added Summary|Proposal: netmask filtering |Proposal: netmask filtering |valve and filter|valve and filter [PATCH] -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56390] Tomcat keeps jar files in /WEB-INF/lib opened and app cannot be fully undeployed
https://issues.apache.org/bugzilla/show_bug.cgi?id=56390 --- Comment #4 from Violeta Georgieva --- (In reply to Mark Thomas from comment #1) > Steps to reproduce? - ant clean deploy - go to output/build and start Tomcat - deploy the attached application - undeploy the application -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56390] Tomcat keeps jar files in /WEB-INF/lib opened and app cannot be fully undeployed
https://issues.apache.org/bugzilla/show_bug.cgi?id=56390 --- Comment #5 from Violeta Georgieva --- Created attachment 31515 --> https://issues.apache.org/bugzilla/attachment.cgi?id=31515&action=edit example -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 54618] Add filter implementing HTTP Strict Transport Security (HSTS) [PATCH]
https://issues.apache.org/bugzilla/show_bug.cgi?id=54618 Christopher Schultz changed: What|Removed |Added Summary|Add filter implementing |Add filter implementing |HTTP Strict Transport |HTTP Strict Transport |Security (HSTS) |Security (HSTS) [PATCH] -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 53737] Use ServletContext.getJspConfigDescriptor() in Jasper instead of XML-parsing of merged web.xml [PATCHES]
https://issues.apache.org/bugzilla/show_bug.cgi?id=53737 Christopher Schultz changed: What|Removed |Added Summary|Use |Use |ServletContext.getJspConfig |ServletContext.getJspConfig |Descriptor() in Jasper |Descriptor() in Jasper |instead of XML-parsing of |instead of XML-parsing of |merged web.xml |merged web.xml [PATCHES] -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56390] Tomcat keeps jar files in /WEB-INF/lib opened and app cannot be fully undeployed
https://issues.apache.org/bugzilla/show_bug.cgi?id=56390 --- Comment #6 from Violeta Georgieva --- (In reply to Konstantin Kolinko from comment #3) > 2. Are you running without a JreMemoryLeakPreventionListener ? It is there I did a regular "ant clean deploy" without any additional changes -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Tomcat 6 End of life plan
2014-04-11 15:29 GMT+04:00 Emmanuel Bourg : > Hi all, > > I'm wondering if there is any plan regarding the EOL of Tomcat 6. Debian > Jessie is due to be released next year and should be supported until at > least 2017. If Tomcat 6 was to be EOLed during this time frame the > Debian maintainers would have to support it without the help of the > upstream developers which is not desirable. In this case it might be > preferable to drop Tomcat 6 from the next Debian release. > I would not expect it to last into 2017. There is also no automated testsuite for Tomcat 6, so it is easier to break things when backporting (and requires more review). It is already known that the next version of ECJ compiler does not run on Java 5 anymore. My personal feeling is that I would expect an EOL announcement sometime this year (ApacheCon EU in late autumn?), which gives 1,5 more years, until end of 2015. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in ASF Buildbot on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/5670 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1586644 Blamelist: kkolinko BUILD FAILED: failed compile_1 sincerely, -The Buildbot
Re: VOTE] Release Apache Tomcat Connectors 1.2.40
On 04/11/2014 05:00 PM, Konstantin Kolinko wrote: 2014-04-11 17:17 GMT+04:00 Mladen Turk : There are no asc/md5/sha1 files for the -src.zip and -src.tar.gz at [1]. Are they missing, or just unreadable? Should be visible now. Cheers -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat Native 1.1.30
Mladen, On 4/10/14, 10:06 AM, Mladen Turk wrote: > On 04/10/2014 05:55 PM, Christopher Schultz wrote: >> Mladen, >> >> On 4/10/14, 9:29 AM, Mladen Turk wrote: >>> On 04/10/2014 03:15 PM, Robert Sanders wrote: Is the TCN portion of BZ 56027 address completely or partially with this release? >>> >>> Nope. This issue was not fixed with this release. >> >> The primary tcnative bit was in svn. Did you build 1.1/trunk, or did you >> just apply certain patches? >> >> There was a followup-comment about the 512-bit RSA key generation which >> is a separate problem IMO which has not yet been addressed. >> > > Ah, now I saw your commit. > You will have to apply this to branches/1.1.x > This is where the releases are coming from. > Trunk is just a playground and probably expecting a major rewrite, so > don't bother with it :) r1559182 was the back-port to 1.1 branch. -chris signature.asc Description: OpenPGP digital signature
[Bug 56396] New: TCN fails FIPS mode initialization if unable to generate 512 bit RSA temporary key
https://issues.apache.org/bugzilla/show_bug.cgi?id=56396 Bug ID: 56396 Summary: TCN fails FIPS mode initialization if unable to generate 512 bit RSA temporary key Product: Tomcat Native Version: 1.1.29 Hardware: All OS: Linux Status: NEW Severity: normal Priority: P2 Component: Library Assignee: dev@tomcat.apache.org Reporter: rsand...@trustedcs.com Initially report in https://issues.apache.org/bugzilla/show_bug.cgi?id=56027 On a RHEL6 system configured to be in FIPS 140 mode at boot time the Tomcat Native library will not start, due to the inability to generate a 512 bit RSA temporary key. Commenting out the SSL_TMP_KEY_INIT_RSA(512) line in the SSL_TMP_KEYS_INIT() macro and rebuilding allows TCN to successfully start in FIPS mode. The logic used in the SSL_TMP_KEYS_INIT() macro will cause the startup to fail if any of the temporary keys being generated fails. Should this be changed to pass if at least one key generates, or one key of each type (RSA,DH, etc...)? The following note is taken from the comments on the original 56027 bug: https://issues.apache.org/bugzilla/show_bug.cgi?id=56027#c14 -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56027] Unable to use TCN on RHEL6 boxes if box is booted in fips mode
https://issues.apache.org/bugzilla/show_bug.cgi?id=56027 --- Comment #15 from Rob Sanders --- As per request I've filed a new bug for the failure to init the RSA 512 bit temporary key (https://issues.apache.org/bugzilla/show_bug.cgi?id=56396). -- 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
buildbot success in ASF Buildbot on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/tomcat-trunk/builds/5671 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-vm_ubuntu Build Reason: scheduler Build Source Stamp: [branch tomcat/trunk] 1586658 Blamelist: kkolinko Build succeeded! sincerely, -The Buildbot
Re: [VOTE] Release Apache Tomcat Native 1.1.30
On 04/11/2014 08:10 PM, Christopher Schultz wrote: The primary tcnative bit was in svn. Did you build 1.1/trunk, or did you just apply certain patches? There was a followup-comment about the 512-bit RSA key generation which is a separate problem IMO which has not yet been addressed. r1559182 was the back-port to 1.1 branch. Then it's there. If it doesn't work ... Well its your patch :) Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56396] TCN fails FIPS mode initialization if unable to generate 512 bit RSA temporary key
https://issues.apache.org/bugzilla/show_bug.cgi?id=56396 --- Comment #1 from Mladen Turk --- When you say at boot time, this means started as a service? This looks like a blocked read from /dev/urandom due to not enough entropy. Think there are some solutions to that. Google. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56397] New: Establish parallel Maven-based build process
https://issues.apache.org/bugzilla/show_bug.cgi?id=56397 Bug ID: 56397 Summary: Establish parallel Maven-based build process Product: Tomcat 8 Version: trunk Hardware: PC OS: Mac OS X 10.4 Status: NEW Severity: enhancement Priority: P2 Component: Meta Assignee: dev@tomcat.apache.org Reporter: ch...@christopherschultz.net -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56398] New: Support Arquillian-based unit testing
https://issues.apache.org/bugzilla/show_bug.cgi?id=56398 Bug ID: 56398 Summary: Support Arquillian-based unit testing Product: Tomcat 8 Version: trunk Hardware: All OS: All Status: NEW Severity: enhancement Priority: P2 Component: Meta Assignee: dev@tomcat.apache.org Reporter: ch...@christopherschultz.net -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56399] New: Re-factor request/response recycling so Coyote and Catalina objects are recycled simultaneously
https://issues.apache.org/bugzilla/show_bug.cgi?id=56399 Bug ID: 56399 Summary: Re-factor request/response recycling so Coyote and Catalina objects are recycled simultaneously Product: Tomcat 8 Version: trunk Hardware: All OS: All Status: NEW Severity: enhancement Priority: P2 Component: Meta Assignee: dev@tomcat.apache.org Reporter: ch...@christopherschultz.net It probably makes sense to create a new Recyclable interface in Coyote and then use it in both, to avoid circular-dependencies between Coyote and Catalina. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56400] New: Change POOL2/DBCP2 consumption strategy
https://issues.apache.org/bugzilla/show_bug.cgi?id=56400 Bug ID: 56400 Summary: Change POOL2/DBCP2 consumption strategy Product: Tomcat 8 Version: trunk Hardware: All OS: All Status: NEW Severity: enhancement Priority: P2 Component: Meta Assignee: dev@tomcat.apache.org Reporter: ch...@christopherschultz.net Use package-renamed version as with other commons components. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56401] New: Log version information on startup
https://issues.apache.org/bugzilla/show_bug.cgi?id=56401 Bug ID: 56401 Summary: Log version information on startup Product: Tomcat 8 Version: trunk Hardware: All OS: All Status: NEW Severity: enhancement Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: ch...@christopherschultz.net Create a new "startup" logger and emit some good information to it such as version, etc. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56402] New: Add support for HTTP Upgrade to AJP components
https://issues.apache.org/bugzilla/show_bug.cgi?id=56402 Bug ID: 56402 Summary: Add support for HTTP Upgrade to AJP components Product: Tomcat 8 Version: trunk Hardware: All OS: All Status: NEW Severity: enhancement Priority: P2 Component: Connectors Assignee: dev@tomcat.apache.org Reporter: ch...@christopherschultz.net -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56403] New: Support pluggable password-derivation in Realms
https://issues.apache.org/bugzilla/show_bug.cgi?id=56403 Bug ID: 56403 Summary: Support pluggable password-derivation in Realms Product: Tomcat 8 Version: trunk Hardware: All OS: All Status: NEW Severity: enhancement Priority: P2 Component: Catalina Assignee: dev@tomcat.apache.org Reporter: ch...@christopherschultz.net Add an interface that can be used to match credentials rather than doing the matching within the Realm itself. This can be used to support PBKDF11, bcrypt, scrypt, etc. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56396] TCN fails FIPS mode initialization if unable to generate 512 bit RSA temporary key
https://issues.apache.org/bugzilla/show_bug.cgi?id=56396 --- Comment #2 from Christopher Schultz --- I think we should just drop support for RSA-512, anyway. It should be considered insecure, which is probably why ken-generation fails (due to FIPS restrictions). -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56396] TCN fails FIPS mode initialization if unable to generate 512 bit RSA temporary key
https://issues.apache.org/bugzilla/show_bug.cgi?id=56396 --- Comment #3 from Mladen Turk --- OK. Think I get more clearer picture now. There are two things we should do inside ssl_tmp_key_init_rsa function 1. Use RSA_generate_key_ex function 2. Be tolerant on keys < 1024 bits if OPENSSL_FIPS is defined because they are supposed to fail as per fips-140 spec. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 56363] OpenSSL security advisory - Heartbleed bug
https://issues.apache.org/bugzilla/show_bug.cgi?id=56363 --- Comment #11 from Gary Bollinger --- Is there a prediction on when this compile will be released? -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 43400] enum support for tag libs
https://issues.apache.org/bugzilla/show_bug.cgi?id=43400 Mark Thomas changed: What|Removed |Added Keywords||PatchAvailable -- 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: r1586789 - in /tomcat/trunk: java/org/apache/tomcat/util/net/SecureNio2Channel.java test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
Author: remm
Date: Fri Apr 11 22:42:43 2014
New Revision: 1586789
URL: http://svn.apache.org/r1586789
Log:
- Possible SSL NIO2 fixes for gather (if there are more than two buffers, which
doesn't really happen) and incomplete netOutBuffer writes (which also shouldn't
happen).
- Try again the SSL test, just in case.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java?rev=1586789&r1=1586788&r2=1586789&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SecureNio2Channel.java Fri Apr
11 22:42:43 2014
@@ -817,7 +817,7 @@ public class SecureNio2Channel extends N
try {
// Prepare the output buffer
-this.netOutBuffer.clear();
+netOutBuffer.clear();
// Wrap the source data into the internal buffer
SSLEngineResult result = sslEngine.wrap(src, netOutBuffer);
final int written = result.bytesConsumed();
@@ -827,13 +827,17 @@ public class SecureNio2Channel extends N
tasks();
}
// Write data to the channel
-sc.write(this.netOutBuffer, timeout, unit, attachment,
+sc.write(netOutBuffer, timeout, unit, attachment,
new CompletionHandler() {
@Override
public void completed(Integer nBytes, A attach) {
if (nBytes.intValue() < 0) {
failed(new EOFException(), attach);
+} else if (netOutBuffer.hasRemaining()) {
+sc.write(netOutBuffer, timeout, unit, attachment,
this);
} else if (written == 0) {
+// Special case, start over to avoid code
duplication
+writePending = false;
write(src, timeout, unit, attachment, handler);
} else {
// Call the handler completed method with the
@@ -875,7 +879,7 @@ public class SecureNio2Channel extends N
this.unit = unit;
this.attachment = attachment;
this.handler = handler;
-this.pos = offset + 1;
+this.pos = offset;
}
public long writeCount = 0;
public int pos;
@@ -894,12 +898,14 @@ public class SecureNio2Channel extends N
if (state.pos == state.offset + state.length) {
writePending = false;
state.handler.completed(Long.valueOf(state.writeCount),
state.attachment);
+} else if (netOutBuffer.hasRemaining()) {
+sc.write(netOutBuffer, state.timeout, state.unit, state,
this);
} else {
try {
// Prepare the output buffer
netOutBuffer.clear();
// Wrap the source data into the internal buffer
-SSLEngineResult result =
sslEngine.wrap(state.srcs[state.offset], netOutBuffer);
+SSLEngineResult result =
sslEngine.wrap(state.srcs[state.pos], netOutBuffer);
int written = result.bytesConsumed();
state.writeCount += written;
netOutBuffer.flip();
@@ -907,8 +913,8 @@ public class SecureNio2Channel extends N
if (result.getHandshakeStatus() ==
HandshakeStatus.NEED_TASK) {
tasks();
}
-if (written > 0) {
-state.offset++;
+if (!state.srcs[state.pos].hasRemaining()) {
+state.pos++;
}
// Write data to the channel
sc.write(netOutBuffer, state.timeout, state.unit,
state, this);
@@ -958,6 +964,9 @@ public class SecureNio2Channel extends N
if (result.getHandshakeStatus() == HandshakeStatus.NEED_TASK) {
tasks();
}
+if (!srcs[offset].hasRemaining()) {
+state.pos++;
+}
// Write data to the channel
sc.write(netOutBuffer, timeout, unit, state, new
GatherCompletionHandler<>(state));
} else {
Modified:
tomcat/trunk/test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java
URL:
http://svn.apache.org/v
