DO NOT REPLY [Bug 22617] - BASIC authentication fails if Realm supports default user
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=22617. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=22617 [EMAIL PROTECTED] changed: What|Removed |Added Status|RESOLVED|REOPENED Resolution|INVALID | --- Additional Comments From [EMAIL PROTECTED] 2005-04-15 09:19 --- Authentication is only required for protected resources and Tomcat will only prompt for authentication when accessing a protected resource. This is wrong. The whole point is that Tomcat DOES NOT PROMPT when basic authentication is used. If the security module allows an unauthenticated user, you never get the opportunity to authenticate as someone different, because Tomcat never sends 401 to the browser. Tomcat finds that the resource I'm trying to access is protected. This is OK. But instead of sending a 401 and give me the opportunity to provide credentials, it obviously immediately tries to authenticate as unauthenticated user. If this is successful, it simply continues with this identity and I never get a prompt. Acing like this, Tomcat is not consistent in its behaviour. Try form based authentication instead. If you use form based authentication, Tomcat ALWAYS shows the login form first, even if the security realm supports an unauthenticated identity. If form based authentication had been implemented just as basic authentication, Tomcat would find that the resource is protected, try to authenticate, find that the unautheticated identity works and continue with this identity, never showing the login form. But it does! The point is that basic authentication and form based authentication behave differently when the security realm supports an unauthenticated identity. Using form based authentication, you are prompted for credentials; using basic authentication, you are not prompted. You cannot derive from the specs which behaviour is correct, I agree with this. However, Tomcat should consistently stick to one of those possibilities and should not act differently depending on the authentication method chosen. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: OT: Re: Error
Well I didn't use this email for at least 3 years but it seems many viri robots still use it. On 4/13/05, William A. Rowe, Jr. [EMAIL PROTECTED] wrote: Wow, social engineering on a whole new level. An enigma wrapped in a puzzle, wrapped in a riddle. At 01:26 PM 4/13/2005, [EMAIL PROTECTED] wrote: Content-Type: text/plain; name=warning1.txt Content-Disposition: inline; filename=warning1.txt Content-Transfer-Encoding: 7bit MIME-Version: 1.0 X-Mailer: MIME-tools 5.411 (Entity 5.404) During a routine email scan at UTC, a file attached to this message was deleted per UTC Security Policy. UTC does not allow emailing several file types due to their potential to transmit viruses. An attachment named sjufp.scr was removed from this message. The body text of the message that included the deleted attachment can be found in the .txt file below. It is safe to open this file. If you believe this message is not business related simply delete it. If the message is business related and you require the file that was deleted, please contact the sender/nand arrange an alternate means of receiving it. The recommended method is to/nhave the sender zip the file before sending it. The message cannot be represented in 7-bit ASCII encoding and has been sent as a binary attachment. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Tomcat and APR
Well I've no problems with using APR if we could still use a pure Java implementation. Some may not have APR on their boxes, or an incorrect version of APR, or an invalid APR configuration (ie not multi-threaded). Remember mod_webapp and the reasons why it failed, ie too many peoples couldn't get the correct APR for there machine. So if we could make it configurable, via server.xml for example, using APR seems a great idea. On 4/14/05, Yoav Shapira [EMAIL PROTECTED] wrote: Hi, Apologies if I missed it, but I've seen responses to Yoav's and Peter's posts, but I have yet to see anything about Jess' NIO question. Since I agree with his observations, I was wondering if a reponse was in the works? (I assume it'll say something like, Yes, a Java NIO solution could very well provide enough improvements, but APR is already written, fully-established, and field- tested.) Just curious. In addition to Remy's response, you may want to search the message archives for this list. We've discussed NIO many times in the past in good depth. Yoav - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 34465] - jasper2 fails when there is no web.xml
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=34465. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=34465 [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID --- Additional Comments From [EMAIL PROTECTED] 2005-04-15 10:14 --- ctxt.getResource(WEB_XML) returns a non-null value even if there is no web.xml existing, so ths next uri.openStream() raises a FileNotFoundException. This is incorrect. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 34465] - jasper2 fails when there is no web.xml
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=34465. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=34465 [EMAIL PROTECTED] changed: What|Removed |Added Status|RESOLVED|REOPENED Resolution|INVALID | --- Additional Comments From [EMAIL PROTECTED] 2005-04-15 10:36 --- I'm sorry, maybe my guess of the reason was wrong. But jasper2 actually raises a FileNotFoundException somewhere, where it did not in 5.5.7. Please check it by yourself. I will show you the stack trace. Some parts are modified, since it includes Japanese messages. [jasper2] java.io.FileNotFoundException: C:\work\harp\web\portal\root\WEB- INF\web.xml (Japanese error message comes here) [jasper2] at java.io.FileInputStream.open(Native Method) [jasper2] at java.io.FileInputStream.init(FileInputStream.java:106) [jasper2] at java.io.FileInputStream.init(FileInputStream.java:66) [jasper2] at sun.net.www.protocol.file.FileURLConnection.connect (FileURLConnection.java:70) [jasper2] at sun.net.www.protocol.file.FileURLConnection.getInputStream (FileURLConnection.java:161) [jasper2] at java.net.URL.openStream(URL.java:1007) [jasper2] at org.apache.jasper.compiler.JspConfig.processWebDotXml (JspConfig.java:71) [jasper2] at org.apache.jasper.compiler.JspConfig.init (JspConfig.java:197) [jasper2] at org.apache.jasper.compiler.JspConfig.isJspPage (JspConfig.java:361) [jasper2] at org.apache.jasper.JspC.scanFiles(JspC.java:919) [jasper2] at org.apache.jasper.JspC.execute(JspC.java:958) [jasper2] at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) [jasper2] at sun.reflect.NativeMethodAccessorImpl.invoke (NativeMethodAccessorImpl.java:39) [jasper2] at sun.reflect.DelegatingMethodAccessorImpl.invoke (DelegatingMethodAccessorImpl.java:25) [jasper2] at java.lang.reflect.Method.invoke(Method.java:585) [jasper2] at org.apache.tools.ant.TaskAdapter.execute (TaskAdapter.java:123) [jasper2] at org.apache.tools.ant.UnknownElement.execute (UnknownElement.java:275) [jasper2] at org.apache.tools.ant.Task.perform(Task.java:364) [jasper2] at org.apache.tools.ant.Target.execute(Target.java:341) [jasper2] at org.apache.tools.ant.Target.performTasks(Target.java:369) [jasper2] at org.apache.tools.ant.Project.executeTarget (Project.java:1214) [jasper2] at org.apache.tools.ant.Project.executeTargets (Project.java:1062) [jasper2] at org.apache.tools.ant.Main.runBuild(Main.java:673) [jasper2] at org.apache.tools.ant.Main.startAnt(Main.java:188) [jasper2] at org.apache.tools.ant.launch.Launcher.run(Launcher.java:196) [jasper2] at org.apache.tools.ant.launch.Launcher.main(Launcher.java:55) -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 34465] - jasper2 fails when there is no web.xml
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=34465. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=34465 --- Additional Comments From [EMAIL PROTECTED] 2005-04-15 10:42 --- As I said, this works for me, and I explicitely tested it. ctxt.getResource(WEB_XML) returns null. Since you insist, I'll leave your bug open, but will ignore it. I recommend you look into this bug yourself. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 34465] - jasper2 fails when there is no web.xml
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=34465. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=34465 --- Additional Comments From [EMAIL PROTECTED] 2005-04-15 10:48 --- Acrually, no, I didn't test it properly, because you forgot to tell that you were precompiling JSPs (something I just saw by looking at the end of the stack trace right after posting my last reply). If you precompile with jspc, you need to have a web.xml, as all the new servlet declarations will be put there. Otherwise, your precompilation will be useless anyway. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[GUMP@brutus]: Project jakarta-tomcat-util (in module jakarta-tomcat-connectors) 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 [EMAIL PROTECTED] Project jakarta-tomcat-util has an issue affecting its community integration. This issue affects 79 projects, and has been outstanding for 9 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - avalon-http-context : Avalon SVN - avalon-http-demo : Avalon SVN - avalon-http-examples : Avalon SVN - avalon-http-impl : Avalon SVN - avalon-http-server : Avalon SVN - avalon-http-servlet : Avalon SVN - avalon-http-static : Avalon SVN - avalon-http-test : Avalon SVN - avalon-planet-facilities : Avalon SVN - cocoon : Java XML Framework - cocoon-block-asciiart : Java XML Framework - cocoon-block-authentication-fw : Java XML Framework - cocoon-block-axis : Java XML Framework - cocoon-block-batik : Java XML Framework - cocoon-block-bsf : Java XML Framework - cocoon-block-chaperon : Java XML Framework - cocoon-block-cron : Java XML Framework - cocoon-block-databases : Java XML Framework - cocoon-block-deli : Java XML Framework - cocoon-block-eventcache : Java XML Framework - cocoon-block-fop : Java XML Framework - cocoon-block-hsqldb : Java XML Framework - cocoon-block-html : Java XML Framework - cocoon-block-itext : Java XML Framework - cocoon-block-javaflow : Java XML Framework - cocoon-block-jfor : Java XML Framework - cocoon-block-jms : Java XML Framework - cocoon-block-jsp : Java XML Framework - cocoon-block-linkrewriter : Java XML Framework - cocoon-block-lucene : Java XML Framework - cocoon-block-midi : Java XML Framework - cocoon-block-naming : Java XML Framework - cocoon-block-paranoid : Java XML Framework - cocoon-block-poi : Java XML Framework - cocoon-block-profiler : Java XML Framework - cocoon-block-proxy : Java XML Framework - cocoon-block-python : Java XML Framework - cocoon-block-qdox : Java XML Framework - cocoon-block-repository : Java XML Framework - cocoon-block-serializers : Java XML Framework - cocoon-block-session-fw : Java XML Framework - cocoon-block-slide : Java XML Framework - cocoon-block-slop : Java XML Framework - cocoon-block-stx : Java XML Framework - cocoon-block-taglib : Java XML Framework - cocoon-block-template : Java XML Framework - cocoon-block-velocity : Java XML Framework - cocoon-block-web3 : Java XML Framework - cocoon-block-webdav : Java XML Framework - cocoon-block-xmldb : Java XML Framework - cocoon-block-xsp : Java XML Framework - commons-jelly-tags-ojb : Commons Jelly - db-ojb : ObjectRelationalBridge - db-ojb-from-packages : ObjectRelationalBridge - db-torque : Persistence Layer - forrest : Apache Forrest is an XML standards-oriented documentation fr... - forrest-test : Apache Forrest is an XML standards-oriented documentation fr... - jakarta-cactus-documentation : Cactus Documentation - jakarta-cactus-release-12 : Unit test framework for server-side java code - jakarta-cactus-release-13 : Unit test framework for server-side java code - jakarta-cactus-sample-jetty-13 : Cactus Jetty Sample (J2EE 1.3) - jakarta-cactus-sample-servlet-12 : Cactus Servlet Sample (J2EE 1.2) - jakarta-cactus-sample-servlet-13 : Cactus Servlet Sample (J2EE 1.3) - jakarta-slide : Content Management System based on WebDAV technology - jakarta-tomcat : Servlet 2.2 and JSP 1.1 Reference Implementation - jakarta-tomcat-4.0 : Servlet 2.3 and JSP 1.2 Reference Implementation - jakarta-tomcat-5 : Servlet 2.4 and JSP 2.0 Reference Implementation - jakarta-tomcat-catalina : Servlet 2.4 Reference Implementation - jakarta-tomcat-coyote : Connectors to various web servers - jakarta-tomcat-coyote-tomcat3 : Connectors to various web servers - jakarta-tomcat-coyote-tomcat4 : Connectors to various web servers - jakarta-tomcat-coyote_10 : Connectors to various web servers - jakarta-tomcat-http11 : Connectors to various web servers - jakarta-tomcat-jk : Connectors to various web servers - jakarta-tomcat-util : Connectors to various web servers - jakarta-turbine-jcs : Cache - metro-reflector-blocks-complete : Avalon SVN - test-ojb : ObjectRelationalBridge - tomcat-catalina : Servlet 2.3 and JSP 1.2 Reference Implementation Full details are available at: http://brutus.apache.org/gump/public/jakarta-tomcat-connectors/jakarta-tomcat-util/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Sole output
DO NOT REPLY [Bug 34465] - jasper2 fails when there is no web.xml
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=34465. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=34465 --- Additional Comments From [EMAIL PROTECTED] 2005-04-15 11:01 --- I'm sorry for forgetting to tell you that I was trying to precompile the JSP's. I wrote that I was using ant, so I thought that was enough. If you precompile with jspc, you need to have a web.xml, as all the new servlet declarations will be put there. Otherwise, your precompilation will be useless anyway This is not true. jasper2 has an option called webXmlFragment, which creates part of web.xml, and what we are doing, is joining these webXmlFragments. It worked fine on 5.5.7. Well, I'm working on the code myself now, so I will tell you when I have found a way to fix the problem. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
[GUMP@brutus]: Project jakarta-tomcat-jasper_tc5 (in module jakarta-tomcat-jasper_tc5) 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 [EMAIL PROTECTED] Project jakarta-tomcat-jasper_tc5 has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 9 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - jakarta-tomcat-jasper_tc5 : JavaServer Pages JSP 2.0 implementation (for Tomcat 5.x) Full details are available at: http://brutus.apache.org/gump/public/jakarta-tomcat-jasper_tc5/jakarta-tomcat-jasper_tc5/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -DEBUG- Output [jasper-runtime.jar] identifier set to output basename: [jasper-runtime] -DEBUG- Output [jasper-compiler.jar] identifier set to output basename: [jasper-compiler] -DEBUG- Dependency on ant exists, no need to add for property ant.jar. -INFO- Failed with reason build failed -DEBUG- Extracted fallback artifacts from Gump Repository The following work was performed: http://brutus.apache.org/gump/public/jakarta-tomcat-jasper_tc5/jakarta-tomcat-jasper_tc5/gump_work/build_jakarta-tomcat-jasper_tc5_jakarta-tomcat-jasper_tc5.html Work Name: build_jakarta-tomcat-jasper_tc5_jakarta-tomcat-jasper_tc5 (Type: Build) Work ended in a state of : Failed Elapsed: 4 secs Command Line: java -Djava.awt.headless=true -Xbootclasspath/p:/usr/local/gump/public/workspace/xml-xerces2/java/build/xercesImpl.jar org.apache.tools.ant.Main -Dgump.merge=/home/gump/workspaces2/public/gump/work/merge.xml -Dbuild.sysclasspath=only -Djsp-api.jar=/usr/local/gump/public/workspace/jakarta-servletapi-5/jsr152/dist/lib/jsp-api.jar -Dcommons-el.jar=/usr/local/gump/public/workspace/jakarta-commons/el/dist/commons-el.jar -Djasper-compiler-jdt.jar=/usr/local/gump/public/workspace/cocoon/lib/optional/jdtcore-3.0.2.jar -Dant.jar=/usr/local/gump/public/workspace/ant/dist/lib/ant.jar -Dservlet-api.jar=/usr/local/gump/public/workspace/jakarta-servletapi-5/jsr154/dist/lib/servlet-api.jar -Dcompile.source=1.4 dist [Working Directory: /usr/local/gump/public/workspace/jakarta-tomcat-jasper_tc5/jasper2] CLASSPATH: /opt/jdk1.4/lib/tools.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-swing.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-trax.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-junit.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant-nodeps.jar:/usr/local/gump/public/workspace/ant/dist/lib/ant.jar:/usr/local/gump/public/workspace/jakarta-commons/logging/dist/commons-logging.jar:/usr/local/gump/public/workspace/jakarta-commons/logging/dist/commons-logging-api.jar:/usr/local/gump/public/workspace/jakarta-commons/el/dist/commons-el.jar:/usr/local/gump/public/workspace/jakarta-servletapi-5/jsr154/dist/lib/servlet-api.jar:/usr/local/gump/public/workspace/jakarta-servletapi-5/jsr152/dist/lib/jsp-api.jar:/usr/local/gump/public/workspace/cocoon/lib/optional/jdtcore-3.0.2.jar - Buildfile: build.xml build-prepare: [mkdir] Created dir: /home/gump/workspaces2/public/workspace/jakarta-tomcat-jasper_tc5/jasper2/build [mkdir] Created dir: /home/gump/workspaces2/public/workspace/jakarta-tomcat-jasper_tc5/jasper2/build/bin [mkdir] Created dir: /home/gump/workspaces2/public/workspace/jakarta-tomcat-jasper_tc5/jasper2/build/common/classes [mkdir] Created dir: /home/gump/workspaces2/public/workspace/jakarta-tomcat-jasper_tc5/jasper2/build/common/lib [mkdir] Created dir: /home/gump/workspaces2/public/workspace/jakarta-tomcat-jasper_tc5/jasper2/build/shared/classes [mkdir] Created dir: /home/gump/workspaces2/public/workspace/jakarta-tomcat-jasper_tc5/jasper2/build/shared/lib copy-launcher.jars: build-static: [copy] Copying 4 files to /home/gump/workspaces2/public/workspace/jakarta-tomcat-jasper_tc5/jasper2/build/bin build-only: [javac] Compiling 87 source files to /home/gump/workspaces2/public/workspace/jakarta-tomcat-jasper_tc5/jasper2/build/shared/classes [javac] /home/gump/workspaces2/public/workspace/jakarta-tomcat-jasper_tc5/jasper2/src/share/org/apache/jasper/compiler/JDTCompiler.java:180: cannot resolve symbol [javac] symbol : constructor NameEnvironmentAnswer (org.eclipse.jdt.internal.compiler.env.ICompilationUnit,nulltype) [javac] location: class org.eclipse.jdt.internal.compiler.env.NameEnvironmentAnswer [javac] new NameEnvironmentAnswer(compilationUnit, null); [javac] ^
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
remm2005/04/15 01:58:46
Modified:catalina/src/share/org/apache/catalina/startup
ContextRuleSet.java
webapps/docs changelog.xml
Log:
- Update changelog.
- I don't see the purpose of the copy CL rule, as
ContainerBase.getParentClassLoader will return the parent class loader anyway.
If a custom parent
is set, the rule will dumbly override it, thus it seems it never serves a
useful purpose. Maybe it used to be useful.
Revision ChangesPath
1.16 +2 -3
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/ContextRuleSet.java
Index: ContextRuleSet.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/ContextRuleSet.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ContextRuleSet.java 23 Sep 2004 06:58:52 - 1.15
+++ ContextRuleSet.java 15 Apr 2005 08:58:46 - 1.16
@@ -123,8 +123,7 @@
} else {
digester.addRule(prefix + Context, new
SetContextPropertiesRule());
}
-digester.addRule(prefix + Context,
- new CopyParentClassLoaderRule());
+
if (create) {
digester.addRule(prefix + Context,
new LifecycleListenerRule
1.289 +11 -1 jakarta-tomcat-catalina/webapps/docs/changelog.xml
Index: changelog.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v
retrieving revision 1.288
retrieving revision 1.289
diff -u -r1.288 -r1.289
--- changelog.xml 12 Apr 2005 18:56:47 - 1.288
+++ changelog.xml 15 Apr 2005 08:58:46 - 1.289
@@ -42,9 +42,12 @@
update
Update to JDT from Eclipse 3.1M6, which is now feature complete
(remm)
/update
- update
+ update
Start refactoring, redesign and extend the cluster module (pero)
/update
+ add
+Add Apache Portable Runtime JNI wrapper and helper API (mturk)
+ /add
/changelog
/subsection
@@ -83,6 +86,10 @@
bug10385/bug: SSI Servlet now includes better support for files
that use character
encodings other than the platform default.(markt)
/fix
+ fix
+Remove CopyParentClassLoader rule, which doesn't seem to be doing
anything useful
+anymore. (remm)
+ /fix
/changelog
/subsection
@@ -94,6 +101,9 @@
update
Add some Mbean attributes and operations to ChannelSocket (pero)
/update
+ add
+Add Apache Portable Runtime based HTTP/1.1 protocol handler, without
SSL support (remm)
+ /add
/changelog
/subsection
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
[GUMP@brutus]: Project jakarta-tomcat-jk-native (in module jakarta-tomcat-connectors) 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 [EMAIL PROTECTED] Project jakarta-tomcat-jk-native has an issue affecting its community integration. This issue affects 1 projects, and has been outstanding for 96 runs. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - jakarta-tomcat-jk-native : Connectors to various web servers Full details are available at: http://brutus.apache.org/gump/public/jakarta-tomcat-connectors/jakarta-tomcat-jk-native/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -INFO- Failed with reason build failed The following work was performed: http://brutus.apache.org/gump/public/jakarta-tomcat-connectors/jakarta-tomcat-jk-native/gump_work/build_jakarta-tomcat-connectors_jakarta-tomcat-jk-native.html Work Name: build_jakarta-tomcat-connectors_jakarta-tomcat-jk-native (Type: Build) Work ended in a state of : Failed Elapsed: Command Line: make [Working Directory: /usr/local/gump/public/workspace/jakarta-tomcat-connectors/jk/native] - Making all in common make[1]: Entering directory `/home/gump/workspaces2/public/workspace/jakarta-tomcat-connectors/jk/native/common' /bin/sh /usr/local/gump/public/workspace/apache-httpd/dest-15042005/build/libtool --silent --mode=compile gcc -I/usr/local/gump/public/workspace/apache-httpd/dest-15042005/include -g -O2 -g -O2 -pthread -DHAVE_APR -I/usr/local/gump/public/workspace/apr/dest-15042005/include/apr-1 -g -O2 -DLINUX=2 -D_REENTRANT -D_GNU_SOURCE -D_LARGEFILE64_SOURCE -I/home/gump/workspaces2/public/workspace/apache-httpd/srclib/pcre -I /opt/jdk1.4/include -I /opt/jdk1.4/include/ -c jk_ajp12_worker.c /usr/local/gump/public/workspace/apache-httpd/dest-15042005/build/libtool: /usr/local/gump/public/workspace/apache-httpd/dest-15042005/build/libtool: No such file or directory make[1]: *** [jk_ajp12_worker.lo] Error 127 make[1]: Leaving directory `/home/gump/workspaces2/public/workspace/jakarta-tomcat-connectors/jk/native/common' make: *** [all-recursive] Error 1 - To subscribe to this information via syndicated feeds: - RSS: http://brutus.apache.org/gump/public/jakarta-tomcat-connectors/jakarta-tomcat-jk-native/rss.xml - Atom: http://brutus.apache.org/gump/public/jakarta-tomcat-connectors/jakarta-tomcat-jk-native/atom.xml == Gump Tracking Only === Produced by Gump version 2.2. Gump Run 2315042005, brutus:brutus-public:2315042005 Gump E-mail Identifier (unique within run) #20. -- Apache Gump http://gump.apache.org/ [Instance: brutus] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 34465] - jasper2 fails when there is no web.xml
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=34465. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=34465 --- Additional Comments From [EMAIL PROTECTED] 2005-04-15 11:07 --- Using jspc means using jspc. Using ant means using ant to compile JSP source. Anyway, look in org.apache.jasper.servlet.JspCServletContext. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 34465] - jasper2 fails when there is no web.xml
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=34465.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.
http://issues.apache.org/bugzilla/show_bug.cgi?id=34465
--- Additional Comments From [EMAIL PROTECTED] 2005-04-15 11:22 ---
Well jasper2 could put jsp directive outside web.xml when pre-compiling :
see this ant example:
jasper2
validateXml=false
uriroot=${build.dir}/jspc/myapp
webXmlFragment=${build.dir}/dst/$myapp/WEB-INF/jsp.xml
outputDir=${build.dir}/${wnamei}-src
javaEncoding=ISO-8859-1
trimSpaces=true /
jasper2 jspc will put the jsp URI in jsp.xml, you could at a later time include
in web.xml using !ENTITY jsp SYSTEM jsp.xml and jsp.xml;
?xml version=1.0 encoding=ISO-8859-1?
!DOCTYPE web-app
PUBLIC -//Sun Microsystems, Inc.//DTD Web Application 2.3//EN
http://java.sun.com/dtd/web-app_2_3.dtd; [
!ENTITY jsp SYSTEM jsp.xml
]
web-app
jsp;
/web-app
Be carefull jsp; should be in the servlet-mapping area of your web.xml
--
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net AprEndpoint.java
remm2005/04/15 02:23:37 Modified:util/java/org/apache/tomcat/util/net AprEndpoint.java Log: - Fix package name for the bundle (caused by a last minute move of the class). Revision ChangesPath 1.3 +1 -1 jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java Index: AprEndpoint.java === RCS file: /home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- AprEndpoint.java 14 Apr 2005 23:32:54 - 1.2 +++ AprEndpoint.java 15 Apr 2005 09:23:37 - 1.3 @@ -53,7 +53,7 @@ protected static Log log = LogFactory.getLog(AprEndpoint.class); protected static StringManager sm = -StringManager.getManager(org.apache.tomcat.util.apr.res); +StringManager.getManager(org.apache.tomcat.util.net.res); // - Fields - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: DO NOT REPLY [Bug 34465] - jasper2 fails when there is no web.xml
My question on this thread.
Is it legal to precompile JSPs via Jasper2 when there is no web.xml ?
On 4/15/05, [EMAIL PROTECTED] [EMAIL PROTECTED] wrote:
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=34465.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.
http://issues.apache.org/bugzilla/show_bug.cgi?id=34465
--- Additional Comments From [EMAIL PROTECTED] 2005-04-15 11:22 ---
Well jasper2 could put jsp directive outside web.xml when pre-compiling :
see this ant example:
jasper2
validateXml=false
uriroot=${build.dir}/jspc/myapp
webXmlFragment=${build.dir}/dst/$myapp/WEB-INF/jsp.xml
outputDir=${build.dir}/${wnamei}-src
javaEncoding=ISO-8859-1
trimSpaces=true /
jasper2 jspc will put the jsp URI in jsp.xml, you could at a later time
include
in web.xml using !ENTITY jsp SYSTEM jsp.xml and jsp.xml;
?xml version=1.0 encoding=ISO-8859-1?
!DOCTYPE web-app
PUBLIC -//Sun Microsystems, Inc.//DTD Web Application 2.3//EN
http://java.sun.com/dtd/web-app_2_3.dtd; [
!ENTITY jsp SYSTEM jsp.xml
]
web-app
jsp;
/web-app
Be carefull jsp; should be in the servlet-mapping area of your web.xml
--
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 34465] - jasper2 fails when there is no web.xml
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=34465.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.
http://issues.apache.org/bugzilla/show_bug.cgi?id=34465
--- Additional Comments From [EMAIL PROTECTED] 2005-04-15 11:28 ---
(In reply to comment #6)
Anyway, look in org.apache.jasper.servlet.JspCServletContext.
As you said, I looked at JspCServletContext#getRealPath and
JspCServletContext#getResource. They just generates a new URL, and does not
check the existents of the actual file.
In 5.5.7, getResourceAsStream was used insted of getResource, and the
implementation of getResourceAsStream is as below.
public InputStream getResourceAsStream(String path) {
try {
return (getResource(path).openStream());
} catch (Throwable t) {
return (null);
}
}
Since Throwable is caught, FileNotFoundException will not be raised to
processWebDotXml.
Well the easiest way to fix this problem, is modifiy
is = uri.openStream();
to
try {
is = uri.openStream();
} catch (java.io.FileNotFoundException ex) {
return;
}
or maybe catch a Throwable, as it does in getResourceAsStream.
I modified JspConfig.java on my local machine as above, and it correctly worked
as I wanted.
--
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: DO NOT REPLY [Bug 34465] - jasper2 fails when there is no web.xml
Well the patch seems reasonable to be commited.
Could I Remy ?
On 4/15/05, [EMAIL PROTECTED] [EMAIL PROTECTED] wrote:
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=34465.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.
http://issues.apache.org/bugzilla/show_bug.cgi?id=34465
--- Additional Comments From [EMAIL PROTECTED] 2005-04-15 11:28 ---
(In reply to comment #6)
Anyway, look in org.apache.jasper.servlet.JspCServletContext.
As you said, I looked at JspCServletContext#getRealPath and
JspCServletContext#getResource. They just generates a new URL, and does not
check the existents of the actual file.
In 5.5.7, getResourceAsStream was used insted of getResource, and the
implementation of getResourceAsStream is as below.
public InputStream getResourceAsStream(String path) {
try {
return (getResource(path).openStream());
} catch (Throwable t) {
return (null);
}
}
Since Throwable is caught, FileNotFoundException will not be raised to
processWebDotXml.
Well the easiest way to fix this problem, is modifiy
is = uri.openStream();
to
try {
is = uri.openStream();
} catch (java.io.FileNotFoundException ex) {
return;
}
or maybe catch a Throwable, as it does in getResourceAsStream.
I modified JspConfig.java on my local machine as above, and it correctly
worked
as I wanted.
--
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: DO NOT REPLY [Bug 34465] - jasper2 fails when there is no web.xml
Henri Gomez wrote: Well the patch seems reasonable to be commited. Could I Remy ? It's a bad patch. getResource should return correct results instead. Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
hello
It's the long-awaited film version of the Broadway hit. The message sent as a binary attachment. ** ** WARNING: Panda Antivirus GateDefender has detected a virus in file attached to this e-mail message! The attachment has been automatically removed to protect your network. Panda Antivirus GateDefender Administrator: [EMAIL PROTECTED] 04/15/05 18:53:40 Panda Antivirus GateDefender (Version 5.1 R1c (5.0.60.2)) - http://www.pandasoftware.com/ Antivirus Vendor: Panda Software Scan Engine Version: 4.1.4.307 Pattern File Version: 3.93703 (Timestamp: 15/04/2005 025025) Machine name: epoc-F6-7200 Machine IP address: 192.168.70.13 Server: 192.168.70.3 Client: 221.253.199.172 Protocol: SMTP Virus: W32/Lovgate.AC.worm found! Attachment: readme.zip ** ** - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: DO NOT REPLY [Bug 34465] - jasper2 fails when there is no web.xml
Yes, do you plan a fix ? On 4/15/05, Remy Maucherat [EMAIL PROTECTED] wrote: Henri Gomez wrote: Well the patch seems reasonable to be commited. Could I Remy ? It's a bad patch. getResource should return correct results instead. Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jni/native/src file.c
mturk 2005/04/15 03:14:20
Modified:jni/native/src file.c
Log:
Use negative values for errors instead throwing exeptions.
Revision ChangesPath
1.3 +55 -33jakarta-tomcat-connectors/jni/native/src/file.c
Index: file.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/src/file.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- file.c17 Jan 2005 07:21:13 - 1.2
+++ file.c15 Apr 2005 10:14:20 - 1.3
@@ -249,6 +249,7 @@
{
apr_file_t *f = J2P(file, apr_file_t *);
char ch;
+
UNREFERENCED_STDARGS;
TCN_THROW_IF_ERR(apr_file_getc(ch, f), ch);
@@ -278,38 +279,44 @@
}
TCN_IMPLEMENT_CALL(jint, File, write)(TCN_STDARGS, jlong file,
- jbyteArray buf, jint towrite)
+ jbyteArray buf, jint offset, jint
towrite)
{
apr_file_t *f = J2P(file, apr_file_t *);
apr_size_t nbytes = (*e)-GetArrayLength(e, buf);
jbyte *bytes = (*e)-GetPrimitiveArrayCritical(e, buf, NULL);
+apr_status_t ss;
UNREFERENCED(o);
if (towrite 0)
-nbytes = min(nbytes, (apr_size_t)towrite);
-TCN_THROW_IF_ERR(apr_file_write(f, bytes, nbytes), nbytes);
+nbytes = min(nbytes - offset, (apr_size_t)towrite);
+ss = apr_file_write(f, bytes + offset, nbytes);
-cleanup:
(*e)-ReleasePrimitiveArrayCritical(e, buf, bytes, JNI_ABORT);
-return (jint)nbytes;
+if (ss == APR_SUCCESS)
+return (jint)nbytes;
+else
+return -(jint)ss;
}
TCN_IMPLEMENT_CALL(jint, File, writeFull)(TCN_STDARGS, jlong file,
- jbyteArray buf, jint towrite)
+ jbyteArray buf, jint offset, jint
towrite)
{
apr_file_t *f = J2P(file, apr_file_t *);
apr_size_t nbytes = (*e)-GetArrayLength(e, buf);
apr_size_t written = 0;
+apr_status_t ss;
jbyte *bytes = (*e)-GetByteArrayElements(e, buf, NULL);
UNREFERENCED(o);
if (towrite 0)
-nbytes = min(nbytes, (apr_size_t)towrite);
-TCN_THROW_IF_ERR(apr_file_write_full(f, bytes, nbytes, written),
nbytes);
+nbytes = min(nbytes + offset, (apr_size_t)towrite);
+ss = apr_file_write_full(f, bytes + offset, nbytes, written);
-cleanup:
(*e)-ReleaseByteArrayElements(e, buf, bytes, JNI_ABORT);
-return (jint)written;
+if (ss == APR_SUCCESS)
+return (jint)written;
+else
+return -(jint)ss;
}
TCN_IMPLEMENT_CALL(jint, File, writev)(TCN_STDARGS, jlong file,
@@ -321,6 +328,7 @@
struct iovec vec[APR_MAX_IOVEC_SIZE];
jobject ba[APR_MAX_IOVEC_SIZE];
apr_size_t written = 0;
+apr_status_t ss;
UNREFERENCED(o);
@@ -334,13 +342,15 @@
vec[i].iov_base = (*e)-GetByteArrayElements(e, ba[i], NULL);
}
-TCN_THROW_IF_ERR(apr_file_writev(f, vec, nvec, written), i);
+ss = apr_file_writev(f, vec, nvec, written);
-cleanup:
for (i = 0; i nvec; i++) {
(*e)-ReleaseByteArrayElements(e, ba[i], vec[i].iov_base, JNI_ABORT);
}
-return (jint)written;
+if (ss == APR_SUCCESS)
+return (jint)written;
+else
+return -(jint)ss;
}
TCN_IMPLEMENT_CALL(jint, File, writevFull)(TCN_STDARGS, jlong file,
@@ -352,6 +362,7 @@
struct iovec vec[APR_MAX_IOVEC_SIZE];
jobject ba[APR_MAX_IOVEC_SIZE];
apr_size_t written = 0;
+apr_status_t ss;
UNREFERENCED(o);
@@ -365,58 +376,69 @@
vec[i].iov_base = (*e)-GetByteArrayElements(e, ba[i], NULL);
}
#if (APR_VERSION_MAJOR = 1) (APR_VERSION_MINOR = 1)
-TCN_THROW_IF_ERR(apr_file_writev_full(f, vec, nvec, written), i);
+ss = apr_file_writev_full(f, vec, nvec, written);
#else
-TCN_THROW_IF_ERR(apr_file_writev(f, vec, nvec, written), i);
+ss = apr_file_writev(f, vec, nvec, written);
#endif
-cleanup:
for (i = 0; i nvec; i++) {
(*e)-ReleaseByteArrayElements(e, ba[i], vec[i].iov_base,
JNI_ABORT);
}
-return (jint)written;
+if (ss == APR_SUCCESS)
+return (jint)written;
+else
+return -(jint)ss;
}
TCN_IMPLEMENT_CALL(jint, File, read)(TCN_STDARGS, jlong file,
- jbyteArray buf, jint toread)
+ jbyteArray buf, jint offset,
+ jint toread)
{
apr_file_t *f = J2P(file, apr_file_t *);
apr_size_t nbytes = (*e)-GetArrayLength(e, buf);
jbyte *bytes = (*e)-GetByteArrayElements(e, buf, NULL);
+apr_status_t ss;
cvs commit: jakarta-tomcat-connectors/jni/native/src poll.c
mturk 2005/04/15 03:14:47
Modified:jni/native/src poll.c
Log:
Add setter and getter for poller time to live
Revision ChangesPath
1.5 +21 -6 jakarta-tomcat-connectors/jni/native/src/poll.c
Index: poll.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/src/poll.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- poll.c14 Apr 2005 06:47:56 - 1.4
+++ poll.c15 Apr 2005 10:14:46 - 1.5
@@ -60,9 +60,9 @@
TCN_IMPLEMENT_CALL(jint, Poll, destroy)(TCN_STDARGS, jlong pollset)
{
-tcn_pollset_t *p = J2P(pollset, tcn_pollset_t *);;
+tcn_pollset_t *p = J2P(pollset, tcn_pollset_t *);
-UNREFERENCED_STDARGS;;
+UNREFERENCED_STDARGS;
return (jint)apr_pollset_destroy(p-pollset);
}
@@ -99,7 +99,7 @@
apr_pollfd_t fd;
apr_int32_t i;
-UNREFERENCED_STDARGS;;
+UNREFERENCED_STDARGS;
memset(fd, 0, sizeof(apr_pollfd_t));
fd.desc_type = APR_POLL_SOCKET;
@@ -172,20 +172,35 @@
TCN_IMPLEMENT_CALL(jlong, Poll, socket)(TCN_STDARGS, jlong pollfd)
{
apr_pollfd_t *fd = J2P(pollfd, apr_pollfd_t *);
-UNREFERENCED_STDARGS;;
+UNREFERENCED_STDARGS;
return P2J(fd-desc.s);
}
TCN_IMPLEMENT_CALL(jlong, Poll, data)(TCN_STDARGS, jlong pollfd)
{
apr_pollfd_t *fd = J2P(pollfd, apr_pollfd_t *);
-UNREFERENCED_STDARGS;;
+UNREFERENCED_STDARGS;
return P2J(fd-client_data);
}
TCN_IMPLEMENT_CALL(jint, Poll, events)(TCN_STDARGS, jlong pollfd)
{
apr_pollfd_t *fd = J2P(pollfd, apr_pollfd_t *);
-UNREFERENCED_STDARGS;;
+UNREFERENCED_STDARGS;
return (jint)fd-rtnevents;
}
+
+TCN_IMPLEMENT_CALL(void, Poll, setTtl)(TCN_STDARGS, jlong pollset,
+ jlong ttl)
+{
+tcn_pollset_t *p = J2P(pollset, tcn_pollset_t *);
+UNREFERENCED_STDARGS;
+p-max_ttl = J2T(ttl);
+}
+
+TCN_IMPLEMENT_CALL(jlong, Poll, getTtl)(TCN_STDARGS, jlong pollset)
+{
+tcn_pollset_t *p = J2P(pollset, tcn_pollset_t *);
+UNREFERENCED_STDARGS;
+return (jlong)p-max_ttl;
+}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni Poll.java
mturk 2005/04/15 03:15:07 Modified:jni/java/org/apache/tomcat/jni Poll.java Log: Add setter and getter for poller time to live. Revision ChangesPath 1.6 +15 -1 jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni/Poll.java Index: Poll.java === RCS file: /home/cvs/jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni/Poll.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- Poll.java 14 Apr 2005 06:47:56 - 1.5 +++ Poll.java 15 Apr 2005 10:15:07 - 1.6 @@ -118,5 +118,19 @@ * @param polldesc The pollset decriptor to use */ public static native int events(long polldesc); + +/** + * Set the socket time to live. + * @param pollset The pollset to use + * @param ttl Timeout in microseconds + */ +public static native void setTtl(long pollset, long ttl); + +/** + * Get the socket time to live. + * @param pollset The pollset to use + * @return Timeout in microseconds + */ +public static native long getTtl(long pollset); } - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni File.java
mturk 2005/04/15 03:15:28 Modified:jni/java/org/apache/tomcat/jni File.java Log: Use negative values for errors instead throwing exeptions. Revision ChangesPath 1.3 +8 -15 jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni/File.java Index: File.java === RCS file: /home/cvs/jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni/File.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- File.java 14 Jan 2005 14:42:37 - 1.2 +++ File.java 15 Apr 2005 10:15:28 - 1.3 @@ -349,8 +349,7 @@ * @param nbytes The number of bytes to write; (-1) for full array. * @return The number of bytes written. */ -public static native int write(long thefile, byte[] buf, int nbytes) -throws Error; +public static native int write(long thefile, byte[] buf, int offset, int nbytes); /** * Write data to the specified file, ensuring that all of the data is @@ -372,9 +371,7 @@ * @param nbytes The number of bytes to write; (-1) for full array. * @return The number of bytes written. */ -public static native int writeFull(long thefile, byte[] buf, int nbytes) -throws Error; - +public static native int writeFull(long thefile, byte[] buf, int offset, int nbytes); /** * Write data from aray of byte arrays to the specified file. @@ -388,8 +385,7 @@ * @param vec The array from which to get the data to write to the file. * @return The number of bytes written. */ -public static native int writev(long thefile, byte[][] vec) -throws Error; +public static native int writev(long thefile, byte[][] vec); /** * Write data from aray of byte arrays to the specified file, @@ -401,8 +397,7 @@ * @param vec The array from which to get the data to write to the file. * @return The number of bytes written. */ -public static native int writevFull(long thefile, byte[][] vec) -throws Error; +public static native int writevFull(long thefile, byte[][] vec); /** * Read data from the specified file. @@ -421,8 +416,7 @@ * @param nbytes The number of bytes to read (-1) for full array. * @return the number of bytes read. */ -public static native int read(long thefile, byte[] buf, int nbytes) -throws Error; +public static native int read(long thefile, byte[] buf, int offset, int nbytes); /** * Read data from the specified file, ensuring that the buffer is filled @@ -444,8 +438,7 @@ * @param nbytes The number of bytes to read (-1) for full array. * @return the number of bytes read. */ -public static native int readFull(long thefile, byte[] buf, int nbytes) -throws Error; +public static native int readFull(long thefile, byte[] buf, int offset, int nbytes); /** * Read a string from the specified file. @@ -453,7 +446,7 @@ * @param buf The buffer to store the string in. * @param thefile The file descriptor to read from */ -public static native int gets(byte[] buf, long thefile); +public static native int gets(byte[] buf, int offset, long thefile); /** - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni Status.java
mturk 2005/04/15 03:15:55
Modified:jni/java/org/apache/tomcat/jni Status.java
Log:
Add ETIMEDOUT flag check.
Revision ChangesPath
1.4 +2 -1
jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni/Status.java
Index: Status.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni/Status.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Status.java 14 Apr 2005 16:40:24 - 1.3
+++ Status.java 15 Apr 2005 10:15:55 - 1.4
@@ -247,5 +247,6 @@
/* Socket errors */
public static final boolean APR_STATUS_IS_EAGAIN(int s) { return
is(s, 90); }
-
+public static final boolean APR_STATUS_IS_ETIMEDOUT(int s) { return
is(s, 91); }
+
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jni/native/src error.c
mturk 2005/04/15 03:16:05 Modified:jni/native/src error.c Log: Add ETIMEDOUT flag check. Revision ChangesPath 1.3 +1 -1 jakarta-tomcat-connectors/jni/native/src/error.c Index: error.c === RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/src/error.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- error.c 14 Apr 2005 16:41:34 - 1.2 +++ error.c 15 Apr 2005 10:16:05 - 1.3 @@ -180,7 +180,7 @@ APR_IS(75, APR_STATUS_IS_EBUSY); /* Socket errors */ APR_IS(90, APR_STATUS_IS_EAGAIN); - +APR_IS(91, APR_STATUS_IS_ETIMEDOUT); } return JNI_FALSE; } - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Tomcat and APR
Henri Gomez wrote: Well I've no problems with using APR if we could still use a pure Java implementation. Some may not have APR on their boxes, or an incorrect version of APR, or an invalid APR configuration (ie not multi-threaded). Remember mod_webapp and the reasons why it failed, ie too many peoples couldn't get the correct APR for there machine. A the time of mod_webapp APR was not stable enough, now this has improved a lot. So if we could make it configurable, via server.xml for example, using APR seems a great idea. On 4/14/05, Yoav Shapira [EMAIL PROTECTED] wrote: Hi, Apologies if I missed it, but I've seen responses to Yoav's and Peter's posts, but I have yet to see anything about Jess' NIO question. Since I agree with his observations, I was wondering if a reponse was in the works? (I assume it'll say something like, Yes, a Java NIO solution could very well provide enough improvements, but APR is already written, fully-established, and field- tested.) Just curious. In addition to Remy's response, you may want to search the message archives for this list. We've discussed NIO many times in the past in good depth. Yoav - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Tomcat and APR
I've got no problem with APR stability but availability in the correct version for some OS, ie iSeries or ... BS2000 :) On 4/15/05, jean-frederic clere [EMAIL PROTECTED] wrote: Henri Gomez wrote: Well I've no problems with using APR if we could still use a pure Java implementation. Some may not have APR on their boxes, or an incorrect version of APR, or an invalid APR configuration (ie not multi-threaded). Remember mod_webapp and the reasons why it failed, ie too many peoples couldn't get the correct APR for there machine. A the time of mod_webapp APR was not stable enough, now this has improved a lot. So if we could make it configurable, via server.xml for example, using APR seems a great idea. On 4/14/05, Yoav Shapira [EMAIL PROTECTED] wrote: Hi, Apologies if I missed it, but I've seen responses to Yoav's and Peter's posts, but I have yet to see anything about Jess' NIO question. Since I agree with his observations, I was wondering if a reponse was in the works? (I assume it'll say something like, Yes, a Java NIO solution could very well provide enough improvements, but APR is already written, fully-established, and field- tested.) Just curious. In addition to Remy's response, you may want to search the message archives for this list. We've discussed NIO many times in the past in good depth. Yoav - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jni/native/src network.c
mturk 2005/04/15 03:26:19
Modified:jni/java/org/apache/tomcat/jni Socket.java
jni/native/src network.c
Log:
Added timeout reads for recv and recvb.
Revision ChangesPath
1.6 +48 -1
jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni/Socket.java
Index: Socket.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni/Socket.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Socket.java 14 Apr 2005 16:41:08 - 1.5
+++ Socket.java 15 Apr 2005 10:26:19 - 1.6
@@ -264,6 +264,30 @@
public static native int recv(long sock, byte[] buf, int offset, int
nbytes);
/**
+ * Read data from a network with timeout.
+ *
+ * PRE
+ * This functions acts like a blocking read by default. To change
+ * this behavior, use apr_socket_timeout_set() or the APR_SO_NONBLOCK
+ * socket option.
+ * The number of bytes actually received is stored in argument 3.
+ *
+ * It is possible for both bytes to be received and an APR_EOF or
+ * other error to be returned.
+ *
+ * APR_EINTR is never returned.
+ * /PRE
+ * @param sock The socket to read the data from.
+ * @param buf The buffer to store the data in.
+ * @param offset Offset in the byte buffer.
+ * @param nbytes The number of bytes to read (-1) for full array.
+ * @param timeout The socket timeout in microseconds.
+ * @return the number of bytes received.
+ */
+public static native int recvt(long sock, byte[] buf, int offset,
+ int nbytes, long timeout);
+
+/**
* Read data from a network.
*
* PRE
@@ -286,6 +310,29 @@
public static native int recvb(long sock, ByteBuffer buf,
int offset, int nbytes);
+/**
+ * Read data from a network with timeout.
+ *
+ * PRE
+ * This functions acts like a blocking read by default. To change
+ * this behavior, use apr_socket_timeout_set() or the APR_SO_NONBLOCK
+ * socket option.
+ * The number of bytes actually received is stored in argument 3.
+ *
+ * It is possible for both bytes to be received and an APR_EOF or
+ * other error to be returned.
+ *
+ * APR_EINTR is never returned.
+ * /PRE
+ * @param sock The socket to read the data from.
+ * @param buf The buffer to store the data in.
+ * @param offset Offset in the byte buffer.
+ * @param nbytes The number of bytes to read (-1) for full array.
+ * @param timeout The socket timeout in microseconds.
+ * @return the number of bytes received.
+ */
+public static native int recvbt(long sock, ByteBuffer buf,
+int offset, int nbytes, long timeout);
/**
* @param from The apr_sockaddr_t to fill in the recipient info
1.6 +64 -0 jakarta-tomcat-connectors/jni/native/src/network.c
Index: network.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/src/network.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- network.c 14 Apr 2005 16:41:24 - 1.5
+++ network.c 15 Apr 2005 10:26:19 - 1.6
@@ -313,6 +313,36 @@
return -(jint)ss;
}
+TCN_IMPLEMENT_CALL(jint, Socket, recvt)(TCN_STDARGS, jlong sock,
+jbyteArray buf, jint offset,
+jint toread, jlong timeout)
+{
+apr_socket_t *s = J2P(sock, apr_socket_t *);
+apr_size_t nbytes = (*e)-GetArrayLength(e, buf);
+jbyte *bytes = (*e)-GetByteArrayElements(e, buf, NULL);
+apr_status_t ss;
+apr_interval_time_t t;
+
+UNREFERENCED(o);
+
+if (toread 0)
+nbytes = min(nbytes - offset, (apr_size_t)toread);
+if ((ss = apr_socket_timeout_get(s, t)) != APR_SUCCESS)
+goto cleanup;
+if ((ss = apr_socket_timeout_set(s, J2T(timeout))) != APR_SUCCESS)
+goto cleanup;
+ss = apr_socket_recv(s, bytes + offset, nbytes);
+/* Resore the original timeout */
+apr_socket_timeout_set(s, t);
+cleanup:
+(*e)-ReleaseByteArrayElements(e, buf, bytes,
+ nbytes ? 0 : JNI_ABORT);
+if (ss == APR_SUCCESS)
+return (jint)nbytes;
+else
+return -(jint)ss;
+}
+
TCN_IMPLEMENT_CALL(jint, Socket, recvb)(TCN_STDARGS, jlong sock,
jobject buf, jint offset, jint len)
{
@@ -339,6 +369,40 @@
return -(jint)ss;
}
+TCN_IMPLEMENT_CALL(jint, Socket,
DO NOT REPLY [Bug 34465] - jasper2 fails when there is no web.xml
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=34465. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=34465 --- Additional Comments From [EMAIL PROTECTED] 2005-04-15 12:32 --- Created an attachment (id=14728) -- (http://issues.apache.org/bugzilla/attachment.cgi?id=14728action=view) A patch to catch the Exception raised from uri.openStream() This is a propsed patch for this bug. Just catch Throwable as JspCServletContext#getResourceAsStream does so. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Tomcat and APR
Henri Gomez wrote: I've got no problem with APR stability but availability in the correct version for some OS, ie iSeries or ... BS2000 :) Right there is also the thread libraries APR should use the same the JMV is using (no always easy to find). On 4/15/05, jean-frederic clere [EMAIL PROTECTED] wrote: Henri Gomez wrote: Well I've no problems with using APR if we could still use a pure Java implementation. Some may not have APR on their boxes, or an incorrect version of APR, or an invalid APR configuration (ie not multi-threaded). Remember mod_webapp and the reasons why it failed, ie too many peoples couldn't get the correct APR for there machine. A the time of mod_webapp APR was not stable enough, now this has improved a lot. So if we could make it configurable, via server.xml for example, using APR seems a great idea. On 4/14/05, Yoav Shapira [EMAIL PROTECTED] wrote: Hi, Apologies if I missed it, but I've seen responses to Yoav's and Peter's posts, but I have yet to see anything about Jess' NIO question. Since I agree with his observations, I was wondering if a reponse was in the works? (I assume it'll say something like, Yes, a Java NIO solution could very well provide enough improvements, but APR is already written, fully-established, and field- tested.) Just curious. In addition to Remy's response, you may want to search the message archives for this list. We've discussed NIO many times in the past in good depth. Yoav - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 34471] New: - Java-Request-Attribut java.security.cert.X509Certificate = null
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=34471.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.
http://issues.apache.org/bugzilla/show_bug.cgi?id=34471
Summary: Java-Request-Attribut
java.security.cert.X509Certificate = null
Product: Tomcat 4
Version: 4.1.27
Platform: Other
OS/Version: Linux
Status: NEW
Severity: major
Priority: P2
Component: Connector:JK/AJP
AssignedTo: tomcat-dev@jakarta.apache.org
ReportedBy: [EMAIL PROTECTED]
Apache2.0.48-128 with modjk and Tomcat 4.1.27-37
Java-Request-Attribut java.security.cert.X509Certificate returns null
%
java.security.Principal principal = request.getUserPrincipal();
if (principal == null) {
out.println(request.getUserPrincipal() == null);
} else {
out.println(principal.getName() = + principal.getName());
}
%
Plattform: IBM PowerPC
OS: SLES9
JDK: IBM 1.4.2
--
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jni/native BUILDING
jfclere 2005/04/15 05:36:05 Added: jni/native BUILDING Log: Just some hints to help building. Revision ChangesPath 1.1 jakarta-tomcat-connectors/jni/native/BUILDING Index: BUILDING === Building from the cvs tree: chmod a+x build/get-version.sh sh buildconf --with-apr=apr_source_location. configure --with-apr=apr_install_location. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11 Http11AprProcessor.java InternalAprInputBuffer.java
remm2005/04/15 06:46:11
Modified:http11/src/java/org/apache/coyote/http11
Http11AprProcessor.java InternalAprInputBuffer.java
Log:
- Fix my hack thanks to a trick from Mladen. Now performance is actually
decent.
Revision ChangesPath
1.2 +0 -24
jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11AprProcessor.java
Index: Http11AprProcessor.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11AprProcessor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Http11AprProcessor.java 14 Apr 2005 18:52:28 - 1.1
+++ Http11AprProcessor.java 15 Apr 2005 13:46:11 - 1.2
@@ -745,30 +745,6 @@
int keepAliveLeft = maxKeepAliveRequests;
long soTimeout = endpoint.getSoTimeout();
-// FIXME: Should not be needed
-/*
-long oldSoTimeout = soTimeout;
-int threadRatio = (endpoint.getCurrentThreadsBusy() * 100)
-/ endpoint.getMaxThreads();
-if ((threadRatio 33) (threadRatio = 66)) {
-soTimeout = soTimeout / 2;
-} else if ((threadRatio 66) (threadRatio = 90)) {
-soTimeout = soTimeout / 3;
-keepAliveLeft = 1;
-} else if (threadRatio 90) {
-soTimeout = soTimeout / 20;
-keepAliveLeft = 1;
-}
-
-if (soTimeout != oldSoTimeout) {
-try {
-Socket.timeoutSet(socket, soTimeout);
-} catch (Throwable t) {
-log.debug(Error setting timeout, t);
-error = true;
-}
-}*/
-
boolean keptAlive = false;
boolean openSocket = false;
1.3 +8 -28
jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/InternalAprInputBuffer.java
Index: InternalAprInputBuffer.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/InternalAprInputBuffer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- InternalAprInputBuffer.java 14 Apr 2005 20:09:16 - 1.2
+++ InternalAprInputBuffer.java 15 Apr 2005 13:46:11 - 1.3
@@ -387,26 +387,16 @@
// Skipping blank lines
//
-if (keptAlive pos = lastValid) {
-Socket.timeoutSet(socket, 0);
-}
-
byte chr = 0;
do {
// Read new bytes if needed
if (pos = lastValid) {
if (keptAlive) {
-// Set socket in non blocking mode and try to read
-int attempts = 0;
-try {
-while (attempts 3 !fill()) {
-Thread.sleep(2);
-attempts++;
-}
-} catch (InterruptedException e) {
-// FIXME: do something
-e.printStackTrace();
+// Do a simple read with a short timeout
+int nRead = Socket.recvt(socket, buf, pos, buf.length -
lastValid, 5);
+if (nRead 0) {
+lastValid = pos + nRead;
}
if (pos = lastValid) {
return false;
@@ -427,26 +417,16 @@
start = pos;
if (keptAlive pos = lastValid) {
-// Set socket in non blocking mode and try to read
-int attempts = 0;
-try {
-while (attempts 3 !fill()) {
-Thread.sleep(2);
-attempts++;
-}
-} catch (InterruptedException e) {
-// FIXME: do something
-e.printStackTrace();
+// Do a simple read with a short timeout
+int nRead = Socket.recvt(socket, buf, pos, buf.length -
lastValid, 5);
+if (nRead 0) {
+lastValid = pos + nRead;
}
if (pos = lastValid) {
return false;
}
}
-if (keptAlive) {
-Socket.timeoutSet(socket, timeout);
-}
-
//
// Reading the method name
// Method name is always US-ASCII
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jni/examples/org/apache/tomcat/jni Echo.java
jfclere 2005/04/15 07:24:53
Modified:jni/examples/org/apache/tomcat/jni Echo.java
Log:
Quick hack to get it compiled.
Revision ChangesPath
1.3 +6 -4
jakarta-tomcat-connectors/jni/examples/org/apache/tomcat/jni/Echo.java
Index: Echo.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jni/examples/org/apache/tomcat/jni/Echo.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Echo.java 14 Apr 2005 06:46:28 - 1.2
+++ Echo.java 15 Apr 2005 14:24:53 - 1.3
@@ -51,8 +51,8 @@
props.load(is);
is.close();
echoAddr = props.getProperty(echo.ip, 127.0.0.1);
-echoPort = Integer.decode(props.getProperty(echo.port, 23));
-echoNmax = Integer.decode(props.getProperty(echo.max, 1));
+echoPort = Integer.decode(props.getProperty(echo.port,
23)).intValue();
+echoNmax = Integer.decode(props.getProperty(echo.max,
1)).intValue();
}
catch (Throwable t) {
; // Nothing
@@ -159,15 +159,17 @@
worker.start();
}
}
+/* XXX: JFC quick hack
catch(Error err ) {
if (Status.APR_STATUS_IS_TIMEUP(err.getError())) {
-/* TODO: deal with timeout */
+/0 TODO: deal with timeout 0/
}
else {
err.printStackTrace();
break;
}
}
+ */
catch( Exception ex ) {
ex.printStackTrace();
break;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 34474] New: - Problem with // in url
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=34474.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.
http://issues.apache.org/bugzilla/show_bug.cgi?id=34474
Summary: Problem with // in url
Product: Tomcat 5
Version: 5.0.28
Platform: Other
OS/Version: Linux
Status: NEW
Severity: normal
Priority: P2
Component: Connector:AJP
AssignedTo: tomcat-dev@jakarta.apache.org
ReportedBy: [EMAIL PROTECTED]
I had a webapp running on a tomcat 5.0.28 and visible through the ajp/1.3
connector via apache
This webapp generates urls to itself with // in them. When it is configured to
access the tomcat via the http connector it works correctly, but when it is
configured to operate via the ajp connector, the url is not reached.
I've noticed that this webapps works correctly on mod_jk 1.2.5.
I've had this problem on mod_jk 1.2.10
Having spent all the day to debug this problem, I think I've figured where it
hides.
The code in mod_jk.c uses ap_no2slash(clean_uri) to remove double slashes in
jk_translate(). I think this happens registering workers base url to be fetched
later at the time to forward the uris.
Adding an ap_no2slash() in /jk/native/common/jk_uri_worker_map.c seems to fix
the problem. I don't know if this is right, because I've got almost no knowledge
of jk or apache internals. But now it seems to be working. Here is a patch:
--- jk_uri_worker_map.c.old 2005-04-15 14:49:10.0 +
+++ jk_uri_worker_map.c 2005-04-15 11:05:23.0 +
@@ -454,6 +454,10 @@
if (JK_IS_DEBUG_LEVEL(l))
jk_log(l, JK_LOG_DEBUG, Attempting to map URI '%s' from %d maps,
uri, uw_map-size);
+ap_no2slash(uri);
+if (JK_IS_DEBUG_LEVEL(l))
+jk_log(l, JK_LOG_DEBUG, Attempting to map URI '%s' from %d maps,
+ uri, uw_map-size);
for (i = 0; i uw_map-size; i++) {
uri_worker_record_t *uwr = uw_map-maps[i];
--
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 34475] New: - Problem with // in url
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://issues.apache.org/bugzilla/show_bug.cgi?id=34475.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.
http://issues.apache.org/bugzilla/show_bug.cgi?id=34475
Summary: Problem with // in url
Product: Tomcat 5
Version: 5.0.28
Platform: Other
OS/Version: Linux
Status: NEW
Severity: normal
Priority: P2
Component: Connector:AJP
AssignedTo: tomcat-dev@jakarta.apache.org
ReportedBy: [EMAIL PROTECTED]
I had a webapp running on a tomcat 5.0.28 and visible through the ajp/1.3
connector via apache
This webapp generates urls to itself with // in them. When it is configured to
access the tomcat via the http connector it works correctly, but when it is
configured to operate via the ajp connector, the url is not reached.
I've noticed that this webapps works correctly on mod_jk 1.2.5.
I've had this problem on mod_jk 1.2.10
Having spent all the day to debug this problem, I think I've figured where it
hides.
The code in mod_jk.c uses ap_no2slash(clean_uri) to remove double slashes in
jk_translate(). I think this happens registering workers base url to be fetched
later at the time to forward the uris.
Adding an ap_no2slash() in /jk/native/common/jk_uri_worker_map.c seems to fix
the problem. I don't know if this is right, because I've got almost no knowledge
of jk or apache internals. But now it seems to be working. Here is a patch:
--- jk_uri_worker_map.c.old 2005-04-15 14:49:10.0 +
+++ jk_uri_worker_map.c 2005-04-15 11:05:23.0 +
@@ -454,6 +454,10 @@
if (JK_IS_DEBUG_LEVEL(l))
jk_log(l, JK_LOG_DEBUG, Attempting to map URI '%s' from %d maps,
uri, uw_map-size);
+ap_no2slash(uri);
+if (JK_IS_DEBUG_LEVEL(l))
+jk_log(l, JK_LOG_DEBUG, Attempting to map URI '%s' from %d maps,
+ uri, uw_map-size);
for (i = 0; i uw_map-size; i++) {
uri_worker_record_t *uwr = uw_map-maps[i];
--
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 34475] - Problem with // in url
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=34475. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=34475 [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||DUPLICATE --- Additional Comments From [EMAIL PROTECTED] 2005-04-15 17:06 --- *** This bug has been marked as a duplicate of 34474 *** -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 34474] - Problem with // in url
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=34474. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=34474 --- Additional Comments From [EMAIL PROTECTED] 2005-04-15 17:06 --- *** Bug 34475 has been marked as a duplicate of this bug. *** -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-connectors/jni/native BUILDING
[EMAIL PROTECTED] wrote: Building from the cvs tree: chmod a+x build/get-version.sh Need the chmod a+x build/get-version.sh too. BTW, do you know how to set the modes in CVS so they'll get checkout correctly? Regards, Mlade. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-connectors/jni/examples/org/apache/tomcat/jni Echo.java
???
[EMAIL PROTECTED] wrote:jfclere 2005/04/15 07:24:53
Modified: jni/examples/org/apache/tomcat/jni Echo.java
Log:
Quick hack to get it compiled.
Revision Changes Path
1.3 +6 -4 jakarta-tomcat-connectors/jni/examples/org/apache/tomcat/jni/Echo.java
Index: Echo.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jni/examples/org/apache/tomcat/jni/Echo.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Echo.java 14 Apr 2005 06:46:28 - 1.2
+++ Echo.java 15 Apr 2005 14:24:53 - 1.3
@@ -51,8 +51,8 @@
props.load(is);
is.close();
echoAddr = props.getProperty(echo.ip, 127.0.0.1);
- echoPort = Integer.decode(props.getProperty(echo.port, 23));
- echoNmax = Integer.decode(props.getProperty(echo.max, 1));
+ echoPort = Integer.decode(props.getProperty(echo.port, 23)).intValue();
+ echoNmax = Integer.decode(props.getProperty(echo.max, 1)).intValue();
}
catch (Throwable t) {
; // Nothing
@@ -159,15 +159,17 @@
worker.start();
}
}
+ /* XXX: JFC quick hack
catch(Error err ) {
if (Status.APR_STATUS_IS_TIMEUP(err.getError())) {
- /* TODO: deal with timeout */
+ /0 TODO: deal with timeout 0/
}
else {
err.printStackTrace();
break;
}
}
+ */
catch( Exception ex ) {
ex.printStackTrace();
break;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
!
\\\|///
\\ - - //
( @ @ )
oOOo- (_)-oOOo
:gzlongzhijian
QQ(OICQ) 40831127 Q
:[EMAIL PROTECTED]
:http://www.gzlzj.com
401
:510630 :020-33629058
Oooo
oooO ( )
( ) ) /
\ ( (_/
\_)
-
Do You Yahoo!?
150MP3
1G1000
cvs commit: jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11 Http11AprProcessor.java InternalAprInputBuffer.java
remm2005/04/15 08:49:33
Modified:util/java/org/apache/tomcat/util/net AprEndpoint.java
http11/src/java/org/apache/coyote/http11
Http11AprProcessor.java InternalAprInputBuffer.java
Log:
- Add configuration flags.
- Better sync for the poller.
- There's a problem with the poller in this commit under investigation,
though.
Revision ChangesPath
1.4 +72 -46
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java
Index: AprEndpoint.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AprEndpoint.java 15 Apr 2005 09:23:37 - 1.3
+++ AprEndpoint.java 15 Apr 2005 15:49:32 - 1.4
@@ -23,6 +23,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.tomcat.jni.Address;
+import org.apache.tomcat.jni.Error;
import org.apache.tomcat.jni.Library;
import org.apache.tomcat.jni.Poll;
import org.apache.tomcat.jni.Pool;
@@ -242,6 +243,23 @@
public void setSoTimeout(int soTimeout) { this.soTimeout = soTimeout; }
+/**
+ * Timeout on first request read before going to the poller, in ms.
+ */
+protected int firstReadPollerTimeout = 100;
+public int getFirstReadPollerTimeout() { return firstReadPollerTimeout; }
+public void setFirstReadPollerTimeout(int firstReadPollerTimeout) {
this.firstReadPollerTimeout = firstReadPollerTimeout; }
+
+
+/**
+ * Poll interval, in microseconds. The smaller the value, the more CPU
the poller
+ * will use, but the more responsive to activity it will be.
+ */
+protected int pollTime = 10;
+public int getPollTime() { return pollTime; }
+public void setPollTime(int pollTime) { this.pollTime = pollTime; }
+
+
/**
* The default is true - the created threads will be
* in daemon mode. If set to false, the control thread
@@ -356,7 +374,7 @@
// Create the APR address that will be bound
String addressStr = null;
if (address == null) {
-addressStr = 0.0.0.0;
+addressStr = null;
} else {
addressStr = + address;
}
@@ -677,16 +695,18 @@
protected long serverPollset = 0;
protected long pool = 0;
protected long[] desc;
+protected long[] sockets;
public Poller(int size) {
+pool = Pool.create(serverSockPool);
try {
-pool = Pool.create(serverSockPool);
serverPollset = Poll.create(size, pool, 0, soTimeout * 1000);
-desc = new long[size];
-} catch( Exception ex ) {
+} catch (Error e) {
// FIXME: more appropriate logging
-ex.printStackTrace();
+e.printStackTrace();
}
+desc = new long[size];
+sockets = new long[size];
}
public synchronized void add(long socket, long pool) {
@@ -696,7 +716,7 @@
}
}
-public synchronized void remove(long socket) {
+public void remove(long socket) {
int rv = Poll.remove(serverPollset, socket);
if (rv == Status.APR_SUCCESS) {
keepAliveCount--;
@@ -730,50 +750,56 @@
}
try {
-// Pool for one second
-// FIXME: Polling time could be configurable
-int rv = Poll.poll(serverPollset, 10, desc);
-for (int n = 0; n rv; n++) {
-long socket = Poll.socket(desc[n]);
-int pool = (int) Poll.data(desc[n]);
-remove(socket);
-
-int events = Poll.events(desc[n]);
-
-if (((events Poll.APR_POLLHUP) == Poll.APR_POLLHUP)
-|| ((events Poll.APR_POLLERR) ==
Poll.APR_POLLERR)) {
-// Close socket and clear pool
-Pool.destroy(pool);
-continue;
-}
-
-if (!((events Poll.APR_POLLIN) ==
Poll.APR_POLLIN)) {
-// Close socket and clear pool
-Pool.destroy(pool);
-continue;
+// Pool for the specified interval
+int rv =
cvs commit: jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11 Http11AprProcessor.java
remm2005/04/15 09:06:30
Modified:util/java/org/apache/tomcat/util/net AprEndpoint.java
http11/src/java/org/apache/coyote/http11
Http11AprProcessor.java
Log:
- Some changes suggested by Mladen (but the poller still has an issue for me).
- Shorter property name.
Revision ChangesPath
1.5 +19 -15
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java
Index: AprEndpoint.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AprEndpoint.java 15 Apr 2005 15:49:32 - 1.4
+++ AprEndpoint.java 15 Apr 2005 16:06:30 - 1.5
@@ -246,9 +246,9 @@
/**
* Timeout on first request read before going to the poller, in ms.
*/
-protected int firstReadPollerTimeout = 100;
-public int getFirstReadPollerTimeout() { return firstReadPollerTimeout; }
-public void setFirstReadPollerTimeout(int firstReadPollerTimeout) {
this.firstReadPollerTimeout = firstReadPollerTimeout; }
+protected int firstReadTimeout = 100;
+public int getFirstReadTimeout() { return firstReadTimeout; }
+public void setFirstReadTimeout(int firstReadTimeout) {
this.firstReadTimeout = firstReadTimeout; }
/**
@@ -696,6 +696,8 @@
protected long pool = 0;
protected long[] desc;
protected long[] sockets;
+protected long[] events;
+protected long[] pools;
public Poller(int size) {
pool = Pool.create(serverSockPool);
@@ -707,6 +709,8 @@
}
desc = new long[size];
sockets = new long[size];
+events = new long[size];
+pools = new long[size];
}
public synchronized void add(long socket, long pool) {
@@ -755,28 +759,28 @@
if (rv 0) {
synchronized (this) {
for (int n = 0; n rv; n++) {
-// Remove each socket from the poll right
away
sockets[n] = Poll.socket(desc[n]);
+// Get the socket pool
+pools[n] = Poll.data(desc[n]);
+// Get retuned events for this socket
+events[n] = Poll.events(desc[n]);
+// Remove each socket from the poll right
away
remove(sockets[n]);
}
}
for (int n = 0; n rv; n++) {
-// Get the socket pool
-int pool = (int) Poll.data(desc[n]);
-// Get retuned events for this socket
-int events = Poll.events(desc[n]);
-//System.out.println(Events: + sockets[n] +
code: + events + OK: + Poll.APR_POLLIN);
+//System.out.println(Events: + sockets[n] +
code: + events[n] + OK: + Poll.APR_POLLIN);
// Problem events
-if (((events Poll.APR_POLLHUP) ==
Poll.APR_POLLHUP)
-|| ((events Poll.APR_POLLERR) ==
Poll.APR_POLLERR)) {
+if (((events[n] Poll.APR_POLLHUP) ==
Poll.APR_POLLHUP)
+|| ((events[n] Poll.APR_POLLERR) ==
Poll.APR_POLLERR)) {
// Close socket and clear pool
-Pool.destroy(pool);
+Pool.destroy(pools[n]);
continue;
}
// Anything non normal
-if (!((events Poll.APR_POLLIN) ==
Poll.APR_POLLIN)) {
+if (!((events[n] Poll.APR_POLLIN) ==
Poll.APR_POLLIN)) {
// Close socket and clear pool
-Pool.destroy(pool);
+Pool.destroy(pools[n]);
continue;
}
// Allocate a new worker thread
@@ -796,7 +800,7 @@
}
// Hand this socket off to an appropriate
processor
//System.out.println(Process: + sockets[n]);
-workerThread.assign(sockets[n], pool);
+workerThread.assign(sockets[n], pools[n]);
Re: cvs commit: jakarta-tomcat-connectors/jni/native BUILDING
Mladen Turk wrote: [EMAIL PROTECTED] wrote: Building from the cvs tree: chmod a+x build/get-version.sh Need the chmod a+x build/get-version.sh too. BTW, do you know how to set the modes in CVS so they'll get checkout correctly? I don't remember for the moment but I will do it later. Regards, Mlade. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net AprEndpoint.java
remm2005/04/15 09:37:40
Modified:util/java/org/apache/tomcat/util/net AprEndpoint.java
Log:
- The events are not a good way to check for EOFed sockets. This fixes
looping. New problem: failed requests.
Revision ChangesPath
1.6 +37 -33
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java
Index: AprEndpoint.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AprEndpoint.java 15 Apr 2005 16:06:30 - 1.5
+++ AprEndpoint.java 15 Apr 2005 16:37:39 - 1.6
@@ -598,6 +598,29 @@
}
+
+/**
+ * Return a new worker thread, and block while to worker is available.
+ */
+protected Worker getWorkerThread() {
+// Allocate a new worker thread
+Worker workerThread = createWorkerThread();
+while (workerThread == null) {
+try {
+// Wait a little for load to go down: as a result,
+// no accept will be made until the concurrency is
+// lower than the specified maxThreads, and current
+// connections will wait for a little bit instead of
+// failing right away.
+Thread.sleep(100);
+} catch (InterruptedException e) {
+// Ignore
+}
+workerThread = createWorkerThread();
+}
+return workerThread;
+}
+
/**
* Recycle the specified Processor so that it can be used again.
@@ -640,20 +663,7 @@
}
// Allocate a new worker thread
-Worker workerThread = createWorkerThread();
-if (workerThread == null) {
-try {
-// Wait a little for load to go down: as a result,
-// no accept will be made until the concurrency is
-// lower than the specified maxThreads, and current
-// connections will wait for a little bit instead of
-// failing right away.
-Thread.sleep(100);
-} catch (InterruptedException e) {
-// Ignore
-}
-continue;
-}
+Worker workerThread = getWorkerThread();
// Accept the next incoming connection from the server socket
long socket = 0;
@@ -763,13 +773,21 @@
// Get the socket pool
pools[n] = Poll.data(desc[n]);
// Get retuned events for this socket
-events[n] = Poll.events(desc[n]);
+//events[n] = Poll.events(desc[n]);
// Remove each socket from the poll right
away
remove(sockets[n]);
}
}
for (int n = 0; n rv; n++) {
-//System.out.println(Events: + sockets[n] +
code: + events[n] + OK: + Poll.APR_POLLIN);
+// Check the health of the socket
+int res = Socket.recvt(sockets[n], null, 0, 0,
0);
+//System.out.println(Events: + sockets[n] +
code: + events[n] + res: + res);
+if (res 0) {
+// Close socket and clear pool
+Pool.destroy(pools[n]);
+continue;
+}
+/*
// Problem events
if (((events[n] Poll.APR_POLLHUP) ==
Poll.APR_POLLHUP)
|| ((events[n] Poll.APR_POLLERR) ==
Poll.APR_POLLERR)) {
@@ -783,24 +801,10 @@
Pool.destroy(pools[n]);
continue;
}
-// Allocate a new worker thread
-Worker workerThread = createWorkerThread();
-while (workerThread == null) {
-try {
-// Wait a little for load to go down: as
a result,
-// no accept will be made until the
concurrency is
-// lower than the specified maxThreads,
and current
-
cvs commit: jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11 InternalAprInputBuffer.java
remm2005/04/15 10:19:52
Modified:util/java/org/apache/tomcat/util/net AprEndpoint.java
http11/src/java/org/apache/coyote/http11
InternalAprInputBuffer.java
Log:
- Fixed keepalive handling (so it works *and* it runs fast).
Revision ChangesPath
1.7 +1 -18
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java
Index: AprEndpoint.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/net/AprEndpoint.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AprEndpoint.java 15 Apr 2005 16:37:39 - 1.6
+++ AprEndpoint.java 15 Apr 2005 17:19:52 - 1.7
@@ -773,21 +773,12 @@
// Get the socket pool
pools[n] = Poll.data(desc[n]);
// Get retuned events for this socket
-//events[n] = Poll.events(desc[n]);
+events[n] = Poll.events(desc[n]);
// Remove each socket from the poll right
away
remove(sockets[n]);
}
}
for (int n = 0; n rv; n++) {
-// Check the health of the socket
-int res = Socket.recvt(sockets[n], null, 0, 0,
0);
-//System.out.println(Events: + sockets[n] +
code: + events[n] + res: + res);
-if (res 0) {
-// Close socket and clear pool
-Pool.destroy(pools[n]);
-continue;
-}
-/*
// Problem events
if (((events[n] Poll.APR_POLLHUP) ==
Poll.APR_POLLHUP)
|| ((events[n] Poll.APR_POLLERR) ==
Poll.APR_POLLERR)) {
@@ -795,15 +786,7 @@
Pool.destroy(pools[n]);
continue;
}
-// Anything non normal
-if (!((events[n] Poll.APR_POLLIN) ==
Poll.APR_POLLIN)) {
-// Close socket and clear pool
-Pool.destroy(pools[n]);
-continue;
-}
-*/
// Hand this socket off to a worker
-//System.out.println(Process: + sockets[n]);
getWorkerThread().assign(sockets[n], pools[n]);
}
}
1.5 +10 -2
jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/InternalAprInputBuffer.java
Index: InternalAprInputBuffer.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/InternalAprInputBuffer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- InternalAprInputBuffer.java 15 Apr 2005 15:49:33 - 1.4
+++ InternalAprInputBuffer.java 15 Apr 2005 17:19:52 - 1.5
@@ -398,7 +398,11 @@
if (nRead 0) {
lastValid = pos + nRead;
} else {
-return false;
+if (Status.APR_STATUS_IS_ETIMEDOUT(-nRead)) {
+return false;
+} else {
+throw new
IOException(sm.getString(iib.failedread));
+}
}
}
@@ -418,7 +422,11 @@
if (nRead 0) {
lastValid = pos + nRead;
} else {
-return false;
+if (Status.APR_STATUS_IS_ETIMEDOUT(-nRead)) {
+return false;
+} else {
+throw new IOException(sm.getString(iib.failedread));
+}
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jni/native/src error.c
mturk 2005/04/15 10:21:23
Modified:jni/java/org/apache/tomcat/jni Status.java
jni/native/src error.c
Log:
Add missing APR_STATUS_IS_ macros wrappers for socket statuses.
Revision ChangesPath
1.5 +7 -2
jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni/Status.java
Index: Status.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni/Status.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Status.java 15 Apr 2005 10:15:55 - 1.4
+++ Status.java 15 Apr 2005 17:21:23 - 1.5
@@ -244,9 +244,14 @@
public static final boolean APR_STATUS_IS_ENOTIMPL(int s) { return
is(s, 73); }
public static final boolean APR_STATUS_IS_EMISMATCH(int s) { return
is(s, 74); }
public static final boolean APR_STATUS_IS_EBUSY(int s) { return
is(s, 75); }
-
+
/* Socket errors */
public static final boolean APR_STATUS_IS_EAGAIN(int s) { return
is(s, 90); }
public static final boolean APR_STATUS_IS_ETIMEDOUT(int s) { return
is(s, 91); }
+public static final boolean APR_STATUS_IS_ECONNABORTED(int s) { return
is(s, 92); }
+public static final boolean APR_STATUS_IS_ECONNRESET(int s) { return
is(s, 93); }
+public static final boolean APR_STATUS_IS_EINPROGRESS(int s) { return
is(s, 94); }
+public static final boolean APR_STATUS_IS_EINTR(int s) { return
is(s, 95); }
+public static final boolean APR_STATUS_IS_ENOTSOCK(int s) { return
is(s, 96); }
}
1.4 +5 -0 jakarta-tomcat-connectors/jni/native/src/error.c
Index: error.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/src/error.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- error.c 15 Apr 2005 10:16:05 - 1.3
+++ error.c 15 Apr 2005 17:21:23 - 1.4
@@ -181,6 +181,11 @@
/* Socket errors */
APR_IS(90, APR_STATUS_IS_EAGAIN);
APR_IS(91, APR_STATUS_IS_ETIMEDOUT);
+APR_IS(92, APR_STATUS_IS_ECONNABORTED);
+APR_IS(93, APR_STATUS_IS_ECONNRESET);
+APR_IS(94, APR_STATUS_IS_EINPROGRESS);
+APR_IS(95, APR_STATUS_IS_EINTR);
+APR_IS(96, APR_STATUS_IS_ENOTSOCK);
}
return JNI_FALSE;
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: [34083,etc..] method of disabling cache
I haven't heard anything from this, so I plan on replacing the three headers this code sets with a single cache-control: private header this weekend in tc 5.0 and 5.5. Keith Keith Wannamaker wrote: Remy, what are your reasons for not using cache-control: private? We discovered some time ago that the Pragma: no-cache causes IE trouble when under ssl. Why wouldn't cache-control: private be sufficient? If we're enabling this behavior by default, it would make sense to use the most interoperable cache-disabling solution. Thanks, Keith cf http://issues.apache.org/bugzilla/show_bug.cgi?id=34083 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [34083,etc..] method of disabling cache
Keith Wannamaker wrote: I haven't heard anything from this, so I plan on replacing the three headers this code sets with a single cache-control: private header this weekend in tc 5.0 and 5.5. Make it optional. Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/modules/cluster/test/src/share/org/apache/catalina/cluster/session - New directory
pero2005/04/15 13:12:49 jakarta-tomcat-catalina/modules/cluster/test/src/share/org/apache/catalina/cluster/session - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/modules/cluster/test/src/share/org/apache/catalina/cluster/session DeltaManagerTest.java
pero2005/04/15 13:14:14 Modified:modules/cluster/src/share/org/apache/catalina/cluster CatalinaCluster.java ClusterManager.java modules/cluster/src/share/org/apache/catalina/cluster/io ObjectReader.java SocketObjectReader.java XByteBuffer.java modules/cluster/src/share/org/apache/catalina/cluster/session DeltaManager.java LocalStrings.properties SimpleTcpReplicationManager.java mbeans-descriptors.xml modules/cluster/src/share/org/apache/catalina/cluster/tcp ClusterReceiverBase.java DataSender.java IDataSender.java LocalStrings.properties ReplicationListener.java ReplicationTransmitter.java SimpleTcpCluster.java SocketReplicationListener.java mbeans-descriptors.xml modules/cluster/test/src/share/org/apache/catalina/cluster/io XByteBufferTest.java modules/cluster to-do.txt Added: modules/cluster/src/share/org/apache/catalina/cluster/util IDynamicProperty.java modules/cluster/test/src/share/org/apache/catalina/cluster/session DeltaManagerTest.java Log: Refactoring and redesign cluster Revision ChangesPath 1.11 +12 -8 jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/CatalinaCluster.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/CatalinaCluster.java.diff?r1=1.10r2=1.11 1.8 +8 -15 jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/ClusterManager.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/ClusterManager.java.diff?r1=1.7r2=1.8 1.8 +3 -3 jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/io/ObjectReader.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/io/ObjectReader.java.diff?r1=1.7r2=1.8 1.2 +7 -7 jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/io/SocketObjectReader.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/io/SocketObjectReader.java.diff?r1=1.1r2=1.2 1.14 +8 -54 jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/io/XByteBuffer.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/io/XByteBuffer.java.diff?r1=1.13r2=1.14 1.44 +172 -145 jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaManager.java.diff?r1=1.43r2=1.44 1.6 +3 -2 jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/LocalStrings.properties http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/LocalStrings.properties.diff?r1=1.5r2=1.6 1.38 +15 -3 jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/SimpleTcpReplicationManager.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/SimpleTcpReplicationManager.java.diff?r1=1.37r2=1.38 1.5 +43 -12 jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/mbeans-descriptors.xml http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/mbeans-descriptors.xml.diff?r1=1.4r2=1.5 1.2 +308 -7 jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/ClusterReceiverBase.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/ClusterReceiverBase.java.diff?r1=1.1r2=1.2 1.11 +3 -3 jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/DataSender.java http://cvs.apache.org/viewcvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/DataSender.java.diff?r1=1.10r2=1.11 1.8 +1 -0 jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp/IDataSender.java
cvs commit: jakarta-tomcat-catalina/modules/storeconfig/test/src/share/org/apache/catalina/storeconfig StandardHostSFTest.java StoreAppenderTest.java StoreLoaderTest.java
pero2005/04/15 13:14:46
Modified:modules/storeconfig/src/share/org/apache/catalina/storeconfig
server-registry.xml
modules/storeconfig/test/src/share/org/apache/catalina/storeconfig
StandardHostSFTest.java StoreAppenderTest.java
StoreLoaderTest.java
Added: modules/storeconfig/src/share/org/apache/catalina/storeconfig
IDynamicPropertyStoreAppender.java
Removed: modules/storeconfig/src/share/org/apache/catalina/storeconfig
ReplicationTransmitterStoreAppender.java
Log:
Refactoring and redesign cluster
Revision ChangesPath
1.6 +3 -2
jakarta-tomcat-catalina/modules/storeconfig/src/share/org/apache/catalina/storeconfig/server-registry.xml
Index: server-registry.xml
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/storeconfig/src/share/org/apache/catalina/storeconfig/server-registry.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- server-registry.xml 10 Apr 2005 16:22:15 - 1.5
+++ server-registry.xml 15 Apr 2005 20:14:46 - 1.6
@@ -132,7 +132,8 @@
default=false
childs=true
tagClass=org.apache.catalina.cluster.CatalinaCluster
-
storeFactoryClass=org.apache.catalina.storeconfig.CatalinaClusterSF
+storeFactoryClass=org.apache.catalina.storeconfig.CatalinaClusterSF
+
storeAppenderClass=org.apache.catalina.storeconfig.IDynamicPropertyStoreAppender
/Description
Description
tag=Realm
@@ -296,7 +297,7 @@
default=false
tagClass=org.apache.catalina.cluster.tcp.ReplicationTransmitter
storeFactoryClass=org.apache.catalina.storeconfig.StoreFactoryBase
-
storeAppenderClass=org.apache.catalina.storeconfig.ReplicationTransmitterStoreAppender
+
storeAppenderClass=org.apache.catalina.storeconfig.IDynamicPropertyStoreAppender
/Description
Description
tag=Sender
1.1
jakarta-tomcat-catalina/modules/storeconfig/src/share/org/apache/catalina/storeconfig/IDynamicPropertyStoreAppender.java
Index: IDynamicPropertyStoreAppender.java
===
/**
* Copyright 1999-2001,2004 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the License);
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an AS IS BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.catalina.storeconfig;
import java.beans.IndexedPropertyDescriptor;
import java.beans.IntrospectionException;
import java.beans.Introspector;
import java.beans.PropertyDescriptor;
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import org.apache.catalina.cluster.util.IDynamicProperty;
import org.apache.tomcat.util.IntrospectionUtils;
/**
* Store the IDynamicProperty attributes.
*
* @author Peter Rossbach
*
*/
public class IDynamicPropertyStoreAppender extends StoreAppender {
/**
* Store the relevant attributes of the specified JavaBean.
*
* @param writer
*PrintWriter to which we are storing
* @param include
*Should we include a codeclassName/code attribute?
* @param bean
*Bean whose properties are to be rendered as attributes,
* @param desc
*RegistryDescrpitor from this bean
*
* @exception Exception
*if an exception occurs while storing
*/
public void printAttributes(PrintWriter writer, int indent,
boolean include, Object bean, StoreDescription desc)
throws Exception {
// Render the relevant properties of this bean
String className = bean.getClass().getName();
// Render a className attribute if requested
if (include desc != null !desc.isStandard()) {
writer.print( className=\);
writer.print(bean.getClass().getName());
writer.print(\);
}
if (bean instanceof IDynamicProperty) {
List propertyKeys = getPropertyKeys((IDynamicProperty) bean);
// Create blank instance
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
pero2005/04/15 13:15:17 Modified:webapps/docs changelog.xml Log: Refactoring and redesign cluster Revision ChangesPath 1.290 +29 -8 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.289 retrieving revision 1.290 diff -u -r1.289 -r1.290 --- changelog.xml 15 Apr 2005 08:58:46 - 1.289 +++ changelog.xml 15 Apr 2005 20:15:17 - 1.290 @@ -43,11 +43,20 @@ Update to JDT from Eclipse 3.1M6, which is now feature complete (remm) /update update -Start refactoring, redesign and extend the cluster module (pero) - /update - add -Add Apache Portable Runtime JNI wrapper and helper API (mturk) - /add +Refactoring, redesign and extend the cluster module + - Optimized performance and reduce memory usage + - Better JMX support + - add a lot of JMX stats attribute for better monitoring + - more config options + LifecycleListener + ClusterListener + more than one Cluster Valves + - better subclass support + - change a lot of existing API's (pero) + /update + add + Add Apache Portable Runtime JNI wrapper and helper API (mturk) + /add /changelog /subsection @@ -127,20 +136,32 @@ subsection name=Cluster changelog + add +Redesign SimpleTcpCluster message receiving to ClusterReceiverBase (pero) + /add + add +Cluster transfer all attributes to the generate session manager at addManager. +Remove some unused attributes at SimpleTcpCluster and ReplicationTransmitter (pero) + /add + update +Refactor DeltaManager: + - createSession call now ManagerBase super class method + - extract some long methods (pero) + /update update -update to-do.txt (pero) +Add developer actions at to-do.txt (Proposal of changes) (pero) /update update Small refactorings at FastAsyncSocketSender (pero) /update update -Refactor cluster message sending to lesser cpu and memory usage. +Redesign cluster message sending to lesser cpu and memory usage. Set at ReplicationTransmitter#compress=false as default. Change API from ClusterSender, ReplicaitonTransmitter, DataSender, SimpleTcpCluster (pero) /update add DeltaManager has now JMX expireAllLocalSessions and processExipre operation -for better cluster node shutdown handling (pero) +for better cluster node shutdown handling (usefull for testing only) (pero) /add add DataSender doWaitAckStats for better understanding wait ack problems (pero) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session ManagerBase.java
pero2005/04/15 13:15:45
Modified:catalina/src/share/org/apache/catalina Cluster.java
catalina/src/share/org/apache/catalina/session
ManagerBase.java
Log:
Refactoring and redesign cluster
Revision ChangesPath
1.10 +6 -1
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Cluster.java
Index: Cluster.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/Cluster.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Cluster.java 5 Oct 2004 17:12:49 - 1.9
+++ Cluster.java 15 Apr 2005 20:15:45 - 1.10
@@ -78,6 +78,7 @@
* Set the protocol parameters.
*
* @param protocol The protocol used by the cluster
+ * @deprecated
*/
public void setProtocol(String protocol);
@@ -85,6 +86,7 @@
* Get the protocol used by the cluster.
*
* @return The protocol
+ * @deprecated
*/
public String getProtocol();
@@ -123,6 +125,7 @@
* not identify a currently installed web application
* @exception IOException if an input/output error occurs during
* startup
+ * @deprecated
*/
public void startContext(String contextPath) throws IOException;
@@ -151,6 +154,7 @@
* is malformed (it must be or start with a slash)
* @exception IllegalStateException if the specified context path
* is already attached to an existing web application
+ * @deprecated
*/
public void installContext(String contextPath, URL war);
@@ -166,6 +170,7 @@
* not identify a currently installed web application
* @exception IOException if an input/output error occurs while stopping
* the web application
+ * @deprecated
*/
public void stop(String contextPath) throws IOException;
1.42 +12 -1
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/ManagerBase.java
Index: ManagerBase.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session/ManagerBase.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- ManagerBase.java 31 Mar 2005 10:31:53 - 1.41
+++ ManagerBase.java 15 Apr 2005 20:15:45 - 1.42
@@ -767,6 +767,17 @@
session.setMaxInactiveInterval(this.maxInactiveInterval);
if (sessionId == null) {
sessionId = generateSessionId();
+// FIXME WHy we need no duplication check?
+/*
+ synchronized (sessions) {
+while (sessions.get(sessionId) != null) { // Guarantee
+// uniqueness
+duplicates++;
+sessionId = generateSessionId();
+}
+}
+*/
+
// FIXME: Code to be used in case route replacement is needed
/*
} else {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session ManagerBase.java
[EMAIL PROTECTED] wrote: pero2005/04/15 13:15:45 Modified:catalina/src/share/org/apache/catalina Cluster.java catalina/src/share/org/apache/catalina/session ManagerBase.java Log: Refactoring and redesign cluster +// FIXME WHy we need no duplication check? Because it would mean id generation is extremely insecure, so we would have more urgent problems ;) Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Cluster fixes
Yes, I have change a lot and it is time to test and stabilze the code. s. to-do.txt for more :-) The current cluster code with 5.5.9 fix pack work very well I testet the fix under very high load last week Peter - Great that you also start to look inside the code. Filip Hanik - Dev Lists schrieb: I am going through the cluster code right now and will be adding fixes along the way. I think the development of this code has focused more on features than stability, so I would like to ask that for the next period, lets focus on the stability and get this beast back in shape again. Filip - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Tomcat and APR
Peter Lin wrote: I'll wait until that's fixed and then run the full set of benchmarks. that way we'll have direct comparison. All right, the performance is now more or less decent, and polling seems to work. You can try testing it :) Mladen recommends APR 1.1. Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [34083,etc..] method of disabling cache
Does cache-control: private not achieve the correct behavior for you? Keith Remy Maucherat wrote: Keith Wannamaker wrote: I haven't heard anything from this, so I plan on replacing the three headers this code sets with a single cache-control: private header this weekend in tc 5.0 and 5.5. Make it optional. Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session ManagerBase.java
Yes, this was the only different between DeltaManager and ManagerBase. What we do? remove the comment or detect so strange things? Peter Remy Maucherat schrieb: [EMAIL PROTECTED] wrote: pero2005/04/15 13:15:45 Modified:catalina/src/share/org/apache/catalina Cluster.java catalina/src/share/org/apache/catalina/session ManagerBase.java Log: Refactoring and redesign cluster +// FIXME WHy we need no duplication check? Because it would mean id generation is extremely insecure, so we would have more urgent problems ;) Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jni build.xml
jfclere 2005/04/15 14:57:08
Modified:jni build.xml
Log:
The example is named Echo for moment.
Revision ChangesPath
1.4 +2 -2 jakarta-tomcat-connectors/jni/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jni/build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.xml 14 Apr 2005 18:52:28 - 1.3
+++ build.xml 15 Apr 2005 21:57:08 - 1.4
@@ -288,8 +288,8 @@
!-- excutes the examples
--
!-- ===
--
target name=example-basic depends=compile-examples
-echo message=Running Tomcat Native BasicSample example .../
-java dir=${examples.dir}
classname=org.apache.tomcat.jni.BasicSample
+echo message=Running Tomcat Native Echo example .../
+java dir=${examples.dir} classname=org.apache.tomcat.jni.Echo
fork=yes failonerror=${test.failonerror}
classpath refid=examples.classpath/
/java
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: Tomcat and APR
yeah, I can do that. ... I assume if i grab the nightly for 5.5.x and APR1.1.x I should be ready to go. In the event I need some assistance, you going to be around Mladen :) ? peter lin On 4/15/05, Remy Maucherat [EMAIL PROTECTED] wrote: Peter Lin wrote: I'll wait until that's fixed and then run the full set of benchmarks. that way we'll have direct comparison. All right, the performance is now more or less decent, and polling seems to work. You can try testing it :) Mladen recommends APR 1.1. Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: DO NOT REPLY [Bug 33538] - TagLibraryInfoImpl does not process tag-file elements correctly from JSP 2.0 TLDs
Thanks a lot Yoav ! Can you please also apply this (and 33539) to 5.0.x (maybe 28, if I have to pick one ;-)? I have a jakarta taglibs sandbox tag library that I'm afraid users lose confidence in after seeing a steady stream of error messages from jasper. I know a majority of the taglib users are currently using TC 5.0.28 as the servlet container, hence this request. Thanks for your time. -Rahul On 3/23/05, [EMAIL PROTECTED] [EMAIL PROTECTED] wrote: DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=33538. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=33538 [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2005-03-23 16:41 --- Done for 5.5.9. Thanks for submitting this patch. -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/session ManagerBase.java
Remy Maucherat [EMAIL PROTECTED] wrote in message news:[EMAIL PROTECTED] [EMAIL PROTECTED] wrote: pero2005/04/15 13:15:45 Modified:catalina/src/share/org/apache/catalina Cluster.java catalina/src/share/org/apache/catalina/session ManagerBase.java Log: Refactoring and redesign cluster +// FIXME WHy we need no duplication check? Because it would mean id generation is extremely insecure, so we would have more urgent problems ;) I agree with Remy. Before we had the duplication check, we *did* get reports of duplicate ids. I'm -1 for the ManagerBase patch. Rémy - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 34480] New: - Parser chokes on tags within HTML comment block
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG· RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=34480. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND· INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=34480 Summary: Parser chokes on tags within HTML comment block Product: Tomcat 5 Version: 5.0.28 Platform: PC OS/Version: Windows XP Status: NEW Severity: major Priority: P2 Component: Jasper AssignedTo: tomcat-dev@jakarta.apache.org ReportedBy: [EMAIL PROTECTED] The following valid JSP loaded fine in Tomcat 4, but it does not load in Tomcat 5. The parser is complaining about the unbalanced end tag /mycomp:foo which is within an HTML comment. This is incorrect; a tag inside a comment block should be ignored. %@ page language=java contentType=text/html % %@ taglib uri=http://webm-taglib.tld; prefix=mycomp % html PThis is a plain JSP that serves up HTML. !-- 'foo' tag Use the 'foo' tag to make coffee in the morning. Remember to include a closing foo tag, e.g. /mycomp:foo. -- /html Exception thrown is: org.apache.jasper.JasperException: /apachebug.jsp(8,26) The end tag lt;/mycomp:foo is unbalanced at org.apache.jasper.compiler.DefaultErrorHandler.jspError (DefaultErrorHandler.java:39) at org.apache.jasper.compiler.ErrorDispatcher.dispatch (ErrorDispatcher.java:409) at org.apache.jasper.compiler.ErrorDispatcher.jspError (ErrorDispatcher.java:134) at org.apache.jasper.compiler.Parser.checkUnbalancedEndTag (Parser.java:1706) at org.apache.jasper.compiler.Parser.parseElements(Parser.java:1561) at org.apache.jasper.compiler.Parser.parse(Parser.java:126) [snip] -- Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email --- You are receiving this mail because: --- You are the assignee for the bug, or are watching the assignee. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
