Author: markt
Date: Sat Apr 10 22:32:23 2010
New Revision: 932800
URL: http://svn.apache.org/viewvc?rev=932800&view=rev
Log:
Update to NSIS 2.46 (kkolinko)
Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc5.5.x/trunk/build/build.properties.default
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=932800&r1=932799&r2=932800&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Sat Apr 10 22:32:23 2010
@@ -106,19 +106,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: markt, kkolinko
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48613
- Only attempt APR initialization if the <Listener> has been specified
- It is backport of r911300. (fix by fhanik)
- http://people.apache.org/~kkolinko/patches/2010-03-11_tc55_bug48613.patch
- +1: kkolinko, markt, kfujino
- -1:
-
-* Update to NSIS 2.46
- NSIS changelog: http://nsis.sourceforge.net/Docs/AppendixF.html#F.1.1
- http://svn.apache.org/viewvc?rev=921630&view=rev
- +1: kkolinko, markt, rjung
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48717
When a node joins a cluster and it receives all the current sessions, ensure
the sessionCreated event is fired if the Manager is configured to replicate
Modified: tomcat/tc5.5.x/trunk/build/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/build/build.properties.default?rev=932800&r1=932799&r2=932800&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/build/build.properties.default (original)
+++ tomcat/tc5.5.x/trunk/build/build.properties.default Sat Apr 10 22:32:23 2010
@@ -209,12 +209,12 @@ rhino.jar=${rhino.home}/js.jar
rhino.loc=http://ftp.mozilla.org/pub/mozilla.org/js/rhino1_6R2.zip
# ----- NSIS, version 2.0 or later -----
-nsis.home=${base.path}/nsis-2.45
+nsis.home=${base.path}/nsis-2.46
nsis.exe=${nsis.home}/makensis.exe
nsis.installoptions.dll=${nsis.home}/Plugins/InstallOptions.dll
nsis.nsexec.dll=${nsis.home}/Plugins/nsExec.dll
nsis.nsisdl.dll=${nsis.home}/Plugins/NSISdl.dll
-nsis.loc=${base-sf.loc}/nsis/nsis-2.45.zip
+nsis.loc=${base-sf.loc}/nsis/nsis-2.46.zip
# ----- Struts, version 1.2.4 or later -----
Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=932800&r1=932799&r2=932800&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Sat Apr 10
22:32:23 2010
@@ -39,6 +39,9 @@
<update>Update to Commons Daemon 1.0.2. Use service launcher (procrun)
from the Commons Daemon release. Do not keep a copy of it in our source
tree. (mturk/kkolinko)</update>
+ <update>
+ Update to NSIS 2.46. (kkolinko)
+ </update>
</changelog>
</subsection>
<subsection name="Catalina">
@@ -49,6 +52,14 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Coyote">
+ <changelog>
+ <fix>
+ <bug>48613</bug>: Only attempt APR/native connector initialization if
+ the Listener element has been specified in server.xml.
(fhanik/kkolinko)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Jasper">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
