Re: Refresh JK httpd-2.4.x binaries [VOTE] ?
2012/3/26 Mladen Turk : > Hi, > > I build our courtesy windows binaries against httpd-2.4.1-dev > which has a different MMN then 2.4.1 thus refusing to load. > (other binaries are file) > > I have removed the tomcat-connectors-1.2.35-windows-i386-http-2.4.x.* > file from dist site and new one are at: > http://people.apache.org/~mturk/tomcat-connectors/jk-1.2.35/binaries/windows/ > (just *-http-2.4.x-* files are changed) > > Should we vote for putting those on our official dist site? > If so, please use this as a VOTE thread, and with my implicit +1 > I'll upload those bins when I collect two more votes. +1 Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Refresh JK httpd-2.4.x binaries [VOTE] ?
Hi, I build our courtesy windows binaries against httpd-2.4.1-dev which has a different MMN then 2.4.1 thus refusing to load. (other binaries are file) I have removed the tomcat-connectors-1.2.35-windows-i386-http-2.4.x.* file from dist site and new one are at: http://people.apache.org/~mturk/tomcat-connectors/jk-1.2.35/binaries/windows/ (just *-http-2.4.x-* files are changed) Should we vote for putting those on our official dist site? If so, please use this as a VOTE thread, and with my implicit +1 I'll upload those bins when I collect two more votes. Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r566 - /release/tomcat/tomcat-connectors/jk/binaries/windows/
Author: mturk Date: Mon Mar 26 05:25:17 2012 New Revision: 566 Log: Remove broken httpd-2.4 binaries. We'll do a refresh but will have to go trough vote again Removed: release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.35-windows-i386-httpd-2.4.x.zip release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.35-windows-i386-httpd-2.4.x.zip.asc release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.35-windows-i386-httpd-2.4.x.zip.md5 release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.35-windows-i386-httpd-2.4.x.zip.sha1 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r566 - /release/tomcat/tomcat-connectors/jk/binaries/windows/
Author: mturk Date: Mon Mar 26 05:25:17 2012 New Revision: 566 Log: Remove broken httpd-2.4 binaries. We'll do a refresh but will have to go trough vote again Removed: release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.35-windows-i386-httpd-2.4.x.zip release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.35-windows-i386-httpd-2.4.x.zip.asc release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.35-windows-i386-httpd-2.4.x.zip.md5 release/tomcat/tomcat-connectors/jk/binaries/windows/tomcat-connectors-1.2.35-windows-i386-httpd-2.4.x.zip.sha1 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Notice: compilation of mod_jk for httpd 1.3 broken in 1.2.35
On 03/25/2012 08:15 PM, Rainer Jung wrote: On 25.03.2012 20:05, Mladen Turk wrote: On 03/25/2012 04:00 PM, Rainer Jung wrote: Fixed by http://svn.apache.org/viewvc?rev=1305020&view=rev I went through the change logs of the last three years and only very few changes were missing, of which only one was critical, namely the one cited above. But I'm fine with announcing that we stop maintaining mod_jk for HTTPD 1.3 after 1.2.35. The only problem is that then the last release can't be build. Should we provide a "patches_to_apply_..." directory like httpd does it for important patches? I'm fine with that. I'll just say in the ANN that this version does not compile with 1.3 unless you apply the r1035020. If there will be enough community interest in the future we can either release 1.2.36 or just stop here and cleanup all the config mess needed for supporting both 1.3 and 2.x branches. Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1305224 - /tomcat/taglibs/site/pom.xml
Author: jboynes Date: Mon Mar 26 04:59:55 2012 New Revision: 1305224 URL: http://svn.apache.org/viewvc?rev=1305224&view=rev Log: update to use new parent POM version Modified: tomcat/taglibs/site/pom.xml Modified: tomcat/taglibs/site/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/site/pom.xml?rev=1305224&r1=1305223&r2=1305224&view=diff == --- tomcat/taglibs/site/pom.xml (original) +++ tomcat/taglibs/site/pom.xml Mon Mar 26 04:59:55 2012 @@ -23,7 +23,7 @@ org.apache.taglibs taglibs-parent -3-SNAPSHOT +4-SNAPSHOT ../taglibs-parent/pom.xml - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[VOTE] Release Apache Taglibs Parent POM 3
The proposed 3 release of Apache Taglibs Parent POM is now available for voting. This release addresses issues found during the 1 release process including duplicate LICENSE files and poor site configuration, and updates the copyright date in the NOTICE file from release 2 (withdrawn). The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-111/ and SVN tag is: http://svn.apache.org/repos/asf/tomcat/taglibs/taglibs-parent/tags/taglibs-parent-3/ Please vote on whether Apache Taglibs Parent 3 should be: [+1] Released, or [-1] Not released because ... Thanks Jeremy
svn commit: r1305222 - /tomcat/taglibs/taglibs-parent/trunk/pom.xml
Author: jboynes Date: Mon Mar 26 04:54:46 2012 New Revision: 1305222 URL: http://svn.apache.org/viewvc?rev=1305222&view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: tomcat/taglibs/taglibs-parent/trunk/pom.xml Modified: tomcat/taglibs/taglibs-parent/trunk/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/taglibs-parent/trunk/pom.xml?rev=1305222&r1=1305221&r2=1305222&view=diff == --- tomcat/taglibs/taglibs-parent/trunk/pom.xml (original) +++ tomcat/taglibs/taglibs-parent/trunk/pom.xml Mon Mar 26 04:54:46 2012 @@ -25,7 +25,7 @@ org.apache.taglibs taglibs-parent - 3 + 4-SNAPSHOT Apache Taglibs Parent pom @@ -52,9 +52,9 @@ - scm:svn:http://svn.apache.org/repos/asf/tomcat/taglibs/taglibs-parent/tags/taglibs-parent-3 - scm:svn:https://svn.apache.org/repos/asf/tomcat/taglibs/taglibs-parent/tags/taglibs-parent-3 - http://svn.apache.org/viewvc/tomcat/taglibs/taglibs-parent/tags/taglibs-parent-3 + scm:svn:http://svn.apache.org/repos/asf/tomcat/taglibs/taglibs-parent/trunk + scm:svn:https://svn.apache.org/repos/asf/tomcat/taglibs/taglibs-parent/trunk +http://svn.apache.org/viewvc/tomcat/taglibs/taglibs-parent/trunk - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1305221 - /tomcat/taglibs/taglibs-parent/tags/taglibs-parent-3/
Author: jboynes Date: Mon Mar 26 04:54:45 2012 New Revision: 1305221 URL: http://svn.apache.org/viewvc?rev=1305221&view=rev Log: [maven-release-plugin] copy for tag taglibs-parent-3 Added: tomcat/taglibs/taglibs-parent/tags/taglibs-parent-3/ - copied from r1305220, tomcat/taglibs/taglibs-parent/trunk/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1305220 - /tomcat/taglibs/taglibs-parent/trunk/pom.xml
Author: jboynes Date: Mon Mar 26 04:54:42 2012 New Revision: 1305220 URL: http://svn.apache.org/viewvc?rev=1305220&view=rev Log: [maven-release-plugin] prepare release taglibs-parent-3 Modified: tomcat/taglibs/taglibs-parent/trunk/pom.xml Modified: tomcat/taglibs/taglibs-parent/trunk/pom.xml URL: http://svn.apache.org/viewvc/tomcat/taglibs/taglibs-parent/trunk/pom.xml?rev=1305220&r1=1305219&r2=1305220&view=diff == --- tomcat/taglibs/taglibs-parent/trunk/pom.xml (original) +++ tomcat/taglibs/taglibs-parent/trunk/pom.xml Mon Mar 26 04:54:42 2012 @@ -25,7 +25,7 @@ org.apache.taglibs taglibs-parent - 3-SNAPSHOT + 3 Apache Taglibs Parent pom @@ -52,9 +52,9 @@ - scm:svn:http://svn.apache.org/repos/asf/tomcat/taglibs/taglibs-parent/trunk - scm:svn:https://svn.apache.org/repos/asf/tomcat/taglibs/taglibs-parent/trunk -http://svn.apache.org/viewvc/tomcat/taglibs/taglibs-parent/trunk + scm:svn:http://svn.apache.org/repos/asf/tomcat/taglibs/taglibs-parent/tags/taglibs-parent-3 + scm:svn:https://svn.apache.org/repos/asf/tomcat/taglibs/taglibs-parent/tags/taglibs-parent-3 + http://svn.apache.org/viewvc/tomcat/taglibs/taglibs-parent/tags/taglibs-parent-3 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-trunk-test (in module tomcat-trunk) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-trunk-test has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-trunk-test : Tomcat 8.x, a web server implementing Java Servlet 3.1, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on tomcat-trunk-dbcp exists, no need to add for property tomcat-dbcp-src.jar. -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -DEBUG- Dependency on tomcat-trunk-dbcp exists, no need to add for property tomcat-dbcp.home. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-trunk/output/build/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-trunk/tomcat-trunk-test/gump_work/build_tomcat-trunk_tomcat-trunk-test.html Work Name: build_tomcat-trunk_tomcat-trunk-test (Type: Build) Work ended in a state of : Failed Elapsed: 22 mins 47 secs Command Line: /usr/lib/jvm/java-6-openjdk/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/dist/junit-26032012.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-26032012-native-src.tar.gz -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-26032012-native-src.tar.gz -Dexamples.sources.skip=true -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps -Djdt.jar=/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-26032012.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-dbcp-src.jar -Dtest.accesslog=true -Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x -Dcommons-dbcp.home=/ srv/gump/public/workspace/commons-dbcp-1.x -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-trunk/tomcat-deps/tomcat-dbcp-26032012.jar test [Working Directory: /srv/gump/public/workspace/tomcat-trunk] CLASSPATH: /usr/lib/jvm/java-6-openjdk/lib/tools.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-trunk/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/servlet-api.jar:/srv/gump/public/workspace/tomcat-trunk/outp ut/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-trunk/output/build/lib/tomcat-util.jar:/srv/gump/packages/javamail-1.4/mail.jar:/srv/gump/packages/javamail-1.4/lib/mailapi.jar:/srv/gump/packages/jaf-1.1ea/activation.jar:/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar:/srv/gump/public/workspace/tomcat-tr unk/tomcat-deps/tomcat-dbcp-26032012.jar:/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-26032012.jar:/srv/gump/public/workspace/junit/dist/junit-26032012.j
[WITHDRAWN] Release Apache Taglibs Parent POM 2
Withdrawing this to fix date in NOTICE. On Mar 24, 2012, at 8:09 AM, sebb wrote: > On 24 March 2012 14:45, Jeremy Boynes wrote: >> The proposed 2 release of Apache Taglibs Parent POM is now available for >> voting. >> >> This release addresses issues found during the 1 release process including >> duplicate LICENSE files and poor site configuration. >> >> The Maven staging repo is: >> https://repository.apache.org/content/repositories/orgapachetomcat-107/ >> >> and SVN tag is: >> http://svn.apache.org/repos/asf/tomcat/taglibs/taglibs-parent/tags/taglibs-parent-2/ > > NOTICE says > Copyright 2009-2012 > > pom.xml has > 2000 > > These are inconsistent. > >> Please vote on whether Apache Taglibs Parent 2 should be: >> [+1] Released, or >> [-1] Not released because ... >> >> Thanks >> Jeremy >> >> >> - >> 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 > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1305219 - /tomcat/taglibs/taglibs-parent/trunk/NOTICE
Author: jboynes Date: Mon Mar 26 04:46:06 2012 New Revision: 1305219 URL: http://svn.apache.org/viewvc?rev=1305219&view=rev Log: update NOTICE to match inception date Modified: tomcat/taglibs/taglibs-parent/trunk/NOTICE Modified: tomcat/taglibs/taglibs-parent/trunk/NOTICE URL: http://svn.apache.org/viewvc/tomcat/taglibs/taglibs-parent/trunk/NOTICE?rev=1305219&r1=1305218&r2=1305219&view=diff == --- tomcat/taglibs/taglibs-parent/trunk/NOTICE (original) +++ tomcat/taglibs/taglibs-parent/trunk/NOTICE Mon Mar 26 04:46:06 2012 @@ -1,5 +1,5 @@ Apache Tomcat Taglib Parent -Copyright 2009-2012 The Apache Software Foundation +Copyright 2000-2012 The Apache Software Foundation This product includes software developed by The Apache Software Foundation (http://www.apache.org/). - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GUMP@vmgump]: Project tomcat-tc7.0.x-test (in module tomcat-7.0.x) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-tc7.0.x-test has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc7.0.x-test : Tomcat 7.x, a web server implementing Java Servlet 3.0, ... Full details are available at: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp-src.jar. -DEBUG- Dependency on commons-daemon exists, no need to add for property commons-daemon.native.src.tgz. -DEBUG- Dependency on commons-daemon exists, no need to add for property tomcat-native.tar.gz. -DEBUG- Dependency on tomcat-tc7.0.x-dbcp exists, no need to add for property tomcat-dbcp.home. -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-7.0.x/output/build/logs The following work was performed: http://vmgump.apache.org/gump/public/tomcat-7.0.x/tomcat-tc7.0.x-test/gump_work/build_tomcat-7.0.x_tomcat-tc7.0.x-test.html Work Name: build_tomcat-7.0.x_tomcat-tc7.0.x-test (Type: Build) Work ended in a state of : Failed Elapsed: 21 mins 54 secs Command Line: /usr/lib/jvm/java-6-openjdk/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/dist/junit-26032012.jar -Dcommons-daemon.native.src.tgz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-26032012-native-src.tar.gz -Dtomcat-native.tar.gz=/srv/gump/public/workspace/apache-commons/daemon/dist/bin/commons-daemon-26032012-native-src.tar.gz -Dexamples.sources.skip=true -Dtomcat-dbcp.home=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps -Djdt.jar=/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-26032012.jar -Dtomcat-dbcp-src.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-src.jar -Dtest.accesslog=true -Dcommons-pool.home=/srv/gump/public/workspace/commons-pool-1.x -Dcommons-dbcp.home=/ srv/gump/public/workspace/commons-dbcp-1.x -Dtomcat-dbcp.jar=/srv/gump/public/workspace/tomcat-7.0.x/tomcat-deps/tomcat-dbcp-26032012.jar test [Working Directory: /srv/gump/public/workspace/tomcat-7.0.x] CLASSPATH: /usr/lib/jvm/java-6-openjdk/lib/tools.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-7.0.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/servlet-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/outp ut/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-7.0.x/output/build/lib/tomcat-util.jar:/srv/gump/packages/javamail-1.4/mail.jar:/srv/gump/packages/javamail-1.4/lib/mailapi.jar:/srv/gump/packages/jaf-1.1ea/activation.jar:/srv/gump/packages/eclipse/plugins/org.eclipse.jdt.core_3.4.2/jdtcore.jar:/srv/gump/public/workspace/tomcat-7. 0.x/tomcat-deps/tomcat-dbcp-26032012.jar:/srv/gump/public/workspace/apache-commons/daemon/dist/commons-daemon-26032012.jar:/srv/gump/public/workspace/junit/dist/
DO NOT REPLY [Bug 52983] DIGEST auth broken on 6.0.x manager app because of redundant WWW-Authenticate header in 401.jsp
https://issues.apache.org/bugzilla/show_bug.cgi?id=52983 Neale Rudd changed: What|Removed |Added Attachment #28505|0 |1 is 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 52983] DIGEST auth broken on 6.0.x manager app because of redundant WWW-Authenticate header in 401.jsp
https://issues.apache.org/bugzilla/show_bug.cgi?id=52983 --- Comment #1 from Neale Rudd 2012-03-26 04:09:36 UTC --- Created attachment 28506 --> https://issues.apache.org/bugzilla/attachment.cgi?id=28506 patch against 6.0.x trunk eliminating redundant header after checking if it already exists -- 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 52983] New: DIGEST auth broken on 6.0.x manager app because of redundant WWW-Authenticate header in 401.jsp
https://issues.apache.org/bugzilla/show_bug.cgi?id=52983
Bug #: 52983
Summary: DIGEST auth broken on 6.0.x manager app because of
redundant WWW-Authenticate header in 401.jsp
Product: Tomcat 6
Version: 6.0.35
Platform: All
OS/Version: All
Status: NEW
Severity: normal
Priority: P2
Component: Manager application
AssignedTo: dev@tomcat.apache.org
ReportedBy: ne...@metawerx.net
Classification: Unclassified
Created attachment 28505
--> https://issues.apache.org/bugzilla/attachment.cgi?id=28505
patch against 6.0.x trunk removing problematic lines from 401.jsp
The Manager app in 6.0.35 sets WWW-Authenticate in 401.jsp.
However, this seems to be already set elsewhere, and as a result of setting it
again in 401.jsp, DIGEST mode can not be used for the manager app.
>From what I can see, this is fixed in 7.0.x but doesn't seem to have been
backported to 6.0.x yet.
The result is that DIGEST for Tomcat Manager can't be used on Tomcat 6 which is
still very popular.
To demonstrate, I changed 401.jsp to set the header name to
WWW-AuthenticateREDUNDANT and here is the result:
For BASIC:
HTTP/1.1 401 Unauthorized
Pragma: No-cache
Cache-Control: no-cache
Expires: Thu, 01 Jan 1970 10:00:00 EST
WWW-Authenticate: Basic realm="Tomcat Manager Application"
Set-Cookie: JSESSIONID=removed; Path=/manager
WWW-AuthenticateREDUNDANT: Basic realm="Tomcat Manager Application"
Content-Type: text/html
Transfer-Encoding: chunked
Vary: Accept-Encoding
Date: Mon, 26 Mar 2012 03:39:09 GMT
Server: Coyote
For DIGEST:
HTTP/1.1 401 Unauthorized
Pragma: No-cache
Cache-Control: no-cache
Expires: Thu, 01 Jan 1970 10:00:00 EST
WWW-Authenticate: Digest realm="Tomcat Manager Application", qop="auth",
nonce="removed", opaque="removed"
Set-Cookie: JSESSIONID=removed; Path=/manager
WWW-AuthenticateREDUNDANT: Basic realm="Tomcat Manager Application"
Content-Type: text/html
Transfer-Encoding: chunked
Vary: Accept-Encoding
Date: Mon, 26 Mar 2012 03:44:07 GMT
Server: Coyote
You can clearly see the REDUNDANT header being set here by 401.jsp.
To fix on my local versions, I simply removed the line in 401.jsp (patch1.txt).
However, this deserves a cross-check by someone else before being committed in
case there's some situation where it would remove authentication altogether.
An alternative solution for this version is to check if the header is set, and
only add it where it's not already present (patch2.txt):
if(!response.containsHeader("WWW-Authenticate"))
response.setHeader("WWW-Authenticater", "Basic realm=\"Tomcat Manager
Application\"");
... but I'll leave that up to you.
Best Regards,
Neale
--
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: SPDY support
On Sun, Mar 25, 2012 at 5:58 PM, Bill Barker wrote: > > > "Mark Thomas" wrote in message news:4F6F8735.3090706@apache.**org... > > > On 25/03/2012 17:24, Costin Manolache wrote: > >> For Tomcat7 I'm proposing to only add hooks: 'beforeHandshake' callback in >>> Handler, and an optional NpnHandler class plus setters in protocol. >>> There is no Java7 or spdy dependency at all. >>> >> >> Sounds good to me. >> >> The main question is if it's ok to add a build-time dependency on >>> npn-boot, >>> >> >> Is this required for 7.0.x or just trunk? I'm assuming just trunk. >> > Trunk only. > >> Since users will still have to download npn-boot.jar ( it contains GPL so >>> probably can't be distributed with tomcat ) - they could also download a >>> jar with those 2 classes and the 2 for jio. That's the second option, if >>> compile-time dep to gpl is not ok. >>> >> >> I think that the compile-time dep on GPL needs to be completely >> optional. I have no issue with using such a dep in the release builds >> but I image that there are folks downstream who aren't that relaxed. It >> should be possible to structure this in such a way that Tomcat can still >> be compiled if the GPL'd JAR is not available. >> >> Yes, the company I work for in my day job is one of those that won't be > that relaxed. My CTO has a strict no GPL policy (because our clients also > don't want GPL). Apache is about releasing code under the AL2, and is why > it has been successful. IMHO if this module requires GPL code then it > should permanently stay on github as an optional addon module for Tomcat > that can be downloaded from there, but not included in the normal Tomcat > release which should be a pure AL2 license. I understand ( and agree ) with 'no GPL included in a tomcat release', that's not what I'm proposing. And it's no longer an issue - it seems they have a separate jar containing only the class we depend on, which is AL2: https://github.com/eclipse/jetty.project/blob/master/jetty-npn/src/main/java/org/eclipse/jetty/npn/NextProtoNego.java npn-api is the jar. At runtime: if a user wants spdy with AL2, he'll have to use apr and compile latest JNI. If he wants NIO/BIO - he'll need to independently download npn-boot.jar and use java7 ( or wait until java7 includes the needed tls changes ). Costin > > > The 3rd option is to have the entire spdy package outside tomcat - but >>> keep >>> the hooks ( i.e. 'beforeHandshake', NpnHandler, etc ) - like I'm >>> proposing >>> for tomcat7. >>> >> >> That seems excessively complex for the folks that want to use spdy but I >> have no issue with that approach. >> >> Mark >> > > > > --**--**- > To unsubscribe, e-mail: > dev-unsubscribe@tomcat.apache.**org > For additional commands, e-mail: dev-h...@tomcat.apache.org > >
svn commit: r1305200 - /tomcat/tc6.0.x/trunk/STATUS.txt
Author: kkolinko Date: Mon Mar 26 02:03:32 2012 New Revision: 1305200 URL: http://svn.apache.org/viewvc?rev=1305200&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=1305200&r1=1305199&r2=1305200&view=diff == --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Mar 26 02:03:32 2012 @@ -144,6 +144,15 @@ PATCHES PROPOSED TO BACKPORT: +1: kkolinko, markt -1: +* Update Apache Commons Daemon to 1.0.10. + Update the native component of the Tomcat APR/native connector to + 1.1.23 and take advantage of the simplified distribution. + It is backport of the following revs of 7.0.x: + r1300557 r1301269 r1305197 + http://people.apache.org/~kkolinko/patches/2012-03-26_tc6_update_deps.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
svn commit: r1305197 - in /tomcat/tc7.0.x/trunk: ./ build.xml
Author: kkolinko
Date: Mon Mar 26 01:56:02 2012
New Revision: 1305197
URL: http://svn.apache.org/viewvc?rev=1305197&view=rev
Log:
Merged revision 1305194 from tomcat/trunk:
Review of r1301269
1. Restore *.dll pattern. (Why was it changed? Both variants do work).
2. Let's reference the LICENSE file instead of VERSIONS one. It should always
be there.
I am not sure where VERSIONS file comes from, as I do not see how it is
generated in tc-native 1.1.x sources.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/build.xml
Propchange: tomcat/tc7.0.x/trunk/
--
Merged /tomcat/trunk:r1305194
Modified: tomcat/tc7.0.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.xml?rev=1305197&r1=1305196&r2=1305197&view=diff
==
--- tomcat/tc7.0.x/trunk/build.xml (original)
+++ tomcat/tc7.0.x/trunk/build.xml Mon Mar 26 01:56:02 2012
@@ -1538,8 +1538,8 @@
-
-
+
+
@@ -2345,7 +2345,7 @@ Apache Tomcat ${version} native binaries
-
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1305194 - /tomcat/trunk/build.xml
Author: kkolinko
Date: Mon Mar 26 01:50:28 2012
New Revision: 1305194
URL: http://svn.apache.org/viewvc?rev=1305194&view=rev
Log:
Review of r1301269
1. Restore *.dll pattern. (Why was it changed? Both variants do work).
2. Let's reference the LICENSE file instead of VERSIONS one. It should always
be there.
I am not sure where VERSIONS file comes from, as I do not see how it is
generated in tc-native 1.1.x sources.
Modified:
tomcat/trunk/build.xml
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1305194&r1=1305193&r2=1305194&view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Mon Mar 26 01:50:28 2012
@@ -1536,8 +1536,8 @@
-
-
+
+
@@ -2343,7 +2343,7 @@ Apache Tomcat ${version} native binaries
-
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: SPDY support
"Mark Thomas" wrote in message news:4f6f8735.3090...@apache.org... On 25/03/2012 17:24, Costin Manolache wrote: For Tomcat7 I'm proposing to only add hooks: 'beforeHandshake' callback in Handler, and an optional NpnHandler class plus setters in protocol. There is no Java7 or spdy dependency at all. Sounds good to me. The main question is if it's ok to add a build-time dependency on npn-boot, Is this required for 7.0.x or just trunk? I'm assuming just trunk. Since users will still have to download npn-boot.jar ( it contains GPL so probably can't be distributed with tomcat ) - they could also download a jar with those 2 classes and the 2 for jio. That's the second option, if compile-time dep to gpl is not ok. I think that the compile-time dep on GPL needs to be completely optional. I have no issue with using such a dep in the release builds but I image that there are folks downstream who aren't that relaxed. It should be possible to structure this in such a way that Tomcat can still be compiled if the GPL'd JAR is not available. Yes, the company I work for in my day job is one of those that won't be that relaxed. My CTO has a strict no GPL policy (because our clients also don't want GPL). Apache is about releasing code under the AL2, and is why it has been successful. IMHO if this module requires GPL code then it should permanently stay on github as an optional addon module for Tomcat that can be downloaded from there, but not included in the normal Tomcat release which should be a pure AL2 license. The 3rd option is to have the entire spdy package outside tomcat - but keep the hooks ( i.e. 'beforeHandshake', NpnHandler, etc ) - like I'm proposing for tomcat7. That seems excessively complex for the folks that want to use spdy but I have no issue with that approach. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1305182 - in /tomcat/site/trunk/docs/connectors-doc-archive/jk2: ./ common/ common/printer/ images/ jk/ jk/printer/ jk2/ jk2/printer/ printer/
Author: kkolinko Date: Sun Mar 25 23:57:52 2012 New Revision: 1305182 URL: http://svn.apache.org/viewvc?rev=1305182&view=rev Log: Add svn:eol-style=native Remove svn:executable Modified: tomcat/site/trunk/docs/connectors-doc-archive/jk2/common/AJPv13-extensions-proposal.html (props changed) tomcat/site/trunk/docs/connectors-doc-archive/jk2/common/AJPv13.html (props changed) tomcat/site/trunk/docs/connectors-doc-archive/jk2/common/doccontrib.html (props changed) tomcat/site/trunk/docs/connectors-doc-archive/jk2/common/printer/AJPv13-extensions-proposal.html (props changed) tomcat/site/trunk/docs/connectors-doc-archive/jk2/common/printer/AJPv13.html (props changed) tomcat/site/trunk/docs/connectors-doc-archive/jk2/common/printer/doccontrib.html (props changed) tomcat/site/trunk/docs/connectors-doc-archive/jk2/common/printer/tools.html (props changed) tomcat/site/trunk/docs/connectors-doc-archive/jk2/common/tools.html (props changed) tomcat/site/trunk/docs/connectors-doc-archive/jk2/faq.html (props changed) tomcat/site/trunk/docs/connectors-doc-archive/jk2/images/corner.gif (props changed) tomcat/site/trunk/docs/connectors-doc-archive/jk2/images/jakarta.gif (props changed) tomcat/site/trunk/docs/connectors-doc-archive/jk2/images/jk2.gif (props changed) tomcat/site/trunk/docs/connectors-doc-archive/jk2/images/jk2.png (props changed) tomcat/site/trunk/docs/connectors-doc-archive/jk2/images/mod_jk.jpg (props changed) tomcat/site/trunk/docs/connectors-doc-archive/jk2/images/pixel.gif (props changed) tomcat/site/trunk/docs/connectors-doc-archive/jk2/images/tomcat.ico (props changed) tomcat/site/trunk/docs/connectors-doc-archive/jk2/index.html (props changed) tomcat/site/trunk/docs/connectors-doc-archive/jk2/jk/aphowto.html (props changed) tomcat/site/trunk/docs/connectors-doc-archive/jk2/jk/domhowto.html (props changed) tomcat/site/trunk/docs/connectors-doc-archive/jk2/jk/iishowto.html (props changed) tomcat/site/trunk/docs/connectors-doc-archive/jk2/jk/neshowto.html (props changed) tomcat/site/trunk/docs/connectors-doc-archive/jk2/jk/printer/aphowto.html (props changed) tomcat/site/trunk/docs/connectors-doc-archive/jk2/jk/printer/domhowto.html (props changed) tomcat/site/trunk/docs/connectors-doc-archive/jk2/jk/printer/iishowto.html (props changed) tomcat/site/trunk/docs/connectors-doc-archive/jk2/jk/printer/neshowto.html (props changed) tomcat/site/trunk/docs/connectors-doc-archive/jk2/jk/printer/quickhowto.html (props changed) tomcat/site/trunk/docs/connectors-doc-archive/jk2/jk/printer/workershowto.html (props changed) tomcat/site/trunk/docs/connectors-doc-archive/jk2/jk/quickhowto.html (props changed) tomcat/site/trunk/docs/connectors-doc-archive/jk2/jk/workershowto.html (props changed) tomcat/site/trunk/docs/connectors-doc-archive/jk2/jk2/confighowto.html (props changed) tomcat/site/trunk/docs/connectors-doc-archive/jk2/jk2/configtc.html (props changed) tomcat/site/trunk/docs/connectors-doc-archive/jk2/jk2/configtccom.html (props changed) tomcat/site/trunk/docs/connectors-doc-archive/jk2/jk2/configtcex.html (props changed) tomcat/site/trunk/docs/connectors-doc-archive/jk2/jk2/configweb.html (props changed) tomcat/site/trunk/docs/connectors-doc-archive/jk2/jk2/configwebcom.html (props changed) tomcat/site/trunk/docs/connectors-doc-archive/jk2/jk2/configwebex.html (props changed) tomcat/site/trunk/docs/connectors-doc-archive/jk2/jk2/davhowto.html (props changed) tomcat/site/trunk/docs/connectors-doc-archive/jk2/jk2/installhowto.html (props changed) tomcat/site/trunk/docs/connectors-doc-archive/jk2/jk2/printer/confighowto.html (props changed) tomcat/site/trunk/docs/connectors-doc-archive/jk2/jk2/printer/configtc.html (props changed) tomcat/site/trunk/docs/connectors-doc-archive/jk2/jk2/printer/configtccom.html (props changed) tomcat/site/trunk/docs/connectors-doc-archive/jk2/jk2/printer/configtcex.html (props changed) tomcat/site/trunk/docs/connectors-doc-archive/jk2/jk2/printer/configweb.html (props changed) tomcat/site/trunk/docs/connectors-doc-archive/jk2/jk2/printer/configwebcom.html (props changed) tomcat/site/trunk/docs/connectors-doc-archive/jk2/jk2/printer/configwebex.html (props changed) tomcat/site/trunk/docs/connectors-doc-archive/jk2/jk2/printer/davhowto.html (props changed) tomcat/site/trunk/docs/connectors-doc-archive/jk2/jk2/printer/installhowto.html (props changed) tomcat/site/trunk/docs/connectors-doc-archive/jk2/jk2/printer/vhosthowto.html (props changed) tomcat/site/trunk/docs/connectors-doc-archive/jk2/jk2/vhosthowto.html (props changed) tomcat/site/trunk/docs/connectors-doc-archive/jk2/printer/faq.html (props changed) tomcat/sit
svn commit: r1305181 - in /tomcat/site/trunk/docs/tomcat-4.1-doc: catalina/docs/api/package-list jasper/docs/api/package-list servletapi/package-list
Author: kkolinko Date: Sun Mar 25 23:50:52 2012 New Revision: 1305181 URL: http://svn.apache.org/viewvc?rev=1305181&view=rev Log: svn:eol-style=native Modified: tomcat/site/trunk/docs/tomcat-4.1-doc/catalina/docs/api/package-list (contents, props changed) tomcat/site/trunk/docs/tomcat-4.1-doc/jasper/docs/api/package-list (contents, props changed) tomcat/site/trunk/docs/tomcat-4.1-doc/servletapi/package-list (contents, props changed) Modified: tomcat/site/trunk/docs/tomcat-4.1-doc/catalina/docs/api/package-list URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-4.1-doc/catalina/docs/api/package-list?rev=1305181&r1=1305180&r2=1305181&view=diff == --- tomcat/site/trunk/docs/tomcat-4.1-doc/catalina/docs/api/package-list (original) +++ tomcat/site/trunk/docs/tomcat-4.1-doc/catalina/docs/api/package-list Sun Mar 25 23:50:52 2012 @@ -1,26 +1,26 @@ -org.apache.catalina -org.apache.catalina.ant -org.apache.catalina.authenticator -org.apache.catalina.cluster -org.apache.catalina.connector -org.apache.catalina.connector.http -org.apache.catalina.connector.http10 -org.apache.catalina.core -org.apache.catalina.deploy -org.apache.catalina.loader -org.apache.catalina.logger -org.apache.catalina.mbeans -org.apache.catalina.net -org.apache.catalina.realm -org.apache.catalina.servlets -org.apache.catalina.session -org.apache.catalina.ssi -org.apache.catalina.startup -org.apache.catalina.users -org.apache.catalina.util -org.apache.catalina.valves -org.apache.naming -org.apache.naming.factory -org.apache.naming.java -org.apache.naming.resources -org.apache.naming.resources.jndi +org.apache.catalina +org.apache.catalina.ant +org.apache.catalina.authenticator +org.apache.catalina.cluster +org.apache.catalina.connector +org.apache.catalina.connector.http +org.apache.catalina.connector.http10 +org.apache.catalina.core +org.apache.catalina.deploy +org.apache.catalina.loader +org.apache.catalina.logger +org.apache.catalina.mbeans +org.apache.catalina.net +org.apache.catalina.realm +org.apache.catalina.servlets +org.apache.catalina.session +org.apache.catalina.ssi +org.apache.catalina.startup +org.apache.catalina.users +org.apache.catalina.util +org.apache.catalina.valves +org.apache.naming +org.apache.naming.factory +org.apache.naming.java +org.apache.naming.resources +org.apache.naming.resources.jndi Propchange: tomcat/site/trunk/docs/tomcat-4.1-doc/catalina/docs/api/package-list -- svn:eol-style = native Modified: tomcat/site/trunk/docs/tomcat-4.1-doc/jasper/docs/api/package-list URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-4.1-doc/jasper/docs/api/package-list?rev=1305181&r1=1305180&r2=1305181&view=diff == --- tomcat/site/trunk/docs/tomcat-4.1-doc/jasper/docs/api/package-list (original) +++ tomcat/site/trunk/docs/tomcat-4.1-doc/jasper/docs/api/package-list Sun Mar 25 23:50:52 2012 @@ -1,7 +1,7 @@ -org.apache.jasper -org.apache.jasper.compiler -org.apache.jasper.logging -org.apache.jasper.runtime -org.apache.jasper.servlet -org.apache.jasper.util -org.apache.jasper.xmlparser +org.apache.jasper +org.apache.jasper.compiler +org.apache.jasper.logging +org.apache.jasper.runtime +org.apache.jasper.servlet +org.apache.jasper.util +org.apache.jasper.xmlparser Propchange: tomcat/site/trunk/docs/tomcat-4.1-doc/jasper/docs/api/package-list -- svn:eol-style = native Modified: tomcat/site/trunk/docs/tomcat-4.1-doc/servletapi/package-list URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-4.1-doc/servletapi/package-list?rev=1305181&r1=1305180&r2=1305181&view=diff == --- tomcat/site/trunk/docs/tomcat-4.1-doc/servletapi/package-list (original) +++ tomcat/site/trunk/docs/tomcat-4.1-doc/servletapi/package-list Sun Mar 25 23:50:52 2012 @@ -1,4 +1,4 @@ -javax.servlet -javax.servlet.http -javax.servlet.jsp -javax.servlet.jsp.tagext +javax.servlet +javax.servlet.http +javax.servlet.jsp +javax.servlet.jsp.tagext Propchange: tomcat/site/trunk/docs/tomcat-4.1-doc/servletapi/package-list -- 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: r1305180 - in /tomcat/site/trunk/docs/tomcat-4.0-doc: catalina/docs/api/package-list jasper/docs/api/package-list servletapi/package-list
Author: kkolinko Date: Sun Mar 25 23:47:02 2012 New Revision: 1305180 URL: http://svn.apache.org/viewvc?rev=1305180&view=rev Log: svn:eol-style=native Modified: tomcat/site/trunk/docs/tomcat-4.0-doc/catalina/docs/api/package-list (contents, props changed) tomcat/site/trunk/docs/tomcat-4.0-doc/jasper/docs/api/package-list (contents, props changed) tomcat/site/trunk/docs/tomcat-4.0-doc/servletapi/package-list (contents, props changed) Modified: tomcat/site/trunk/docs/tomcat-4.0-doc/catalina/docs/api/package-list URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-4.0-doc/catalina/docs/api/package-list?rev=1305180&r1=1305179&r2=1305180&view=diff == --- tomcat/site/trunk/docs/tomcat-4.0-doc/catalina/docs/api/package-list (original) +++ tomcat/site/trunk/docs/tomcat-4.0-doc/catalina/docs/api/package-list Sun Mar 25 23:47:02 2012 @@ -1,25 +1,25 @@ -org.apache.catalina -org.apache.catalina.authenticator -org.apache.catalina.cluster -org.apache.catalina.connector -org.apache.catalina.connector.http -org.apache.catalina.connector.http10 -org.apache.catalina.connector.warp -org.apache.catalina.core -org.apache.catalina.deploy -org.apache.catalina.loader -org.apache.catalina.logger -org.apache.catalina.net -org.apache.catalina.realm -org.apache.catalina.servlets -org.apache.catalina.session -org.apache.catalina.startup -org.apache.catalina.util -org.apache.catalina.util.ssi -org.apache.catalina.util.xml -org.apache.catalina.valves -org.apache.naming -org.apache.naming.factory -org.apache.naming.java -org.apache.naming.resources -org.apache.naming.resources.jndi +org.apache.catalina +org.apache.catalina.authenticator +org.apache.catalina.cluster +org.apache.catalina.connector +org.apache.catalina.connector.http +org.apache.catalina.connector.http10 +org.apache.catalina.connector.warp +org.apache.catalina.core +org.apache.catalina.deploy +org.apache.catalina.loader +org.apache.catalina.logger +org.apache.catalina.net +org.apache.catalina.realm +org.apache.catalina.servlets +org.apache.catalina.session +org.apache.catalina.startup +org.apache.catalina.util +org.apache.catalina.util.ssi +org.apache.catalina.util.xml +org.apache.catalina.valves +org.apache.naming +org.apache.naming.factory +org.apache.naming.java +org.apache.naming.resources +org.apache.naming.resources.jndi Propchange: tomcat/site/trunk/docs/tomcat-4.0-doc/catalina/docs/api/package-list -- svn:eol-style = native Modified: tomcat/site/trunk/docs/tomcat-4.0-doc/jasper/docs/api/package-list URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-4.0-doc/jasper/docs/api/package-list?rev=1305180&r1=1305179&r2=1305180&view=diff == --- tomcat/site/trunk/docs/tomcat-4.0-doc/jasper/docs/api/package-list (original) +++ tomcat/site/trunk/docs/tomcat-4.0-doc/jasper/docs/api/package-list Sun Mar 25 23:47:02 2012 @@ -1,8 +1,8 @@ -org.apache.jasper -org.apache.jasper.compiler -org.apache.jasper.core -org.apache.jasper.logging -org.apache.jasper.parser -org.apache.jasper.runtime -org.apache.jasper.servlet -org.apache.jasper.util +org.apache.jasper +org.apache.jasper.compiler +org.apache.jasper.core +org.apache.jasper.logging +org.apache.jasper.parser +org.apache.jasper.runtime +org.apache.jasper.servlet +org.apache.jasper.util Propchange: tomcat/site/trunk/docs/tomcat-4.0-doc/jasper/docs/api/package-list -- svn:eol-style = native Modified: tomcat/site/trunk/docs/tomcat-4.0-doc/servletapi/package-list URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-4.0-doc/servletapi/package-list?rev=1305180&r1=1305179&r2=1305180&view=diff == --- tomcat/site/trunk/docs/tomcat-4.0-doc/servletapi/package-list (original) +++ tomcat/site/trunk/docs/tomcat-4.0-doc/servletapi/package-list Sun Mar 25 23:47:02 2012 @@ -1,4 +1,4 @@ -javax.servlet -javax.servlet.http -javax.servlet.jsp -javax.servlet.jsp.tagext +javax.servlet +javax.servlet.http +javax.servlet.jsp +javax.servlet.jsp.tagext Propchange: tomcat/site/trunk/docs/tomcat-4.0-doc/servletapi/package-list -- 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: r1305178 - in /tomcat/site/trunk/docs/tomcat-3.3-doc: faq readme-3.3.1 readme-3.3.2
Author: kkolinko Date: Sun Mar 25 23:42:02 2012 New Revision: 1305178 URL: http://svn.apache.org/viewvc?rev=1305178&view=rev Log: svn:eol-style=native Modified: tomcat/site/trunk/docs/tomcat-3.3-doc/faq (props changed) tomcat/site/trunk/docs/tomcat-3.3-doc/readme-3.3.1 (props changed) tomcat/site/trunk/docs/tomcat-3.3-doc/readme-3.3.2 (props changed) Propchange: tomcat/site/trunk/docs/tomcat-3.3-doc/faq -- svn:eol-style = native Propchange: tomcat/site/trunk/docs/tomcat-3.3-doc/readme-3.3.1 -- svn:eol-style = native Propchange: tomcat/site/trunk/docs/tomcat-3.3-doc/readme-3.3.2 -- 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: r1305176 - in /tomcat/site/trunk/docs/tomcat-3.2-doc: JDBCRealm.howto faq
Author: kkolinko Date: Sun Mar 25 23:40:25 2012 New Revision: 1305176 URL: http://svn.apache.org/viewvc?rev=1305176&view=rev Log: svn:eol-style=native Modified: tomcat/site/trunk/docs/tomcat-3.2-doc/JDBCRealm.howto (props changed) tomcat/site/trunk/docs/tomcat-3.2-doc/faq (props changed) Propchange: tomcat/site/trunk/docs/tomcat-3.2-doc/JDBCRealm.howto -- svn:eol-style = native Propchange: tomcat/site/trunk/docs/tomcat-3.2-doc/faq -- 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: r1305175 - in /tomcat/site/trunk/docs: tomcat-4.1-doc/ tomcat-4.1-docs/
Author: kkolinko Date: Sun Mar 25 23:34:41 2012 New Revision: 1305175 URL: http://svn.apache.org/viewvc?rev=1305175&view=rev Log: Correct typo in the directory name. s/*-docs/*-doc/ The same as in r1305174 Added: tomcat/site/trunk/docs/tomcat-4.1-doc/ - copied from r1305174, tomcat/site/trunk/docs/tomcat-4.1-docs/ Removed: tomcat/site/trunk/docs/tomcat-4.1-docs/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1305174 - in /tomcat/site/trunk/docs: tomcat-4.0-doc/ tomcat-4.0-docs/
Author: kkolinko Date: Sun Mar 25 23:33:55 2012 New Revision: 1305174 URL: http://svn.apache.org/viewvc?rev=1305174&view=rev Log: Correct typo in the directory name. s/*-docs/*-doc/ If you google for "Tomcat 4.0 documentation" you will see that the name is "*-doc". Added: tomcat/site/trunk/docs/tomcat-4.0-doc/ - copied from r1305173, tomcat/site/trunk/docs/tomcat-4.0-docs/ Removed: tomcat/site/trunk/docs/tomcat-4.0-docs/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
tomcat connector - jk_status does not update shm correctly
Hi
I am facing problem in using jkstatus to update subworker lb_factor,
it seems that after changing it, the mod_jk balancer does not change
anything
Looking at source code in trunk, I think that there is bug , I
include herewith the 2 changes that I think will fix the problem,
1) I move update_mult() a head of  jk_lb_push() in update_worker() so
the lb_mult of sub worker can be persisted to shm
2) I reverse the condition using to guard of update shm of subworkder
in jk_lb_push()
Can someone review it ? to be honest I am not very familiar with the code base.
Index: native/common/jk_status.c
===
--- native/common/jk_status.c  (revision 1305015)
+++ native/common/jk_status.c  (working copy)
@@ -4161,6 +4161,9 @@
        if (rv & JK_STATUS_NEEDS_ADDR_PUSH) {
          aw->addr_sequence++;
        }
+ Â Â Â Â Â Â Â Â if (rv & JK_STATUS_NEEDS_UPDATE_MULT)
+ Â Â Â Â Â Â Â Â Â Â /* Recalculate the load multiplicators wrt. lb_factor */
+ Â Â Â Â Â Â Â Â Â Â update_mult(lb, l);
        if (rv & (JK_STATUS_NEEDS_PUSH | JK_STATUS_NEEDS_ADDR_PUSH)) {
          wr->sequence++;
          lb->sequence++;
@@ -4168,9 +4171,6 @@
        }
        if (rv & JK_STATUS_NEEDS_RESET_LB_VALUES)
          reset_lb_values(lb, l);
- Â Â Â Â Â Â Â Â if (rv & JK_STATUS_NEEDS_UPDATE_MULT)
- Â Â Â Â Â Â Â Â Â Â /* Recalculate the load multiplicators wrt. lb_factor */
- Â Â Â Â Â Â Â Â Â Â update_mult(lb, l);
        if (rc == JK_FALSE) {
          jk_log(l, JK_LOG_ERROR,
              "Status worker '%s' failed updating sub
worker '%s' (at least partially).%s",
Index: native/common/jk_lb_worker.c
===
--- native/common/jk_lb_worker.c     (revision 1305015)
+++ native/common/jk_lb_worker.c     (working copy)
@@ -370,7 +370,7 @@
  for (i = 0; i < p->num_of_workers; i++) {
    lb_sub_worker_t *w = &p->lb_workers[i];
- Â Â Â Â if (w->sequence < w->s->h.sequence) {
+ Â Â Â Â if (w->sequence > w->s->h.sequence) {
      jk_worker_t *jw = w->worker;
      ajp_worker_t *aw = (ajp_worker_t *)jw->worker_private;
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: SPDY support
On 25/03/2012 17:24, Costin Manolache wrote: > For Tomcat7 I'm proposing to only add hooks: 'beforeHandshake' callback in > Handler, and an optional NpnHandler class plus setters in protocol. > There is no Java7 or spdy dependency at all. Sounds good to me. > The main question is if it's ok to add a build-time dependency on npn-boot, Is this required for 7.0.x or just trunk? I'm assuming just trunk. > Since users will still have to download npn-boot.jar ( it contains GPL so > probably can't be distributed with tomcat ) - they could also download a > jar with those 2 classes and the 2 for jio. That's the second option, if > compile-time dep to gpl is not ok. I think that the compile-time dep on GPL needs to be completely optional. I have no issue with using such a dep in the release builds but I image that there are folks downstream who aren't that relaxed. It should be possible to structure this in such a way that Tomcat can still be compiled if the GPL'd JAR is not available. > The 3rd option is to have the entire spdy package outside tomcat - but keep > the hooks ( i.e. 'beforeHandshake', NpnHandler, etc ) - like I'm proposing > for tomcat7. That seems excessively complex for the folks that want to use spdy but I have no issue with that approach. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1305124 [17/17] - in /tomcat/site/trunk/docs/connectors-doc-archive: ./ jk2/ jk2/common/ jk2/common/printer/ jk2/images/ jk2/jk/ jk2/jk/printer/ jk2/jk2/ jk2/jk2/printer/ jk2/printer/
Added: tomcat/site/trunk/docs/connectors-doc-archive/jk2/printer/index.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/connectors-doc-archive/jk2/printer/index.html?rev=1305124&view=auto == --- tomcat/site/trunk/docs/connectors-doc-archive/jk2/printer/index.html (added) +++ tomcat/site/trunk/docs/connectors-doc-archive/jk2/printer/index.html Sun Mar 25 20:49:51 2012 @@ -0,0 +1,291 @@ +http://www.w3.org/TR/html4/strict.dtd";> +http://www.w3.org/TR/xhtml1/strict";> + +Overview + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +http://www.apache.org/"; class="head">Apache Software Foundation | +http://jakarta.apache.org/"; class="head">Jakarta Project | +http://jakarta.apache.org/tomcat/"; class="head">Apache Tomcat + + + + + + + + +Overview + + + + + + + + + + +What's JK? + + + + + +JK + is a replacement to the elderly mod_jserv. +It was a completely new Tomcat-Apache plug-in that handles the communication between Tomcat and Apache. + + +The newest +JK2 + is a refactoring of +JK +. +The native part has been completly +restructured and the configuration has been simplified a lot. + + +JK is more than just an apache module, since it could be used with majors WebServer : + + + + +mod_jk + is an Apache module to be used with +Apache 1.3 + and +2.0 + Webservers. + + + +isapi + is a redirector to be used with +IIS +. + + + +nsapi + is a redirector to be used with +Netscape/iPlanet +. + + + +dsapi + is a redirector to to be used with +Domino +. + + + + + + + +Why should I use the JK? + + + + +JK was develop to overcome many limitations of its ancestor, +mod_jserv +. + + + +mod_jserv + was too complex and because it was ported from Apache/JServ, +it brought with it lots of JServ specific bits that aren't needed by Apache. + + +Where +mod_jserv + supported only Apache webservers on Unix OS, + +JK + supports much more web servers and operating systems through +via a compatibility layer named the +JK library +. +The layered approach provided by the JK library makes it easier to +support many different webservers and OS. + + +JK offer better support for SSL, that's was a problem with mod_jserv which couldn't +reliably identify whether a request was made via HTTP or HTTPS. + + +JK can, using the newer Ajpv13 protocol which relay many SSL informations required by servlet 2.2 and 2.3 specs. + + +JK offers a lot of different and flexible communications between a Web Server +and the Tomcat Servlet Engine and could be used today with all of the ASF Tomcat Engines, + +3.2.x +, +3.3.x +, +4.0.x +, +4.1.x + and +5.x + + + + + + + +What's the difference between JK and JK2? + + + + +JK2 is a refactoring of JK and is much more powerfull. + + +Even if it works with Apache 1.3, JK2 has been developed with Apache 2.0 in mind, +and is better suited for multi-threaded servers like IIS, NES/iPlanet. It can also +be embeded in other applications and used from java. + + +JK2 improves the modularity and has a better separation between protocol and physical layer. +As such JK2 support fast unix-socket, and could be extended to support others communications +channels. It is better suited for JNI and may use (in a future version) JDK 1.4 NIO. + + +There is additional support for monitoring, similar with JMX in java. A module similar +with mod_status is provided, and additional adapters can be used to interface and +provide status and runtime configuration. . + + +The configuration has been changed to follow the component models. Multiple configuration +sources can be supported ( in additon to file ) providing better integration with +the embeding application. The config layer uses the management layer APIs and it can +support persistence for changes done via runtime configuration. + + +Another feature is the JNI mode. Jk2 can be used as a JNI library and provide access to +native features to java. For example it provides access to shared memory ( used for +config and monitoring in a multiprocess environment ), unix domain sockets. It can +also provide access to signals, chuid, win registry. All using the same communication +mechansim, and supporting both in-process and out-of process modes. + + + + + + +Are there alternative ways to connect Apache and Tomcat? + + + + + +Tomcat's AJP stack and httpd-2.1 AJP proxy + that is an addition to the mod_proxy of http. It is developped in httpd-2.1 and integrated in it. +(See +AJP proxy +). + + + +Tomcat's internal HTTP stack and mod_proxy + which is not that bad, but slow, +well, of course Tomcat didn't have 10/11 years of C routine optimization like +the Apache Web Server, but it's quite good. The only disadvantage is that it +looks pretty ridiculous to parse an HTTP request to generate it again +(exactly the same), and to parse again the response to send it back unchanged... + + + +http://jakarta.ap
svn commit: r1305124 [1/17] - in /tomcat/site/trunk/docs/connectors-doc-archive: ./ jk2/ jk2/common/ jk2/common/printer/ jk2/images/ jk2/jk/ jk2/jk/printer/ jk2/jk2/ jk2/jk2/printer/ jk2/printer/
Author: markt Date: Sun Mar 25 20:49:51 2012 New Revision: 1305124 URL: http://svn.apache.org/viewvc?rev=1305124&view=rev Log: Add the archive of the jk2 docs Added: tomcat/site/trunk/docs/connectors-doc-archive/ tomcat/site/trunk/docs/connectors-doc-archive/jk2/ tomcat/site/trunk/docs/connectors-doc-archive/jk2/common/ tomcat/site/trunk/docs/connectors-doc-archive/jk2/common/AJPv13-extensions-proposal.html (with props) tomcat/site/trunk/docs/connectors-doc-archive/jk2/common/AJPv13.html (with props) tomcat/site/trunk/docs/connectors-doc-archive/jk2/common/doccontrib.html (with props) tomcat/site/trunk/docs/connectors-doc-archive/jk2/common/printer/ tomcat/site/trunk/docs/connectors-doc-archive/jk2/common/printer/AJPv13-extensions-proposal.html (with props) tomcat/site/trunk/docs/connectors-doc-archive/jk2/common/printer/AJPv13.html (with props) tomcat/site/trunk/docs/connectors-doc-archive/jk2/common/printer/doccontrib.html (with props) tomcat/site/trunk/docs/connectors-doc-archive/jk2/common/printer/tools.html (with props) tomcat/site/trunk/docs/connectors-doc-archive/jk2/common/tools.html (with props) tomcat/site/trunk/docs/connectors-doc-archive/jk2/faq.html (with props) tomcat/site/trunk/docs/connectors-doc-archive/jk2/images/ tomcat/site/trunk/docs/connectors-doc-archive/jk2/images/corner.gif (with props) tomcat/site/trunk/docs/connectors-doc-archive/jk2/images/jakarta.gif (with props) tomcat/site/trunk/docs/connectors-doc-archive/jk2/images/jk2.gif (with props) tomcat/site/trunk/docs/connectors-doc-archive/jk2/images/jk2.png (with props) tomcat/site/trunk/docs/connectors-doc-archive/jk2/images/mod_jk.jpg (with props) tomcat/site/trunk/docs/connectors-doc-archive/jk2/images/pixel.gif (with props) tomcat/site/trunk/docs/connectors-doc-archive/jk2/images/tomcat.ico (with props) tomcat/site/trunk/docs/connectors-doc-archive/jk2/index.html (with props) tomcat/site/trunk/docs/connectors-doc-archive/jk2/jk/ tomcat/site/trunk/docs/connectors-doc-archive/jk2/jk/aphowto.html (with props) tomcat/site/trunk/docs/connectors-doc-archive/jk2/jk/domhowto.html (with props) tomcat/site/trunk/docs/connectors-doc-archive/jk2/jk/iishowto.html (with props) tomcat/site/trunk/docs/connectors-doc-archive/jk2/jk/neshowto.html (with props) tomcat/site/trunk/docs/connectors-doc-archive/jk2/jk/printer/ tomcat/site/trunk/docs/connectors-doc-archive/jk2/jk/printer/aphowto.html (with props) tomcat/site/trunk/docs/connectors-doc-archive/jk2/jk/printer/domhowto.html (with props) tomcat/site/trunk/docs/connectors-doc-archive/jk2/jk/printer/iishowto.html (with props) tomcat/site/trunk/docs/connectors-doc-archive/jk2/jk/printer/neshowto.html (with props) tomcat/site/trunk/docs/connectors-doc-archive/jk2/jk/printer/quickhowto.html (with props) tomcat/site/trunk/docs/connectors-doc-archive/jk2/jk/printer/workershowto.html (with props) tomcat/site/trunk/docs/connectors-doc-archive/jk2/jk/quickhowto.html (with props) tomcat/site/trunk/docs/connectors-doc-archive/jk2/jk/workershowto.html (with props) tomcat/site/trunk/docs/connectors-doc-archive/jk2/jk2/ tomcat/site/trunk/docs/connectors-doc-archive/jk2/jk2/confighowto.html (with props) tomcat/site/trunk/docs/connectors-doc-archive/jk2/jk2/configtc.html (with props) tomcat/site/trunk/docs/connectors-doc-archive/jk2/jk2/configtccom.html (with props) tomcat/site/trunk/docs/connectors-doc-archive/jk2/jk2/configtcex.html (with props) tomcat/site/trunk/docs/connectors-doc-archive/jk2/jk2/configweb.html (with props) tomcat/site/trunk/docs/connectors-doc-archive/jk2/jk2/configwebcom.html (with props) tomcat/site/trunk/docs/connectors-doc-archive/jk2/jk2/configwebex.html (with props) tomcat/site/trunk/docs/connectors-doc-archive/jk2/jk2/davhowto.html (with props) tomcat/site/trunk/docs/connectors-doc-archive/jk2/jk2/installhowto.html (with props) tomcat/site/trunk/docs/connectors-doc-archive/jk2/jk2/printer/ tomcat/site/trunk/docs/connectors-doc-archive/jk2/jk2/printer/confighowto.html (with props) tomcat/site/trunk/docs/connectors-doc-archive/jk2/jk2/printer/configtc.html (with props) tomcat/site/trunk/docs/connectors-doc-archive/jk2/jk2/printer/configtccom.html (with props) tomcat/site/trunk/docs/connectors-doc-archive/jk2/jk2/printer/configtcex.html (with props) tomcat/site/trunk/docs/connectors-doc-archive/jk2/jk2/printer/configweb.html (with props) tomcat/site/trunk/docs/connectors-doc-archive/jk2/jk2/printer/configwebcom.html (with props) tomcat/site/trunk/docs/connectors-doc-archive/jk2/jk2/printer/configwebex.html (with props) tomcat/site/trunk/docs/connectors-doc-archive/jk2/jk2/printer/davhowto.html (with props) tomcat/s
svn commit: r1305122 - in /tomcat/site/trunk/docs/tomcat-4.1-docs: ./ WEB-INF/ appdev/ appdev/printer/ appdev/sample/ appdev/sample/docs/ appdev/sample/src/ appdev/sample/src/mypackage/ appdev/sample/
Author: markt Date: Sun Mar 25 20:44:14 2012 New Revision: 1305122 URL: http://svn.apache.org/viewvc?rev=1305122&view=rev Log: Add the Tomcat 4.1 docs [This commit notification would consist of 243 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.] - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1305123 - /tomcat/site/trunk/docs/tomcat-4.1-docs/WEB-INF/
Author: markt Date: Sun Mar 25 20:45:31 2012 New Revision: 1305123 URL: http://svn.apache.org/viewvc?rev=1305123&view=rev Log: Remove WEB-INF dir. It isn't required for the static docs. Removed: tomcat/site/trunk/docs/tomcat-4.1-docs/WEB-INF/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1305118 - in /tomcat/site/trunk/docs/tomcat-4.0-docs: ./ WEB-INF/ appdev/ appdev/sample/ appdev/sample/docs/ appdev/sample/src/ appdev/sample/src/mypackage/ appdev/sample/web/ appdev/
On 25/03/2012 21:30, ma...@apache.org wrote: > Author: markt > Date: Sun Mar 25 20:30:06 2012 > New Revision: 1305118 > > URL: http://svn.apache.org/viewvc?rev=1305118&view=rev > Log: > Add the Tomcat 4.0 docs > > > [This commit notification would consist of 180 parts, > which exceeds the limit of 50 ones, so it was shortened to the summary.] Nice. That avoids the commit deluge. 4.1 docs on the way and then I'll probably call it quits for today. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1305118 - in /tomcat/site/trunk/docs/tomcat-4.0-docs: ./ WEB-INF/ appdev/ appdev/sample/ appdev/sample/docs/ appdev/sample/src/ appdev/sample/src/mypackage/ appdev/sample/web/ appdev/samp
Author: markt Date: Sun Mar 25 20:30:06 2012 New Revision: 1305118 URL: http://svn.apache.org/viewvc?rev=1305118&view=rev Log: Add the Tomcat 4.0 docs [This commit notification would consist of 180 parts, which exceeds the limit of 50 ones, so it was shortened to the summary.] - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1305119 - /tomcat/site/trunk/docs/tomcat-4.0-docs/WEB-INF/
Author: markt Date: Sun Mar 25 20:31:22 2012 New Revision: 1305119 URL: http://svn.apache.org/viewvc?rev=1305119&view=rev Log: Remove WEB-INF dir. It isn;t required for the static docs. Removed: tomcat/site/trunk/docs/tomcat-4.0-docs/WEB-INF/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Move to svnpubsub Was: svn commit: r1305109 [1/6] - ...
On 25/03/2012 21:24, Konstantin Kolinko wrote: > 2012/3/26 Mark Thomas : >> On 25/03/2012 20:52, ma...@apache.org wrote: >>> Author: markt >>> Date: Sun Mar 25 19:52:05 2012 >>> New Revision: 1305109 >>> >>> URL: http://svn.apache.org/viewvc?rev=1305109&view=rev >>> Log: >>> Add Tomcat 3.2 docs >> >> This is the start of the process to move the Tomcat web site to >> svnpubsub as mandated by the ASF infra team. >> >> Note that we could also move the site partially or fully to the CMS but >> that is a bigger step and probably one we want to consider alongside the >> discussions we have had around updating the overall style of the docs >> and site. >> >> The first few steps will be to add files for the docs for the latest >> versions of those components that are no longer supported. >> >> After that, I'll be checking in an updated build script that will allow >> us to update the 5.5, 6.0 & 7.0 with minimal effort after a release. >> >> Then all add support for updating the native and jk docs. >> >> Finally, taglibs and the Maven plug-in will need to ensure that their >> sites are svnpubsub compatible. >> >> The short version is that once the entire site is in svn, we can switch >> to svnpubsub. >> >> The big advantage this will give us is the ability to make changes to >> the site that appear on the live site in seconds rather than an hour or so. >> > > A note: using sparse checkout feature of svn is handy when dealing > with the site. > E.g. if you are in site/trunk then > > svn up --set-depth empty docs/tomcat-3.2-doc > > will pull in recently added "tomcat-3.2-doc" subdirectory as empty > one (instead of pulling the whole subtree as the usual "svn up" will > do) > > The other subdirectories will be (looking at p.a.o): > > svn up --set-depth empty docs/tomcat-3.3-doc > svn up --set-depth empty docs/tomcat-4.0-doc > svn up --set-depth empty docs/tomcat-4.1-doc > > > What about 5.5, 6.0, 7.0? > > If people use svn 1.7 clients then I think it would be easier to > commit them under their final names "tomcat-5.5-doc", > "tomcat-6.0-doc", "tomcat-7.0-doc", instead of the current symlink > schema of "5.5 -> 5.5.35". Agreed. That is what I am planning to do. > With svn 1.7 there are no ".svn" subdirectories inside the tree, so > is is possible to rm the files from hard drive and replace them with > new ones in place before committing. (Some care will be needed for "! > missing" and "? new" ones). That is what my modifications to the build script do but you are right that they depend on the user to svn add / delete as required. > Regarding imported 3.2 docs: > Some of them have unusual filenames (*.howto, faq) and thus did not > have svn:eol-style applied. I'll look at it ~tomorrow when Mark > finishes the import. Thanks. Mark PS apologies for the svn commit deluge that is heading to the dev list. The later the version, the bigger the docs. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Move to svnpubsub Was: svn commit: r1305109 [1/6] - ...
2012/3/26 Mark Thomas : > On 25/03/2012 20:52, ma...@apache.org wrote: >> Author: markt >> Date: Sun Mar 25 19:52:05 2012 >> New Revision: 1305109 >> >> URL: http://svn.apache.org/viewvc?rev=1305109&view=rev >> Log: >> Add Tomcat 3.2 docs > > This is the start of the process to move the Tomcat web site to > svnpubsub as mandated by the ASF infra team. > > Note that we could also move the site partially or fully to the CMS but > that is a bigger step and probably one we want to consider alongside the > discussions we have had around updating the overall style of the docs > and site. > > The first few steps will be to add files for the docs for the latest > versions of those components that are no longer supported. > > After that, I'll be checking in an updated build script that will allow > us to update the 5.5, 6.0 & 7.0 with minimal effort after a release. > > Then all add support for updating the native and jk docs. > > Finally, taglibs and the Maven plug-in will need to ensure that their > sites are svnpubsub compatible. > > The short version is that once the entire site is in svn, we can switch > to svnpubsub. > > The big advantage this will give us is the ability to make changes to > the site that appear on the live site in seconds rather than an hour or so. > A note: using sparse checkout feature of svn is handy when dealing with the site. E.g. if you are in site/trunk then svn up --set-depth empty docs/tomcat-3.2-doc will pull in recently added "tomcat-3.2-doc" subdirectory as empty one (instead of pulling the whole subtree as the usual "svn up" will do) The other subdirectories will be (looking at p.a.o): svn up --set-depth empty docs/tomcat-3.3-doc svn up --set-depth empty docs/tomcat-4.0-doc svn up --set-depth empty docs/tomcat-4.1-doc What about 5.5, 6.0, 7.0? If people use svn 1.7 clients then I think it would be easier to commit them under their final names "tomcat-5.5-doc", "tomcat-6.0-doc", "tomcat-7.0-doc", instead of the current symlink schema of "5.5 -> 5.5.35". With svn 1.7 there are no ".svn" subdirectories inside the tree, so is is possible to rm the files from hard drive and replace them with new ones in place before committing. (Some care will be needed for "! missing" and "? new" ones). Regarding imported 3.2 docs: Some of them have unusual filenames (*.howto, faq) and thus did not have svn:eol-style applied. I'll look at it ~tomorrow when Mark finishes the import. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Move to svnpubsub Was: svn commit: r1305109 [1/6] - ...
On 25/03/2012 20:52, ma...@apache.org wrote: > Author: markt > Date: Sun Mar 25 19:52:05 2012 > New Revision: 1305109 > > URL: http://svn.apache.org/viewvc?rev=1305109&view=rev > Log: > Add Tomcat 3.2 docs This is the start of the process to move the Tomcat web site to svnpubsub as mandated by the ASF infra team. Note that we could also move the site partially or fully to the CMS but that is a bigger step and probably one we want to consider alongside the discussions we have had around updating the overall style of the docs and site. The first few steps will be to add files for the docs for the latest versions of those components that are no longer supported. After that, I'll be checking in an updated build script that will allow us to update the 5.5, 6.0 & 7.0 with minimal effort after a release. Then all add support for updating the native and jk docs. Finally, taglibs and the Maven plug-in will need to ensure that their sites are svnpubsub compatible. The short version is that once the entire site is in svn, we can switch to svnpubsub. The big advantage this will give us is the ability to make changes to the site that appear on the live site in seconds rather than an hour or so. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1305110 [10/10] - in /tomcat/site/trunk/docs/tomcat-3.3-doc: ./ appdev/ appdev/sample/ appdev/sample/etc/ appdev/sample/lib/ appdev/sample/src/ appdev/sample/web/ appdev/sample/web/images
Propchange: tomcat/site/trunk/docs/tomcat-3.3-doc/tomcat-ug.html -- 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: r1305110 [8/10] - in /tomcat/site/trunk/docs/tomcat-3.3-doc: ./ appdev/ appdev/sample/ appdev/sample/etc/ appdev/sample/lib/ appdev/sample/src/ appdev/sample/web/ appdev/sample/web/images/
Added: tomcat/site/trunk/docs/tomcat-3.3-doc/tomcat-security.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-3.3-doc/tomcat-security.html?rev=1305110&view=auto == --- tomcat/site/trunk/docs/tomcat-3.3-doc/tomcat-security.html (added) +++ tomcat/site/trunk/docs/tomcat-3.3-doc/tomcat-security.html Sun Mar 25 19:52:59 2012 @@ -0,0 +1,260 @@ + + + + + + + + + + +Using the Java SecurityManager with Tomcat + + + +Why use a SecurityManager? + + +System Requirements + + +Precautions + + +Types of Permissions + + +Configuring Tomcat for use with a SecurityManager + + +Starting Tomcat with a SecurityManager + + +What happens when the SecurityManager detects a Security +violation? + + +Trouble shooting tomcat.policy configuration and Security +Violations + + + +Why use a SecurityManager? +The Java SecurityManager is what allows a web browser to run an applet +in its own sandbox to prevent untrusted code from accessing files on the +local system, connecting to a host other than the one the applet was loaded +from, etc. +In the same way the SecurityManager protects you from an untrusted applet +running in your browser, use of a SecurityManager while running Tomcat +can protect your server from trojan servlets, JSP's, JSP beans, and tag +libraries. Or even inadvertent mistakes. +Imagine if someone who is authorized to publish JSP's on your site inadvertently +included the following in their JSP: + +<% System.exit(1); %> + + +Every time that JSP was executed by Tomcat, Tomcat would exit. +Using the Java SecurityManager is just one more line of defense a system +administrator can use to keep the server secure and reliable. + +System Requirements +Use of the SecurityManager requires a JVM that supports JDK 1.2. + + +Precautions +Implementation of a SecurityManager in Tomcat has not been fully tested +to ensure the security of Tomcat. No special Permissions have been +created to prevent access to internal Tomcat classes by JSP's, web applications, +servlets, beans, or tag libraries. Make sure that you are satisfied with +your SecurityManager configuration before allowing untrusted users to publish +web applications, JSP's, servlets, beans, or tag libraries. +Still, running with a SecurityManager is definitely better than running +without one. + + +Types of Permissions +Permission classes are used to define what Permissions a class loaded by +Tomcat will have. There are a number of Permission classes as part +of the JDK and you can even create your own Permission class for use in +your own web applications. +This is just a short summary of the System SecurityManager Permission +classes applicable to Tomcat. Please refer to the JDK documentation +for more information on using the below Permissions. +java.util.PropertyPermission +   Controls read/write access to JVM properties such +as java.home. +java.lang.RuntimePermission +   Controls use of some System/Runtime functions like +exit() and exec(). +java.io.FilePermission +   Controls read/write/execute access to files and +directories. +java.net.SocketPermission +   Controls use of network sockets. +java.net.NetPermission +   Controls use of multicast network connections. +java.lang.reflect.ReflectPermission +   Controls use of reflection to do class introspection. +java.security.SecurityPermission +   Controls access to Security methods. +java.security.AllPermission +   Allows access to all permissions, just as if you +were running Tomcat without a SecurityManager. + + +Configuring Tomcat for use with a SecurityManager +tomcat.policy +The security policies implemented by the Java SecurityManager are configured +in the tomcat.policy file located in the tomcat conf directory. +The tomcat.policy file replaces any system java.policy file. The +tomcat.policy file can be edited by hand or you can use the policytool +application +that comes with Java 1.2, or later. +Entries in the tomcat.policy file use the standard java.policy file +format as follows: +// Example policy file entry + +grant [signedBy[,codeBase ] { +   permission[ [, ]]; +}; + +The signedBy and codeBase entries are optional when granting permissions. +Comment lines begin with // and end at a new line. +The codeBase is in the form of a URL and for a file URL can use the +${java.home} and ${tomcat.home} properties which are expanded out to the +directory paths defined for them. +Default tomcat.policy file +// Permissions for tomcat. + +// javac needs this +grant codeBase "file:${java.home}/lib/-" { + permission java.security.AllPermission; +}; + +// Tomcat gets all permissions +grant codeBase "file:${tomcat.home}/lib/-" { + permission java.security.AllPermission; +}; + +grant codeBase "file:${tomcat.home}/classes/-" { + permission java.security.AllPermission; +}; + +// Example webapp policy +// By default we grant read access on webapp dir
svn commit: r1305110 [5/10] - in /tomcat/site/trunk/docs/tomcat-3.3-doc: ./ appdev/ appdev/sample/ appdev/sample/etc/ appdev/sample/lib/ appdev/sample/src/ appdev/sample/web/ appdev/sample/web/images/
Added: tomcat/site/trunk/docs/tomcat-3.3-doc/readme-3.3.2
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-3.3-doc/readme-3.3.2?rev=1305110&view=auto
==
--- tomcat/site/trunk/docs/tomcat-3.3-doc/readme-3.3.2 (added)
+++ tomcat/site/trunk/docs/tomcat-3.3-doc/readme-3.3.2 Sun Mar 25 19:52:59 2012
@@ -0,0 +1,113 @@
+ Apache Tomcat 3.3.2
+ ===
+ Release Notes
+ =
+
+$Id: readme-3.3.2,v 1.1 2004/03/01 00:32:18 billbarker Exp $
+
+
+This document describes the changes that have been made since the
+release of Tomcat 3.3.1 Final.
+
+=
+Bug Fixes
+=
+
+The release in which the fix appears is indicated in brackets.
+
+Feature Additions:
+
+Bug No. Description
+
+8099 Preserve the query string when redirecting to the welcome page.
+
+ Removed '.sh' extension from Unix shell scripts.
+
+(Re-) Open the log files with "append", so that log rotation can
+be configured to be other than daily.
+
+ Package an Ant compiler adapter that compiles JSPs with the correct
+ naming convention and an Ant task which creates .ver files. These
+ tasks allow the Tomcat work directory to be pre-populated with
+ compiled JSPs.
+
+13285 Added improvements to the admin web-app to include support for vhosts.
+
+Server:
+
+Bug No. Description
+
+ Bug fixed in SimpleSessionStore in session attribute reloading during
+ context reloads.
+
+7770Fixed thread race problem in accessing the Hooks.
+
+8092Fixed JSP source exposure proplem.
+
+9165Fix auto-detection of tomcat.install for certain 1.1.x JDKs.
+
+7654Make certain that the Context Classloader is set before a servlet
+class is loaded. This allows JAXP and log4j classes to be created
+in the constructor of the servlet, instead of in init.
+
+Fix problem with multiple Context adds on Context reload under
+high traffic.
+
+Preserve sessions across session reloadings.
+
+Fix Cookie case name problem under Windows for Session Cookie.
+
+Fix problems with URL normalization when the URL attempts to access
+a file above the ROOT.
+
+Prevent session sharing when switching from HTTPS to HTTP. This
+removes a way to hijack sensitive sessions. The old behavior can
+be restored by setting the secureCookie="false" attribute on the
+SessionId element in server.xml.
+
+Fix the handling of response.encodeURL("") to conform to the w3 spec.
+
+15894 Fix race condition on reusing Sessions.
+
+ Updated DecodeInterceptor to treat URL paths containing null
+ characters as unsafe.
+
+Fix problem where the AccessLog was printing the content-length of the
+Request instead of the Response.
+
+24123Fix problem where the AccessLog wasn't logging request that produce
+ no output. Also log the Request's content length for PUT requests.
+
+ Partially update to use commons-logging.
+
+Jasper:
+
+Bug No. Description
+
+11463 Fix PageContext.removeAttribute(String) to work for a page with
+session=false.
+
+13378 Fix dependency on GenericServlet in the generated .java file.
+
+23101Fix case dependency problem on Windows platforms.
+
+ Fix high byte chars (xlate to unicode)
+
+ Fix a problem when a jsp include another jsp with relative path.
+
+Configuration:
+
+Bug No. Description
+8634 Allow alternative location for modules.xml
+
+
+Connectors:
+
+Bug No. Description
+
+
+
+Documentation:
+
+Bug No. Description
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1305109 [5/6] - in /tomcat/site/trunk/docs/tomcat-3.2-doc: ./ appdev/ appdev/sample/ appdev/sample/etc/ appdev/sample/src/ appdev/sample/web/ appdev/sample/web/images/ uguide/ uguide/imag
Added: tomcat/site/trunk/docs/tomcat-3.2-doc/tomcat-localization-howto.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/tomcat-3.2-doc/tomcat-localization-howto.html?rev=1305109&view=auto == --- tomcat/site/trunk/docs/tomcat-3.2-doc/tomcat-localization-howto.html (added) +++ tomcat/site/trunk/docs/tomcat-3.2-doc/tomcat-localization-howto.html Sun Mar 25 19:52:05 2012 @@ -0,0 +1,198 @@ + + + + + + +Tomcat - Localization + + + + + + + + + http://jakarta.apache.org/index.html";> + http://jakarta.apache.org/images/jakarta-logo.gif"; + align="left" + alt="The Jakarta Project" + border="0"> + + + + + + Localization in Tomcat + + This document attempts to provide information necessary for + development of localized content that is served under Tomcat. + The audience of this document is developers of Tomcat applications, + internationalization and localization experts that need to + perform conversions of content to specific locales. + The document is divided into several sections. + + How to organize Localized Resources in Tomcat + + This section will describe the schemes that are available under + Tomcat to provide access to localized versions of resources, + including but not limited to HTML pages, javascript files, + image files, etc. + + Tomcat provides three mechanisms that enable it to serve + localized versions of content: + + + +no lookup for localized resource +file based organization for lookup of localized resource +docbase based organization for lookup for localized resource + + File based organization for localized resource lookup + + This type of organization of localized content attempts to find the + localized version of the resource queried based on the basename of + the resource, using the lookup conventions specified in + java.lang.ResourceBundle. + +For example, assume the following scenario: + + + +User's Locale: fr_CA +Webserver's Locale:es_AR +docbase: /myapp +User's URL query: /myapp/index.html + + +This scheme will try to look up for the resource in the following + priority order: + + + + /myapp/index_fr_CA.html + /myapp/index_fr.html + /myapp/index_es_AR.html + /myapp/index_es.html + /myapp/index.html + + + When using this scheme, all localized versions will end up + residing on the same directory where the default (the one without + the localized name) file is located. + Developer's note: there is no need to change the URLs on each one + of the localized versions of the files provided. + + + Docbase based organization for localized resource lookup + + This type of organization of the localized resources attempts to + find the localized version of the resource queried based on the + existence of a localized document hierarchy under the 'docbase' + directory. + The organization of the documents is similar to the one that JavaHelp + uses. + +For example, assume the following scenario: + + + +User's Locale: fr_CA +Webserver's Locale:es_AR +docbase: /myapp +User's URL query: /myapp/index.html + + + This scheme will try to look up for the resource in the following + priority order: + + + +/myapp/fr_CA/index.html +/myapp/fr/index.html +/myapp/es_AR/index.html +/myapp/es/index.html +/myapp/index.html + + + When using this scheme, all localized versions will end up + residing on different directories. All the files for a specific + locale will appear in subdirectories under a common + parent [docbase]/[locale] directory. + Developer's note: on the localized version(s) of the file, there may be + a need to change the URLs. This, especially when there + are relative references in those URLs (for example, + accessing documents in a directory above). + + + Implementation Topics + + The org.apache.tomcat.request.StaticInterceptor class + is used to handle the lookup for localized resources. + + This is accomplished by specifying on the corresponding entry on + server.xml. The StaticInterceptor class includes + a property called localization that can + be set to any of the values below: + + + +"file" +"docbase" + + +
svn commit: r1305106 - /tomcat/site/trunk/docs/mail
Author: markt Date: Sun Mar 25 19:48:26 2012 New Revision: 1305106 URL: http://svn.apache.org/viewvc?rev=1305106&view=rev Log: Add mail symlink to svn Added: tomcat/site/trunk/docs/mail (with props) Added: tomcat/site/trunk/docs/mail URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/mail?rev=1305106&view=auto == --- tomcat/site/trunk/docs/mail (added) +++ tomcat/site/trunk/docs/mail Sun Mar 25 19:48:26 2012 @@ -0,0 +1 @@ +link /home/apmail/public-arch/tomcat.apache.org \ No newline at end of file Propchange: tomcat/site/trunk/docs/mail -- svn:special = * - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Notice: compilation of mod_jk for httpd 1.3 broken in 1.2.35
On 25.03.2012 20:05, Mladen Turk wrote: On 03/25/2012 04:00 PM, Rainer Jung wrote: Fixed by http://svn.apache.org/viewvc?rev=1305020&view=rev LOL. Are you waiting for a release to carry the bad news :) Don't shoot the messenger. Wasn't able to test earlier, but at least wanted to let you know before the announcement. Anyhow, don't care much 'bout 1.3 I don't care enough to let this problem stop the release. I don't expect much remaining use, i.e. old web server but most recent mod_jk isn't very likely. We should probably drop further support for something abandoned long time ago. Not really abandoned, at least not by me ;) I went through the change logs of the last three years and only very few changes were missing, of which only one was critical, namely the one cited above. But I'm fine with announcing that we stop maintaining mod_jk for HTTPD 1.3 after 1.2.35. The only problem is that then the last release can't be build. Should we provide a "patches_to_apply_..." directory like httpd does it for important patches? Have a nice week anyways! Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Notice: compilation of mod_jk for httpd 1.3 broken in 1.2.35
On 03/25/2012 04:00 PM, Rainer Jung wrote: Fixed by http://svn.apache.org/viewvc?rev=1305020&view=rev LOL. Are you waiting for a release to carry the bad news :) Anyhow, don't care much 'bout 1.3 We should probably drop further support for something abandoned long time ago. Cheers -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1305082 - /tomcat/site/trunk/build.xml
Author: markt
Date: Sun Mar 25 17:27:10 2012
New Revision: 1305082
URL: http://svn.apache.org/viewvc?rev=1305082&view=rev
Log:
Tabs to spaces. Fix alignment. No functional change.
Modified:
tomcat/site/trunk/build.xml
Modified: tomcat/site/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/build.xml?rev=1305082&r1=1305081&r2=1305082&view=diff
==
--- tomcat/site/trunk/build.xml (original)
+++ tomcat/site/trunk/build.xml Sun Mar 25 17:27:10 2012
@@ -7,8 +7,8 @@
-
-
+
+
@@ -28,7 +28,7 @@
style="${docs.src}/stylesheets/tomcat-site.xsl"
excludes="project.xml,sitemap.xml,sitemap-main.xml"
includes="*.xml"
- force="${force}">
+force="${force}">
@@ -40,7 +40,7 @@
-
+
@@ -76,6 +76,6 @@
-
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: SPDY support
On Sun, Mar 25, 2012 at 8:55 AM, Filip Hanik Mailing Lists <
devli...@hanik.com> wrote:
> Tomcat 7 is a Servlet 3.0 implementation with requirements to support Java
> 6, wouldn't this break that contract if we do it for NIO/BIO?
>
For Tomcat7 I'm proposing to only add hooks: 'beforeHandshake' callback in
Handler, and an optional NpnHandler class plus setters in protocol.
There is no Java7 or spdy dependency at all.
If you want to use spdy with Tomcat7 ( assuming the patch is accepted ) you
need to get tomcat-spdy.jar (from tomcat8 or separate download), and either
use Java7 + npn-boot.jar or get tomcat-jni.jar and the matching
libtcnative.so for APR, with Java6.
> Could this be done as a extras package for the Java connectors?
> Why not add this into trunk first, and work with it there, as opposed to
> an external repository?
>
I'm adding it to trunk as well - I'm using github as a staging area and to
get feedback on the proper layout.
The main question is if it's ok to add a build-time dependency on npn-boot,
which is needed to compile the nio/jio support, 2 classes are affected for
nio:
https://github.com/costinm/tomcat/blob/trunk/java/org/apache/coyote/spdy/SpdyNioNpnHandler.java
https://github.com/costinm/tomcat/blob/trunk/java/org/apache/coyote/spdy/NetSupportTomcatNio.java
Since users will still have to download npn-boot.jar ( it contains GPL so
probably can't be distributed with tomcat ) - they could also download a
jar with those 2 classes and the 2 for jio. That's the second option, if
compile-time dep to gpl is not ok.
The 3rd option is to have the entire spdy package outside tomcat - but keep
the hooks ( i.e. 'beforeHandshake', NpnHandler, etc ) - like I'm proposing
for tomcat7.
Costin
> Filip
>
> - Original Message -
> > From: "Costin Manolache"
> > To: "Tomcat Developers List"
> > Sent: Saturday, March 24, 2012 10:44:19 PM
> > Subject: Re: SPDY support
> >
> > Hi,
> >
> > I did a first round of backporting to tomcat7 - only the hooks.
> > Please take
> > a look and let me know:
> >
> > https://github.com/costinm/tomcat/blob/trunk/tomcat7.diff
> >
> > I've also submitted to git the changes to support SPDY/NPN for NIO
> > and JIO
> > connectors - almost same diff, but the important change is:
> >
> >
> https://github.com/costinm/tomcat/commit/698f4105a818e872877f3e8d9c50e003e2e706f0
> >
> > The problem is that it add a compile dep on
> > http://wiki.eclipse.org/Jetty/Feature/NPN
> >
> > the classes are modified from openjdk7 - it'll also need to be added
> > at
> > runtime ( if spdy support with nio/jio is needed ), but I assume
> > users can
> > download the jar until it gets merged into jdk7.
> >
> > Alternative is to move all the coyote/spdy/{nio,jio} classes to a
> > separate
> > repository, outside tomcat tree. I guess we could also move all spdy
> > impl
> > to a separate repo and only leave the hooks.
> >
> > Costin
> >
> > On Mon, Mar 19, 2012 at 11:31 AM, Costin Manolache
> > wrote:
> >
> > >
> > >
> > > On Mon, Mar 19, 2012 at 10:43 AM, Gus Heck
> > > wrote:
> > >
> > >> I just bumped into the whole concept of SPDY this morning, and it
> > >> sounds
> > >> fabulous, and I'm quite happy to see that it's already underway in
> > >> trunk.
> > >> I'm quite likely to be using a lot of development using Vaadin
> > >> framework in
> > >> the near future, which I expect probably stands to benefit
> > >> significantly
> > >> from SPDY. However, it seems that SPDY support in java is a wee
> > >> tad
> > >> nascent. As I understand it, there's an issue with oracle JDK
> > >> support for
> > >> NPN that is forcing tomcat to use APR. I also notice that Jetty
> > >> has just
> > >> released a version that supports SPDY using the NPN that is
> > >> apparently in
> > >> OpenJDK 7 already (will it appear in an oracle java update?).
> > >> Clearly this
> > >> is a key innovation, and it looks like between Apache Hhttpd and
> > >> Chrome/Firefox/Safari, more than 50% of the web will support it on
> > >> both
> > >> client and server merely by staying up to date with their current
> > >> software.
> > >>
> > >
> > > I have Jetty NPN working with tomcat - so NIO/BIO will also support
> > > SPDY.
> > > You will have to download/install the jetty implementation of npn
> > > jar
> > > yourself until it's merged into JDK7, don't know what are their
> > > plans.
> > >
> > > The APR seems faster - but not by a huge margin, I haven't tested
> > > the
> > > limits yet ( I want to find out what's the max number of kept-alive
> > > spdy
> > > connections - need more machines because of the 64k limit on local
> > > ports).
> > >
> > >
> > >
> > >> My question is this: will SPDY support be released in some form
> > >> before
> > >> Tomcat 8 (in who's branch it seems to currently live)? JSR 340
> > >> (servlet
> > >> 3.1) seems to be targeting Q3 2012 and I would presume that that
> > >> means
> > >> tomcat 8 is no sooner than Q3 or Q4 - 2012. Seems a shame to make
> > >> this wait
> > >>
Re: SPDY support
Tomcat 7 is a Servlet 3.0 implementation with requirements to support Java 6,
wouldn't this break that contract if we do it for NIO/BIO?
Could this be done as a extras package for the Java connectors?
Why not add this into trunk first, and work with it there, as opposed to an
external repository?
Filip
- Original Message -
> From: "Costin Manolache"
> To: "Tomcat Developers List"
> Sent: Saturday, March 24, 2012 10:44:19 PM
> Subject: Re: SPDY support
>
> Hi,
>
> I did a first round of backporting to tomcat7 - only the hooks.
> Please take
> a look and let me know:
>
> https://github.com/costinm/tomcat/blob/trunk/tomcat7.diff
>
> I've also submitted to git the changes to support SPDY/NPN for NIO
> and JIO
> connectors - almost same diff, but the important change is:
>
> https://github.com/costinm/tomcat/commit/698f4105a818e872877f3e8d9c50e003e2e706f0
>
> The problem is that it add a compile dep on
> http://wiki.eclipse.org/Jetty/Feature/NPN
>
> the classes are modified from openjdk7 - it'll also need to be added
> at
> runtime ( if spdy support with nio/jio is needed ), but I assume
> users can
> download the jar until it gets merged into jdk7.
>
> Alternative is to move all the coyote/spdy/{nio,jio} classes to a
> separate
> repository, outside tomcat tree. I guess we could also move all spdy
> impl
> to a separate repo and only leave the hooks.
>
> Costin
>
> On Mon, Mar 19, 2012 at 11:31 AM, Costin Manolache
> wrote:
>
> >
> >
> > On Mon, Mar 19, 2012 at 10:43 AM, Gus Heck
> > wrote:
> >
> >> I just bumped into the whole concept of SPDY this morning, and it
> >> sounds
> >> fabulous, and I'm quite happy to see that it's already underway in
> >> trunk.
> >> I'm quite likely to be using a lot of development using Vaadin
> >> framework in
> >> the near future, which I expect probably stands to benefit
> >> significantly
> >> from SPDY. However, it seems that SPDY support in java is a wee
> >> tad
> >> nascent. As I understand it, there's an issue with oracle JDK
> >> support for
> >> NPN that is forcing tomcat to use APR. I also notice that Jetty
> >> has just
> >> released a version that supports SPDY using the NPN that is
> >> apparently in
> >> OpenJDK 7 already (will it appear in an oracle java update?).
> >> Clearly this
> >> is a key innovation, and it looks like between Apache Hhttpd and
> >> Chrome/Firefox/Safari, more than 50% of the web will support it on
> >> both
> >> client and server merely by staying up to date with their current
> >> software.
> >>
> >
> > I have Jetty NPN working with tomcat - so NIO/BIO will also support
> > SPDY.
> > You will have to download/install the jetty implementation of npn
> > jar
> > yourself until it's merged into JDK7, don't know what are their
> > plans.
> >
> > The APR seems faster - but not by a huge margin, I haven't tested
> > the
> > limits yet ( I want to find out what's the max number of kept-alive
> > spdy
> > connections - need more machines because of the 64k limit on local
> > ports).
> >
> >
> >
> >> My question is this: will SPDY support be released in some form
> >> before
> >> Tomcat 8 (in who's branch it seems to currently live)? JSR 340
> >> (servlet
> >> 3.1) seems to be targeting Q3 2012 and I would presume that that
> >> means
> >> tomcat 8 is no sooner than Q3 or Q4 - 2012. Seems a shame to make
> >> this wait
> >> until that time (assuming it's anywhere near ready).
> >>
> >
> > I have a patch for tomcat7 to add only the NPN hooks - it's pretty
> > small
> > and clean, I'll get a discussion started, but it should be
> > possible.
> >
> > Then it's up to tomcat-dev on whether to backport the spdy
> > packages, or
> > have tomcat7 download the spdy jars separately ( i.e. release them
> > as a
> > 'plugin' / add-on ).
> >
> > It'll take a bit of time until it's done - not easy to find free
> > time to
> > work on this.
> >
> > Costin
> >
> >
> >>
> >> -Gus
> >>
> >
> >
>
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Notice: compilation of mod_jk for httpd 1.3 broken in 1.2.35
Fixed by http://svn.apache.org/viewvc?rev=1305020&view=rev Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1305035 - in /tomcat/jk/trunk: native/apache-1.3/mod_jk.c xdocs/miscellaneous/changelog.xml
Author: rjung
Date: Sun Mar 25 13:47:09 2012
New Revision: 1305035
URL: http://svn.apache.org/viewvc?rev=1305035&view=rev
Log:
Allow to set path parameter used when doing JkStripSession
in HTTPD 1.3. This was available for HTTPD 2.x already
since mod_jk 1.2.27.
Port of r702431 from mod_jk for HTTPD 2.x to 1.3.
Modified:
tomcat/jk/trunk/native/apache-1.3/mod_jk.c
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
Modified: tomcat/jk/trunk/native/apache-1.3/mod_jk.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-1.3/mod_jk.c?rev=1305035&r1=1305034&r2=1305035&view=diff
==
--- tomcat/jk/trunk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/jk/trunk/native/apache-1.3/mod_jk.c Sun Mar 25 13:47:09 2012
@@ -201,6 +201,7 @@ typedef struct
int exclude_options;
int strip_session;
+char *strip_session_name;
/*
* Environment variables support
*/
@@ -1417,18 +1418,29 @@ static const char *jk_set_auto_alias(cmd
/*
* JkStripSession directive handling
*
- * JkStripSession On/Off
+ * JkStripSession On/Off [session path identifier]
*/
-static const char *jk_set_strip_session(cmd_parms * cmd, void *dummy, int flag)
+static const char *jk_set_strip_session(cmd_parms * cmd, void *dummy,
+const char *flag, const char *name)
{
server_rec *s = cmd->server;
jk_server_conf_t *conf =
(jk_server_conf_t *) ap_get_module_config(s->module_config,
&jk_module);
-/* Set up our value */
-conf->strip_session = flag ? JK_TRUE : JK_FALSE;
+if (strcasecmp(flag, "on") && strcasecmp(flag, "off")) {
+return "JkStripSession must be On or Off";
+}
+else {
+conf->strip_session = strcasecmp(flag, "off") ? JK_TRUE : JK_FALSE;
+}
+
+/* Check for optional path value */
+if (name)
+conf->strip_session_name = ap_pstrdup(cmd->pool, name);
+else
+conf->strip_session_name = ap_pstrdup(cmd->pool,
JK_PATH_SESSION_IDENTIFIER);
return NULL;
}
@@ -2236,7 +2248,7 @@ static const command_rec jk_cmds[] = {
* JkStripSession specifies if mod_jk should strip the ;jsessionid
* from the unmapped urls
*/
-{"JkStripSession", jk_set_strip_session, NULL, RSRC_CONF, FLAG,
+{"JkStripSession", jk_set_strip_session, NULL, RSRC_CONF, TAKE12,
"Should the server strip the jsessionid from unmapped URLs"},
/*
@@ -2782,9 +2794,10 @@ static void *merge_jk_config(ap_pool * p
}
if (overrides->mount_file_reload == JK_UNSET)
overrides->mount_file_reload = base->mount_file_reload;
-if (overrides->strip_session == JK_UNSET)
+if (overrides->strip_session == JK_UNSET) {
overrides->strip_session = base->strip_session;
-
+overrides->strip_session_name = base->strip_session_name;
+}
return overrides;
}
@@ -3258,10 +3271,11 @@ static int jk_translate(request_rec * r)
jk_log(conf->log, JK_LOG_DEBUG,
"no match for %s found",
r->uri);
-if (conf->strip_session == JK_TRUE) {
+if (conf->strip_session == JK_TRUE &&
+conf->strip_session_name) {
char *jsessionid;
if (r->uri) {
-jsessionid = strstr(r->uri,
JK_PATH_SESSION_IDENTIFIER);
+jsessionid = strstr(r->uri, conf->strip_session_name);
if (jsessionid) {
if (JK_IS_DEBUG_LEVEL(conf->log))
jk_log(conf->log, JK_LOG_DEBUG,
@@ -3271,7 +3285,7 @@ static int jk_translate(request_rec * r)
}
}
if (r->filename) {
-jsessionid = strstr(r->filename,
JK_PATH_SESSION_IDENTIFIER);
+jsessionid = strstr(r->filename,
conf->strip_session_name);
if (jsessionid)
*jsessionid = '\0';
}
Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1305035&r1=1305034&r2=1305035&view=diff
==
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Sun Mar 25 13:47:09 2012
@@ -51,6 +51,10 @@
46893: HTTPD 1.3: Apply fix to HTTPD 1.3.
It was fixed for HTTPD 2.x already in version 1.2.30. (rjung)
+
+HTTPD 1.3: Allow to set path parameter used when doing JkStripSession.
+This was available for HTTPD 2.x already since mod_jk 1.2.27. (rjung)
+
---
svn commit: r1305028 - /tomcat/jk/trunk/native/apache-1.3/mod_jk.c
Author: rjung
Date: Sun Mar 25 13:25:01 2012
New Revision: 1305028
URL: http://svn.apache.org/viewvc?rev=1305028&view=rev
Log:
Reduce code drift between HTTPD 1.3 and 2.x variants of mod_jk:
- add log message about comsuming remaining request data.
It was originally added to the 2.x variant in r698229 and
changed further in r698853.
Modified:
tomcat/jk/trunk/native/apache-1.3/mod_jk.c
Modified: tomcat/jk/trunk/native/apache-1.3/mod_jk.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-1.3/mod_jk.c?rev=1305028&r1=1305027&r2=1305028&view=diff
==
--- tomcat/jk/trunk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/jk/trunk/native/apache-1.3/mod_jk.c Sun Mar 25 13:25:01 2012
@@ -2505,7 +2505,6 @@ static int jk_handler(request_rec * r)
if (worker->get_endpoint(worker, &end, conf->log)) {
rc = end->service(end, &s, conf->log, &is_error);
end->done(&end, conf->log);
-
if (s.content_read < s.content_length ||
(s.is_chunked && !s.no_more_chunks)) {
/*
@@ -2514,13 +2513,20 @@ static int jk_handler(request_rec * r)
* characters left to read from client
*/
char *buff = ap_palloc(r->pool, 2048);
+int consumed = 0;
if (buff != NULL) {
int rd;
while ((rd =
ap_get_client_block(r, buff, 2048)) > 0) {
s.content_read += rd;
+consumed += rd;
}
}
+if (JK_IS_DEBUG_LEVEL(conf->log)) {
+ jk_log(conf->log, JK_LOG_DEBUG,
+ "Consumed %d bytes of remaining request data
for worker=%s",
+ consumed, STRNULL_FOR_NULL(worker_name));
+}
}
}
#ifndef NO_GETTIMEOFDAY
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1305022 - in /tomcat/jk/trunk: native/apache-1.3/mod_jk.c xdocs/miscellaneous/changelog.xml
Author: rjung
Date: Sun Mar 25 12:49:10 2012
New Revision: 1305022
URL: http://svn.apache.org/viewvc?rev=1305022&view=rev
Log:
BZ 46893: Apply fix to HTTPD 1.3.
It was fixed for HTTPD 2.x already in version 1.2.30
but never added to the HTTPD 1.3 mod_jk..
Modified:
tomcat/jk/trunk/native/apache-1.3/mod_jk.c
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
Modified: tomcat/jk/trunk/native/apache-1.3/mod_jk.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-1.3/mod_jk.c?rev=1305022&r1=1305021&r2=1305022&view=diff
==
--- tomcat/jk/trunk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/jk/trunk/native/apache-1.3/mod_jk.c Sun Mar 25 12:49:10 2012
@@ -257,6 +257,7 @@ static table *jk_log_fds = NULL;
static jk_worker_env_t worker_env;
static char *jk_shm_file = NULL;
static size_t jk_shm_size = 0;
+static int jk_shm_size_set = 0;
/*
* Worker stuff
*/
@@ -1348,6 +1349,8 @@ static const char *jk_set_shm_size(cmd_p
else
sz = JK_SHM_ALIGN(sz);
jk_shm_size = (size_t)sz;
+if (jk_shm_size)
+jk_shm_size_set = 1;
return NULL;
}
@@ -3037,7 +3040,7 @@ static void jk_init(server_rec * s, ap_p
if (jk_shm_size == 0) {
jk_shm_size = jk_shm_calculate_size(jk_worker_properties, conf->log);
}
-else {
+else if (jk_shm_size_set) {
jk_log(conf->log, JK_LOG_WARNING,
"The optimal shared memory size can now be determined
automatically.");
jk_log(conf->log, JK_LOG_WARNING,
Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1305022&r1=1305021&r2=1305022&view=diff
==
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Sun Mar 25 12:49:10 2012
@@ -44,7 +44,12 @@
- Fix compilation of mod_jk for HTTPD 1.3. (rjung)
+
+Fix compilation of mod_jk for HTTPD 1.3. (rjung)
+
+
+46893: HTTPD 1.3: Apply fix to HTTPD 1.3.
+It was fixed for HTTPD 2.x already in version 1.2.30. (rjung)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1305021 - /tomcat/jk/trunk/native/apache-1.3/mod_jk.c
Author: rjung
Date: Sun Mar 25 12:41:01 2012
New Revision: 1305021
URL: http://svn.apache.org/viewvc?rev=1305021&view=rev
Log:
Keep code of mod_jk for HTTPD 1.3 and for 2.x
a bit better in sync. Only code style,
no functional change.
Port r1201607 from 2.x to 1.3.
Modified:
tomcat/jk/trunk/native/apache-1.3/mod_jk.c
Modified: tomcat/jk/trunk/native/apache-1.3/mod_jk.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-1.3/mod_jk.c?rev=1305021&r1=1305020&r2=1305021&view=diff
==
--- tomcat/jk/trunk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/jk/trunk/native/apache-1.3/mod_jk.c Sun Mar 25 12:41:01 2012
@@ -533,8 +533,9 @@ static void JK_METHOD ws_vhost_to_text(v
server_rec *s = (server_rec *)d;
size_t used = 0;
-if (s->server_hostname)
+if (s->server_hostname) {
used += strlen(s->server_hostname);
+}
if (!s->is_virtual) {
if (s->port)
used += strlen(":X");
@@ -1627,23 +1628,21 @@ static struct log_item_list
char ch;
item_key_func func;
} log_item_keys[] = {
-
-{
-'T', log_request_duration}, {
-'r', log_request_line}, {
-'U', log_request_uri}, {
-'s', log_status}, {
-'b', clf_log_bytes_sent}, {
-'B', log_bytes_sent}, {
-'V', log_server_name}, {
-'v', log_virtual_host}, {
-'p', log_server_port}, {
-'H', log_request_protocol}, {
-'m', log_request_method}, {
-'q', log_request_query}, {
-'w', log_worker_name}, {
-'R', log_worker_route}, {
-'\0'}
+{ 'T', log_request_duration },
+{ 'r', log_request_line },
+{ 'U', log_request_uri },
+{ 's', log_status },
+{ 'b', clf_log_bytes_sent },
+{ 'B', log_bytes_sent },
+{ 'V', log_server_name },
+{ 'v', log_virtual_host },
+{ 'p', log_server_port },
+{ 'H', log_request_protocol },
+{ 'm', log_request_method },
+{ 'q', log_request_query },
+{ 'w', log_worker_name },
+{ 'R', log_worker_route},
+{ '\0', NULL }
};
static struct log_item_list *find_log_func(char k)
@@ -2620,7 +2619,8 @@ static void *create_jk_config(ap_pool *
c->log_level = JK_UNSET;
c->ssl_enable = JK_UNSET;
c->strip_session = JK_UNSET;
-} else {
+}
+else {
if (!jk_map_alloc(&(c->uri_to_context))) {
ap_log_error(APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, NULL, "Memory
error");
}
@@ -3034,18 +3034,20 @@ static void jk_init(server_rec * s, ap_p
}
#endif
-if (jk_shm_size == 0)
+if (jk_shm_size == 0) {
jk_shm_size = jk_shm_calculate_size(jk_worker_properties, conf->log);
+}
else {
jk_log(conf->log, JK_LOG_WARNING,
"The optimal shared memory size can now be determined
automatically.");
jk_log(conf->log, JK_LOG_WARNING,
"You can remove the JkShmSize directive if you want to use the
optimal size.");
}
-if ((rc = jk_shm_open(jk_shm_file, jk_shm_size, conf->log)) != 0)
+if ((rc = jk_shm_open(jk_shm_file, jk_shm_size, conf->log)) != 0) {
jk_log(conf->log, JK_LOG_ERROR,
"Initializing shm:%s errno=%d. Load balancing workers will not
function properly.",
jk_shm_name(), rc);
+}
/* SREVILAK -- register cleanup handler to clear resources on restart,
* to make sure log file gets closed in the parent process */
@@ -3348,9 +3350,10 @@ static void child_init_handler(server_re
JK_TRACE_ENTER(conf->log);
-if ((rc = jk_shm_attach(jk_shm_file, jk_shm_size, conf->log)) != 0)
+if ((rc = jk_shm_attach(jk_shm_file, jk_shm_size, conf->log)) != 0) {
jk_log(conf->log, JK_LOG_ERROR, "Attaching shm:%s errno=%d",
jk_shm_name(), rc);
+}
JK_TRACE_EXIT(conf->log);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1305020 - in /tomcat/jk/trunk: native/apache-1.3/mod_jk.c xdocs/miscellaneous/changelog.xml
Author: rjung
Date: Sun Mar 25 12:38:26 2012
New Revision: 1305020
URL: http://svn.apache.org/viewvc?rev=1305020&view=rev
Log:
Fix compilation breakage of mod_jk for HTTPD 1.3
introduced in r1302445.
Modified:
tomcat/jk/trunk/native/apache-1.3/mod_jk.c
tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
Modified: tomcat/jk/trunk/native/apache-1.3/mod_jk.c
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/native/apache-1.3/mod_jk.c?rev=1305020&r1=1305019&r2=1305020&view=diff
==
--- tomcat/jk/trunk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/jk/trunk/native/apache-1.3/mod_jk.c Sun Mar 25 12:38:26 2012
@@ -3361,7 +3361,7 @@ static void child_init_handler(server_re
static void jk_server_cleanup(void *data)
{
jk_generic_cleanup((server_rec *) data);
-jk_shm_close();
+jk_shm_close(main_log);
}
Modified: tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml?rev=1305020&r1=1305019&r2=1305020&view=diff
==
--- tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/jk/trunk/xdocs/miscellaneous/changelog.xml Sun Mar 25 12:38:26 2012
@@ -40,6 +40,15 @@
new documentation project for JK was started.
+
+
+
+
+ Fix compilation of mod_jk for HTTPD 1.3. (rjung)
+
+
+
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Bug report for Tomcat Modules [2012/03/25]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | |48240|New|Nor|2009-11-19|Tomcat-Lite missing @Override markers | |48268|New|Nor|2009-11-23|Patch to fix generics in tomcat-lite | |48861|New|Nor|2010-03-04|Files without AL headers | |49685|New|Nor|2010-08-02|Unsafe synchronization in class ManagedBean | |49686|New|Nor|2010-08-02|Using an instance lock to protect static shared da| |50571|Inf|Nor|2011-01-11|Tomcat 7 JDBC connection pool exception enhancemen| |50864|New|Nor|2011-03-03|Reconfigure pool on the fly using JMX | |51595|Inf|Nor|2011-08-01|org.apache.tomcat.jdbc.pool.jmx.ConnectionPool sho| |51879|Inf|Enh|2011-09-22|Improve access to Native Connection Methods | |52002|Opn|Nor|2011-10-10|Pool re-opens and re-issues closed connection | |52024|Inf|Enh|2011-10-13|Custom interceptor to support automatic failover o| |52066|Opn|Nor|2011-10-20|ConnectionPool.borrowConnection swallows interrupt| |52318|New|Cri|2011-12-11|Version in tomcat-jdbc POM is conflicted with Vers| +-+---+---+--+--+ | Total 13 bugs | +---+ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Bug report for Tomcat Native [2012/03/25]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | |45392|New|Nor|2008-07-14|No OCSP support for client SSL verification | |46179|Opn|Maj|2008-11-10|apr ssl client authentication | |48655|Inf|Nor|2010-02-02|Active multipart downloads prevent tomcat shutdown| |49038|Inf|Nor|2010-04-02|Crash in tcnative | |51655|New|Nor|2011-08-12|Index page does not say what native does | |51813|New|Cri|2011-09-14|Tomcat randomly crashes with [libtcnative-1.so.1+0| |52153|New|Maj|2011-11-08|periodic JVM crash (access violation) on buffer fl| |52231|New|Nor|2011-11-23|Ant Tasks need to reflect changes in manager comma| |52319|New|Maj|2011-12-12|Tomcat 6 crashes with [libapr-1.so.0+0x196da] sig| |52627|New|Min|2012-02-08|Segmentation fault in org.apache.tomcat.jni.File.i| |52856|New|Maj|2012-03-08|High CPU load when the underlying socket error in | +-+---+---+--+--+ | Total 11 bugs | +---+ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Bug report for Tomcat 7 [2012/03/25]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | |16579|New|Enh|2003-01-30|documentation page layout/style breaks wrapping to| |18500|New|Enh|2003-03-30|Host aliases to match by regular expression | |28039|Opn|Enh|2004-03-30|Cluster Support for SingleSignOn | |40728|Inf|Enh|2006-10-11|Catalina MBeans use non-serializable classes | |40881|Opn|Enh|2006-11-02|Unable to receive message through TCP channel -> | |41007|Opn|Enh|2006-11-20|Can't define customized 503 error page| |43866|New|Enh|2007-11-14|add support for session attribute propagation with| |43925|Opn|Enh|2007-11-21|org.apache.jasper.runtime.BodyContentImpl causing | |44216|New|Enh|2008-01-11|Don't reuse session ID even if emptySessionPath=tr| |48550|Inf|Enh|2010-01-14|Update examples and default server.xml to use UTF-| |49395|New|Enh|2010-06-06|manager.findLeaks : display the date when the leak| |49589|New|Enh|2010-07-12|Tag handlers with constant attribute values are al| |49785|New|Enh|2010-08-19|Enabling TLS for JNDIRealm| |49821|New|Enh|2010-08-25|Tomcat CLI| |50019|New|Enh|2010-09-28|Adding JNDI "lookup-name" support In XML and Resou| |50175|New|Enh|2010-10-28|Enhance memory leak detection by selectively apply| |50234|New|Enh|2010-11-08|JspC use servlet 3.0 features | |50504|New|Enh|2010-12-21|Allow setting query string character set trough re| |50670|New|Enh|2011-01-27|Tribes | RpcChannel | Add option to specify extern| |51195|New|Enh|2011-05-13|"Find leaks" reports a false positive memory/class| |51294|Opn|Enh|2011-05-30|Since 7.0.12 do not work option unpackWARs=true fo| |51423|Inf|Enh|2011-06-23|[Patch] to add a path and a version parameters to | |51463|New|Enh|2011-07-01|Tomcat.setBaseDir (package org.apache.catalina.st| |51496|New|Enh|2011-07-11|NSIS - Warn that duplicate service name will resul| |51497|New|Enh|2011-07-11|Use canonical IPv6 text representation in logs| |51526|New|Enh|2011-07-18|Process web application context config with embedd| |51587|New|Enh|2011-07-29|Implement status and uptime commands | |51953|New|Enh|2011-10-04|Proposal: netmask filtering valve and filter | |52092|New|Enh|2011-10-26|Please make AsyncFileHandler and OneLineFormatter | |52235|New|Enh|2011-11-23|Please do a bit of SEO tuning for the web site| |52236|New|Enh|2011-11-23|Idea: support 'overlays' shaped like Maven overlay| |52323|New|Enh|2011-12-13|Cobertura test code coverage support for build.xml| |52381|New|Enh|2011-12-22|Please add OSGi metadata | |52448|New|Enh|2012-01-11|Cache jar indexes in WebappClassLoader to speed up| |52489|New|Enh|2012-01-19|Enhancement request for code signing of war files | |52558|New|Enh|2012-01-30|CometConnectionManagerValve is adding non-serializ| |52688|New|Enh|2012-02-16|Added ability to have access logs output to standa| |52751|Opn|Enh|2012-02-23|Optimized configuration of the system info display| |52777|New|Enh|2012-02-27|Automatically shut down old versions in parallel d| |52833|New|Reg|2012-03-05|NPE with 7.0.26 | |52853|Opn|Nor|2012-03-08|@HandlesTypes not resolving classes when added as | |52952|New|Enh|2012-03-20|Improve ExtensionValidator handling for embedded s| |52954|New|Enh|2012-03-21|Allowing for broken android HTTP DIGEST support | |52955|New|Enh|2012-03-21|Add a ThreadFactory implementation to the Executor| |52974|New|Nor|2012-03-22|NameNotFoundException is thrown when field/method | +-+---+---+--+--+ | Total 45 bugs | +---+ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Bug report for Tomcat 6 [2012/03/25]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | |41679|New|Enh|2007-02-22|SemaphoreValve should be able to filter on url pat| |41883|Ass|Enh|2007-03-18|use abstract wrapper instead of plain X509Certific| |43001|New|Enh|2007-07-30|JspC lacks setMappedFile and setDie for use in Ant| |43400|New|Enh|2007-09-14|enum support for tag libs | |43548|Opn|Enh|2007-10-04|xml schema for tomcat-users.xml | |43682|New|Enh|2007-10-23|JULI: web-inf/classes/logging.properties to suppor| |43742|New|Enh|2007-10-30|.tag compiles performed one at a time -- extremel| |43979|New|Enh|2007-11-27|Add abstraction for Java and Classfile output | |44199|New|Enh|2008-01-10|expose current backlog queue size | |44225|New|Enh|2008-01-14|SSL connector tries to load the private keystore f| |44284|New|Enh|2008-01-23|Support java.lang.Iterable in c:forEach tag | |44294|New|Enh|2008-01-25|Support for EL functions with varargs | |44312|New|Enh|2008-01-28|Warn when overwritting docBase of the default Host| |44645|New|Enh|2008-03-20|[Patch] JNDIRealm - Doesn't support JNDI "java.nam| |44787|New|Enh|2008-04-09|provide more error context on "java.lang.IllegalSt| |44818|New|Enh|2008-04-13|tomcat hangs with GET when content-length is defin| |45014|New|Enh|2008-05-15|Request and Response classes should have wrappers | |45282|New|Enh|2008-06-25|NioReceiver doesn't close cleanly, leaving sockets| |45428|New|Enh|2008-07-18|warn if the tomcat stop doesn't complete | |45832|New|Enh|2008-09-18|add DIGEST authentication support to Ant tasks| |45878|New|Enh|2008-09-24|Generated jars do not contain proper manifests or | |45879|Opn|Enh|2008-09-24|Windows installer fails to install NOTICE and RELE| |45931|Opn|Enh|2008-10-01|trimSpaces incorrectly modifies output| |45995|New|Enh|2008-10-13|RFE - MIME type extension not case sensitive | |46173|New|Enh|2008-11-09|Small patch for manager app: Setting an optional c| |46263|New|Enh|2008-11-21|Tomcat reloading of context.xml does not update do| |46284|New|Enh|2008-11-24|Add flag to DeltaManager that blocks processing cl| |46350|New|Enh|2008-12-05|Maven repository should contain source bundles| |46727|New|Enh|2009-02-17|DefaultServlet - serving multiple encodings | |46902|New|Enh|2009-03-24|LoginValve to bypass restrictions of j_security_ch| |47214|New|Enh|2009-05-17|Inner classes that are explicitly referenced - sho| |47242|New|Enh|2009-05-22|request for AJP command line client | |47281|New|Enh|2009-05-28|Efficiency of the JDBCStore | |47407|New|Enh|2009-06-23|HttpSessionListener doesn't operate in the session| |47467|New|Enh|2009-07-02|Deployment of the war file by URL when contextpath| |47785|Opn|Enh|2009-09-04|Cluster MBean not registered | |47834|New|Enh|2009-09-14|TldConfig throws Exception when exploring unpacked| |47919|New|Enh|2009-09-30|Log Tomcat & Java environment variables in additio| |48358|Opn|Enh|2009-12-09|JSP-unloading reloaded| |48543|New|Enh|2010-01-14|[Patch] More flexibility in specifying -Dcatalina.| |48600|Opn|Enh|2010-01-22|Performance issue with tags | |48672|New|Enh|2010-02-03|Tomcat Virtual Host Manager (/host-manager) have b| |48674|New|Enh|2010-02-03|Tomcat Virtual Host Manager application doesn't pe| |48743|New|Enh|2010-02-15|Make the SLEEP variable in catalina.sh settable fr| |48899|New|Enh|2010-03-12|Guess URI charset should solve lot of problems| |48922|New|Enh|2010-03-16|org.apache.catalina.connector.Request clone static| |48928|New|Enh|2010-03-17|An alternative solution to preloading classes when| |49161|New|Enh|2010-04-21|Unknown Publisher when installing tomcat 6.0.26 | |49176|Opn|Enh|2010-04-23|Jasper in Dev Mode Is Memory Inefficient | |49464|New|Enh|2010-06-18|DefaultServlet and CharacterEncoding | |49531|New|Enh|2010-06-30|singlesignon failover not working on DeltaManager/| |49804|
Bug report for Tomcat Connectors [2012/03/25]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | |34526|Opn|Nor|2005-04-19|Truncated content in decompressed requests from mo| |35959|Opn|Enh|2005-08-01|mod_jk not independant of UseCanonicalName| |43303|New|Enh|2007-09-04|Versioning under Windows not reported by many conn| |43968|Inf|Enh|2007-11-26|[patch] support ipv6 with mod_jk | |44290|Inf|Nor|2008-01-24|mod_jk/1.2.26: retry is not useful for an importan| |44349|Inf|Maj|2008-02-04|mod_jk/1.2.26 module does not read worker.status.s| |44379|New|Enh|2008-02-07|convert the output of strftime into UTF-8 | |44454|New|Nor|2008-02-19|busy count reported in mod_jk inflated, causes inc| |44571|New|Enh|2008-03-10|Limits busy per worker to a threshold | |45063|New|Nor|2008-05-22|JK-1.2.26 IIS ISAPI filter issue when running diff| |45313|New|Nor|2008-06-30|mod_jk 1.2.26 & apache 2.2.9 static compiled on so| |46337|New|Nor|2008-12-04|real worker name is wrong | |46676|New|Enh|2009-02-09|Configurable test request for Watchdog thread | |46767|New|Enh|2009-02-25|mod_jk to send DECLINED in case no fail-over tomca| |47327|New|Enh|2009-06-07|remote_user not logged in apache logfile | |47617|Inf|Enh|2009-07-31|include time spent doing ajp_get_endpoint() in err| |47678|New|Cri|2009-08-11|Unable to allocate shared memory when using isapi_| |47714|New|Cri|2009-08-20|Reponse mixed between users | |47750|New|Maj|2009-08-27|Loss of worker settings when changing via jkstatus| |47795|New|Maj|2009-09-07|service sticky_session not being set correctly wit| |47840|Inf|Min|2009-09-14|A broken worker name is written in the log file. | |48191|New|Maj|2009-11-13|Problem with mod_jk 1.2.28 - Can not render up the| |48460|New|Nor|2009-12-30|mod_proxy_ajp document has three misleading portio| |48490|New|Nor|2010-01-05|Changing a node to stopped in uriworkermap.propert| |48513|New|Enh|2010-01-09|IIS Quick setup instructions | |48564|New|Nor|2010-01-18|Unable to turn off retries for LB worker | |48830|New|Nor|2010-03-01|IIS shutdown blocked in endpoint service when serv| |48891|Opn|Enh|2010-03-11|Missing EOL-style settings in tomcat/jk/trunk | |49035|New|Maj|2010-04-01|data lost when post a multipart/form-data form| |49063|New|Enh|2010-04-07|Please add JkStripSession status in jk-status work| |49135|New|Enh|2010-04-16|SPDY Connector for The Tomcat | |49469|New|Enh|2010-06-19|Workers status page has negative number of connect| |49732|Opn|Nor|2010-08-10|reply_timeout can't wait forever. | |49822|New|Enh|2010-08-25|Add hash lb worker method | |49903|New|Enh|2010-09-09|Make workers file reloadable | |50186|New|Nor|2010-10-31|Wrong documentation of connection_pool_timeout / c| |50511|Inf|Nor|2010-12-22|WARNING about Internal Dummy Connection of Apache | |51767|New|Maj|2011-09-06|isapi_redirect intermittently crashes iis worker p| |52074|New|Maj|2011-10-23|PATH_INFO not passed from IIS7 to Tomcat7 | |52270|New|Cri|2011-12-01|isapi rediderctor hangs IIS 7.5 APP POOL | |52286|New|Blk|2011-12-05|isapi 1.2.32 fails to reload after worker processe| |52334|New|Maj|2011-12-14|recover_time is not properly used | |52432|New|Nor|2012-01-05|HTTP Error 500.0 from IIS 7.5 when configure tomca| |52483|New|Enh|2012-01-18|Print JkOptions's options in log file and jkstatus| |52651|New|Nor|2012-02-13|JKSHMFile size limitation | +-+---+---+--+--+ | Total 45 bugs | +---+ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Bug report for Tomcat 5 [2012/03/25]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | |52579|New|Reg|2012-02-02|Tomcat5.5.35?Java1.5 cannot return proper value of| +-+---+---+--+--+ | Total1 bugs | +---+ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Bug report for Taglibs [2012/03/25]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=Critical REG=Regression MAJ=Major | | | | MIN=Minor NOR=NormalENH=Enhancement TRV=Trivial | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | |38193|Ass|Enh|2006-01-09|[RDC] BuiltIn Grammar support for Field | |38600|Ass|Enh|2006-02-10|[RDC] Enable RDCs to be used in X+V markup (X+RDC)| |42413|New|Enh|2007-05-14|[PATCH] Log Taglib enhancements | |46052|New|Nor|2008-10-21|SetLocaleSupport is slow to initialize when many l| |48333|New|Enh|2009-12-02|TLD generator | +-+---+---+--+--+ | Total5 bugs | +---+ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
