date:20060804

DO NOT REPLY [Bug 37455] - https/sll hangs with tcnative-1.dll

2006-08-04 Thread bugzilla

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
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=37455





--- Additional Comments From [EMAIL PROTECTED]  2006-08-04 11:26 ---
I had the same problem where HTTP worked fine, but HTTPS did not repsonde and
there was no log entries.

I resolved it by not installing the native libs, and now HTTPS also works.  So
the issues is releated to the native libs not doing HTTPS correctly

-- 
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: [TC6] Cluster and storeconfig

2006-08-04 Thread Remy Maucherat


Filip Hanik - Dev Lists wrote:

Here are my suggestions:

1. Incorporate modules/ha as the cluster solution into TC6


Ok.


2. Keep modules/groupcom as a separate module
  The reason I suggest a separate module, is cause it is a fairly 
complex component and will have
  a fairly large documentation base, it might be better to keep it 
separate and have it
  release separately from the core. That way, a busted IO component, 
will not set back the tomcat release.


This sounds ambitious, given the testing that ensures that the 
clustering is not "busted" in a particular release is only done weeks 
later. Similarly, the plan about big docs is fine, but I didn't see 
anything being started at the moment. I would like to keep the Tomcat 
build and packaging simple, so this will mean that all external modules 
would be external components then ?



3. Storeconfig - this is Peter's baby and would be his choice.
  I personally would suggest a rewrite of it and have a storeconfig that 
is not dependent on the classes of tomcat,

  ie, storeconfig today has one class for every component in tomcat,
  so as soon as you swap out a component to a custom class,
  there is no saving for that component anymore.
  It could be equally easy to create a completely standalone 
configuration tool.

  But since I am not that familiar here,
  I'd prefer to leave that decision to Peter if he has time to maintain 
it in TC6.


A rewrite plan is not realistic at this time.

Rémy

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 37455] - https/sll hangs with tcnative-1.dll

2006-08-04 Thread bugzilla

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
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=37455


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution||INVALID




--- Additional Comments From [EMAIL PROTECTED]  2006-08-04 13:26 ---
It is unfortunate that Tomcat does the auto-APR when the settings are different.
This leads users to think that the regular HTTPS settings would work with APR,
they don't.

In order for the tcnative.dll (the APR connector) to work in HTTPS, you have to
configure it with a key and a certificate.

The bottom of the documentation http://tomcat.apache.org/tomcat-5.5-doc/apr.html
describes that.

-- 
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]

svn commit: r428729 - in /tomcat/tc6.0.x/trunk/java/org/apache: catalina/ catalina/core/ jasper/ jasper/compiler/ jasper/runtime/

2006-08-04 Thread remm

Author: remm
Date: Fri Aug  4 07:04:42 2006
New Revision: 428729

URL: http://svn.apache.org/viewvc?rev=428729&view=rev
Log:
- Use the classname as the servlet context attribute name for the annotation 
processor.
- Fix init of the naming context used by the annotation processor.
- Jasper will now use the annotation processor from the servlet context.
- Remove the ignore annotation compile time parameter for Jasper, which was a 
temporary hack.

Added:
tomcat/tc6.0.x/trunk/java/org/apache/jasper/runtime/AnnotationHelper.java   
(with props)
Removed:
tomcat/tc6.0.x/trunk/java/org/apache/jasper/runtime/AnnotationProcessor.java
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/Globals.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/EmbeddedServletOptions.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/JspC.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/Options.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/runtime/TagHandlerPool.java

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/Globals.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/Globals.java?rev=428729&r1=428728&r2=428729&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/Globals.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/Globals.java Fri Aug  4 
07:04:42 2006
@@ -88,14 +88,6 @@
 
 
 /**
- * The servlet context attribute under which we store the annotation
- * processor that is used by the JSP engine.
- */
-public static final String ANNOTATION_PROCESSOR_ATTR =
-"org.apache.catalina.annotation_processor";
-
-
-/**
  * The request attribute under which we forward a Java exception
  * (as an object of type Throwable) to an error page.
  */

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java?rev=428729&r1=428728&r2=428729&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java Fri 
Aug  4 07:04:42 2006
@@ -4168,20 +4168,6 @@
 }
 }
 
-// Initialize annotation processor
-if (ok && !getIgnoreAnnotations()) {
-if (annotationProcessor == null) {
-if (isUseNaming() && namingContextListener != null) {
-annotationProcessor = 
-new 
DefaultAnnotationProcessor(namingContextListener.getEnvContext());
-} else {
-annotationProcessor = new DefaultAnnotationProcessor(null);
-}
-}
-getServletContext().setAttribute
-(Globals.ANNOTATION_PROCESSOR_ATTR, annotationProcessor);
-}
-
 // Standard container startup
 if (log.isDebugEnabled())
 log.debug("Processing standard container startup");
@@ -4303,11 +4289,20 @@
 // Set annotation processing parameter for Jasper (unfortunately, since
 // this can be configured in many places and not just in 
/WEB-INF/web.xml,
 // there are not many solutions)
-if (ignoreAnnotations) {
-Wrapper jspServlet = (Wrapper) 
findChild(Constants.JSP_SERVLET_NAME);
-
jspServlet.addInitParameter("org.apache.jasper.IGNORE_ANNOTATIONS", "true");
+// Initialize annotation processor
+if (ok && !getIgnoreAnnotations()) {
+if (annotationProcessor == null) {
+if (isUseNaming() && namingContextListener != null) {
+annotationProcessor = 
+new 
DefaultAnnotationProcessor(namingContextListener.getEnvContext());
+} else {
+annotationProcessor = new DefaultAnnotationProcessor(null);
+}
+}
+getServletContext().setAttribute
+(AnnotationProcessor.class.getName(), annotationProcessor);
 }
-
+
 try {
 
 // Create context attributes that will be required

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/jasper/EmbeddedServletOptions.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/EmbeddedServletOptions.java?rev=428729&r1=428728&r2=428729&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/EmbeddedServletOptions.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/EmbeddedServletOptions.java Fri 
Aug  4 07:04:42

Re: [TC6] Cluster and storeconfig

2006-08-04 Thread Filip Hanik - Dev Lists


Remy Maucherat wrote:

Filip Hanik - Dev Lists wrote:

Here are my suggestions:

1. Incorporate modules/ha as the cluster solution into TC6


Ok.


2. Keep modules/groupcom as a separate module
  The reason I suggest a separate module, is cause it is a fairly 
complex component and will have
  a fairly large documentation base, it might be better to keep it 
separate and have it
  release separately from the core. That way, a busted IO component, 
will not set back the tomcat release.


This sounds ambitious, given the testing that ensures that the 
clustering is not "busted" in a particular release is only done weeks 
later. 

not sure I understand.
Similarly, the plan about big docs is fine, but I didn't see anything 
being started at the moment. 
it is ambitious, but it happens to be that I am now in a position to 
dedicate way more time than I have ever had before.
There are docs have started, 
http://people.apache.org/~fhanik/tribes/docs/introduction.html
paused at the moment while I am developing HTTPS connector with java.nio 
(was a little tricky to get my head around but it should be done next week).
I would like to keep the Tomcat build and packaging simple, so this 
will mean that all external modules would be external components then ?

sure, I understand, shouldn't be very difficult at all.
if you want to include it at build time, then you can just invoke the 
build script under modules/groupcom/build, and generate it directly from 
there,

or we can keep versioned binaries.
was there ever a decision to have TC6 completely module-less? I don't 
remember a final decision on that, do you remember the status of those 
conversations?



3. Storeconfig - this is Peter's baby and would be his choice.
  I personally would suggest a rewrite of it and have a storeconfig 
that is not dependent on the classes of tomcat,

  ie, storeconfig today has one class for every component in tomcat,
  so as soon as you swap out a component to a custom class,
  there is no saving for that component anymore.
  It could be equally easy to create a completely standalone 
configuration tool.

  But since I am not that familiar here,
  I'd prefer to leave that decision to Peter if he has time to 
maintain it in TC6.


A rewrite plan is not realistic at this time.

for sure,


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]

Out of Threads error

2006-08-04 Thread James Courtney

I'm getting this message from my Tomcat 5.0.28 on Linux.

2006-08-02 21:01:19: ERROR All threads (400) are currently busy,
waiting. Increase maxThreads (400) or check the servlet status

Originally I had 200 threads configured and now 400 in an attempt to
avoid it.  Either number seems larger than what should be necessary.  It
seems quite likely that there's an application issue causing all threads
to block and accumulate or something so I need to do a kill -3 next time
it happens to try and see what everyone is up to.  That said, I was
attempting to grep the Tomcat source code for where this message is
logged and thus where I hoped to find and understand better the thread
manager.  I grepped for "Increase maxThreads", "Increase", and "are
currently busy" all to no avail in finding the code doing the logging.
Is the code which logs this message part of a dependency library not in
the tomcat source tree?  If so, which one please.  I just want to
understand the application behavior when the limit is reached.

Many thanks!

Jamey



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: Out of Threads error

2006-08-04 Thread Tim Funk


For tomcat 5:
find . -type f |xargs grep "Increase maxThreads"
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/threads/res/LocalStrings.properties


-Tim

James Courtney wrote:

I'm getting this message from my Tomcat 5.0.28 on Linux.

2006-08-02 21:01:19: ERROR All threads (400) are currently busy,
waiting. Increase maxThreads (400) or check the servlet status

Originally I had 200 threads configured and now 400 in an attempt to
avoid it.  Either number seems larger than what should be necessary.  It
seems quite likely that there's an application issue causing all threads
to block and accumulate or something so I need to do a kill -3 next time
it happens to try and see what everyone is up to.  That said, I was
attempting to grep the Tomcat source code for where this message is
logged and thus where I hoped to find and understand better the thread
manager.  I grepped for "Increase maxThreads", "Increase", and "are
currently busy" all to no avail in finding the code doing the logging.
Is the code which logs this message part of a dependency library not in
the tomcat source tree?  If so, which one please.  I just want to
understand the application behavior when the limit is reached.
  



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

RE: Out of Threads error

2006-08-04 Thread James Courtney

Thanks Tim!

I'd been grepping only *.java files.  Doh!

Jamey
 

-Original Message-
From: Tim Funk [mailto:[EMAIL PROTECTED] 
Sent: Friday, August 04, 2006 11:34 AM
To: Tomcat Developers List
Subject: Re: Out of Threads error

For tomcat 5:
find . -type f |xargs grep "Increase maxThreads"
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/threads/res/L
ocalStrings.properties


-Tim

James Courtney wrote:
> I'm getting this message from my Tomcat 5.0.28 on Linux.
>
> 2006-08-02 21:01:19: ERROR All threads (400) are currently busy, 
> waiting. Increase maxThreads (400) or check the servlet status
>
> Originally I had 200 threads configured and now 400 in an attempt to 
> avoid it.  Either number seems larger than what should be necessary.  
> It seems quite likely that there's an application issue causing all 
> threads to block and accumulate or something so I need to do a kill -3

> next time it happens to try and see what everyone is up to.  That 
> said, I was attempting to grep the Tomcat source code for where this 
> message is logged and thus where I hoped to find and understand better

> the thread manager.  I grepped for "Increase maxThreads", "Increase", 
> and "are currently busy" all to no avail in finding the code doing the
logging.
> Is the code which logs this message part of a dependency library not 
> in the tomcat source tree?  If so, which one please.  I just want to 
> understand the application behavior when the limit is reached.
>   


-
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 40187] New: - Unable to compile class for JSP

2006-08-04 Thread bugzilla

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
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=40187

   Summary: Unable to compile class for JSP
   Product: Tomcat 5
   Version: 5.0.17
  Platform: PC
OS/Version: Windows XP
Status: NEW
  Severity: normal
  Priority: P1
 Component: Catalina
AssignedTo: tomcat-dev@jakarta.apache.org
ReportedBy: [EMAIL PROTECTED]


When I want to compile simple jsp file I get this error.I have set the tomcat
main directory with a path without spaces,and nothing changed.
I have no problem for running servlets or htmls.
How should I solve the problem.
this is my error report.

type Exception report

message 

description The server encountered an internal error () that prevented it from 
fulfilling this request.

exception 

org.apache.jasper.JasperException: Unable to compile class for JSP

Generated servlet error:
org.apache.jasper.runtime.HttpJspBase cannot be resolved to a type

Generated servlet error:
org.apache.jasper.runtime.JspSourceDependent cannot be resolved to a type

Generated servlet error:
HttpServletRequest cannot be resolved to a type

Generated servlet error:
HttpServletResponse cannot be resolved to a type

Generated servlet error:
ServletException cannot be resolved to a type

Generated servlet error:
JspFactory cannot be resolved to a type

Generated servlet error:
PageContext cannot be resolved to a type

Generated servlet error:
HttpSession cannot be resolved to a type

Generated servlet error:
ServletContext cannot be resolved to a type

Generated servlet error:
ServletConfig cannot be resolved to a type

Generated servlet error:
JspWriter cannot be resolved to a type

Generated servlet error:
JspWriter cannot be resolved to a type

Generated servlet error:
PageContext cannot be resolved to a type

Generated servlet error:
JspFactory cannot be resolved

Generated servlet error:
SkipPageException cannot be resolved to a type


org.apache.jasper.servlet.JspServletWrapper.handleJspException
(JspServletWrapper.java:510)
org.apache.jasper.servlet.JspServletWrapper.service
(JspServletWrapper.java:375)
org.apache.jasper.servlet.JspServlet.serviceJspFile
(JspServlet.java:314)
org.apache.jasper.servlet.JspServlet.service(JspServlet.java:264)
javax.servlet.http.HttpServlet.service(HttpServlet.java:802)


root cause 

org.apache.jasper.JasperException: Unable to compile class for JSP

Generated servlet error:
org.apache.jasper.runtime.HttpJspBase cannot be resolved to a type

Generated servlet error:
org.apache.jasper.runtime.JspSourceDependent cannot be resolved to a type

Generated servlet error:
HttpServletRequest cannot be resolved to a type

Generated servlet error:
HttpServletResponse cannot be resolved to a type

Generated servlet error:
ServletException cannot be resolved to a type

Generated servlet error:
JspFactory cannot be resolved to a type

Generated servlet error:
PageContext cannot be resolved to a type

Generated servlet error:
HttpSession cannot be resolved to a type

Generated servlet error:
ServletContext cannot be resolved to a type

Generated servlet error:
ServletConfig cannot be resolved to a type

Generated servlet error:
JspWriter cannot be resolved to a type

Generated servlet error:
JspWriter cannot be resolved to a type

Generated servlet error:
PageContext cannot be resolved to a type

Generated servlet error:
JspFactory cannot be resolved

Generated servlet error:
SkipPageException cannot be resolved to a type


org.apache.jasper.compiler.DefaultErrorHandler.javacError
(DefaultErrorHandler.java:84)
org.apache.jasper.compiler.ErrorDispatcher.javacError
(ErrorDispatcher.java:328)
org.apache.jasper.compiler.JDTCompiler.generateClass
(JDTCompiler.java:414)
org.apache.jasper.compiler.Compiler.compile(Compiler.java:297)
org.apache.jasper.compiler.Compiler.compile(Compiler.java:276)
org.apache.jasper.compiler.Compiler.compile(Compiler.java:264)
org.apache.jasper.JspCompilationContext.compile
(JspCompilationContext.java:563)
org.apache.jasper.servlet.JspServletWrapper.service
(JspServletWrapper.java:303)
org.apache.jasper.servlet.JspServlet.serviceJspFile
(JspServlet.java:314)
org.apache.jasper.servlet.JspServlet.service(JspServlet.java:264)
javax.servlet.http.HttpServlet.service(HttpServlet.java:802)


note The full stack trace of the root cause is available in the Apache 
Tomcat/5.5.17 logs.

-- 
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.

--

DO NOT REPLY [Bug 40187] - Unable to compile class for JSP

2006-08-04 Thread bugzilla

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
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=40187


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |NEEDINFO




-- 
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]

svn commit: r428884 [2/2] - in /tomcat/tc6.0.x/trunk/java/org/apache: coyote/http11/ tomcat/util/net/ tomcat/util/net/jsse/

2006-08-04 Thread fhanik

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java?rev=428884&r1=428883&r2=428884&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESupport.java 
Fri Aug  4 14:13:05 2006
@@ -32,7 +32,7 @@
 
 import org.apache.tomcat.util.net.SSLSupport;
 
-/* JSSESupport
+/** JSSESupport
 
Concrete implementation class for JSSE
Support classes.
@@ -42,6 +42,7 @@
 
@author EKR
@author Craig R. McClanahan
+   @author Filip Hanik
Parts cribbed from JSSECertCompat   
Parts cribbed from CertificatesValve
 */
@@ -52,17 +53,22 @@
 org.apache.commons.logging.LogFactory.getLog(JSSESupport.class);
 
 protected SSLSocket ssl;
+protected SSLSession session;
 
 Listener listener = new Listener();
 
 JSSESupport(SSLSocket sock){
 ssl=sock;
+session = sock.getSession();
 sock.addHandshakeCompletedListener(listener);
 }
+
+JSSESupport(SSLSession session) {
+this.session = session;
+}
 
 public String getCipherSuite() throws IOException {
 // Look up the current SSLSession
-SSLSession session = ssl.getSession();
 if (session == null)
 return null;
 return session.getCipherSuite();
@@ -114,7 +120,6 @@
 public Object[] getPeerCertificateChain(boolean force)
 throws IOException {
 // Look up the current SSLSession
-   SSLSession session = ssl.getSession();
 if (session == null)
 return null;
 
@@ -177,7 +182,6 @@
 public Integer getKeySize() 
 throws IOException {
 // Look up the current SSLSession
-SSLSession session = ssl.getSession();
 SSLSupport.CipherData c_aux[]=ciphers;
 if (session == null)
 return null;
@@ -200,7 +204,6 @@
 public String getSessionId()
 throws IOException {
 // Look up the current SSLSession
-SSLSession session = ssl.getSession();
 if (session == null)
 return null;
 // Expose ssl_session (getId)



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r428895 - /tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml

2006-08-04 Thread fhanik

Author: fhanik
Date: Fri Aug  4 14:38:22 2006
New Revision: 428895

URL: http://svn.apache.org/viewvc?rev=428895&view=rev
Log:
Added documentation about the NIO connector and clarified how the protocol 
attribute is read.


Modified:
tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml

Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml?rev=428895&r1=428894&r2=428895&view=diff
==
--- tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml Fri Aug  4 14:38:22 2006
@@ -108,8 +108,22 @@
 
 
 
-  This attribute value must be HTTP/1.1 to use the HTTP
-  handler, which is the default.
+  
+Sets the protocol to handle incoming traffic.
+The default value is HTTP/1.1 and configures the 
+org.apache.coyote.http11.Http11Protocol. This is the 
blocking Java connector.
+If the PATH(Windows) or LD_LIBRARY_PATH(on most 
unix system)  
+environment variables contain the Tomcat native library, the APR 
connector
+will automatically be configured. Please be advised that the APR 
connector has different
+settings for HTTPS than the default Java connector.
+Other values for this attribute are, but not limited to:
+org.apache.coyote.http11.Http11Protocol - same as 
HTTP/1.1
+org.apache.coyote.http11.Http11NioProtocol - non blocking 
Java connector
+org.apache.coyote.http11.Http11AprProtocol - the APR 
connector.
+The configuration for both Java connectors are identical, both for 
http and https. 
+For more information on the APR connector, please 
+visit the APR documentation
+  
 
 
 



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

svn commit: r428896 - in /tomcat/tc6.0.x/trunk/java/org/apache: coyote/http11/InternalNioInputBuffer.java tomcat/util/net/NioChannel.java tomcat/util/net/NioEndpoint.java tomcat/util/net/SecureNioChan

2006-08-04 Thread fhanik

Author: fhanik
Date: Fri Aug  4 14:52:51 2006
New Revision: 428896

URL: http://svn.apache.org/viewvc?rev=428896&view=rev
Log:
Correct close down, now the close can be limited to 2 files if it needs to 
change

Modified:

tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioChannel.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java?rev=428896&r1=428895&r2=428896&view=diff
==
--- 
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java 
(original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java 
Fri Aug  4 14:52:51 2006
@@ -588,13 +588,12 @@
 if (key != null) key.interestOps(SelectionKey.OP_READ);
 } catch (CancelledKeyException ckx) {
 try {
-if ( key != null && key.attachment() != null ) {
-KeyAttachment ka = (KeyAttachment)key.attachment();
-ka.setError(true); //set to collect this socket 
immediately
+if ( att != null ) {
+att.setError(true); //set to collect this socket 
immediately
+att.setWakeUp(false);
 }
-socket.getIOChannel().socket().close();
-socket.close();
-att.setWakeUp(false);
+try {socket.close();}catch (Exception ignore){}
+if ( socket.isOpen() ) socket.close(true);
 } catch (Exception ignore) {}
 }
 }

Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioChannel.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioChannel.java?rev=428896&r1=428895&r2=428896&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioChannel.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioChannel.java Fri 
Aug  4 14:52:51 2006
@@ -51,11 +51,12 @@
  * @todo Implement this java.nio.channels.Channel method
  */
 public void close() throws IOException {
+getIOChannel().socket().close();
 sc.close();
 }
 
 public void close(boolean force) throws IOException {
-close();
+if (isOpen() || force ) close();
 }
 /**
  * Tells whether or not this channel is open.

Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=428896&r1=428895&r2=428896&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Fri 
Aug  4 14:52:51 2006
@@ -937,8 +937,8 @@
 KeyAttachment ka = 
(KeyAttachment)key.attachment();
 ka.setError(true); //set to collect this 
socket immediately
 }
-socket.getIOChannel().socket().close();
-socket.close();
+try {socket.close();}catch (Exception ignore){}
+if ( socket.isOpen() ) socket.close(true);
 } catch ( Exception ignore ) {}
 }
 }
@@ -1259,16 +1259,16 @@
 if ((event) && (handler.event(socket, error) == 
Handler.SocketState.CLOSED)) {
 // Close socket and pool
 try {
-socket.getIOChannel().socket().close();
-socket.close();
+try {socket.close();}catch (Exception ignore){}
+if ( socket.isOpen() ) socket.close(true);
 }catch ( Exception x ) {
 log.error("",x);
 }
 } else if ((!event) && (handler.process(socket) == 
Handler.SocketState.CLOSED)) {
 // Close socket and pool
 try {
-socket.getIOChannel().socket().close();
-socket.close();
+try {socket.close();}catch (E

svn commit: r428907 - /tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java

2006-08-04 Thread fhanik

Author: fhanik
Date: Fri Aug  4 15:19:38 2006
New Revision: 428907

URL: http://svn.apache.org/viewvc?rev=428907&view=rev
Log:
Fixed unwrap

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java?rev=428907&r1=428906&r2=428907&view=diff
==
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java 
Fri Aug  4 15:19:38 2006
@@ -323,7 +323,7 @@
 //in the constructor
 throw new IOException("Unable to unwrap data, invalid status: 
" + unwrap.getStatus());
 }
-} while ( (netInBuffer.position() != 0));
+} while ( (netInBuffer.position() != 0)); //continue to unwrapping as 
long as the input buffer has stuff
 return (read);
 }
 



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

DO NOT REPLY [Bug 37455] - https/sll hangs with tcnative-1.dll

Re: [TC6] Cluster and storeconfig

DO NOT REPLY [Bug 37455] - https/sll hangs with tcnative-1.dll

svn commit: r428729 - in /tomcat/tc6.0.x/trunk/java/org/apache: catalina/ catalina/core/ jasper/ jasper/compiler/ jasper/runtime/

Re: [TC6] Cluster and storeconfig

Out of Threads error

Re: Out of Threads error

RE: Out of Threads error

DO NOT REPLY [Bug 40187] New: - Unable to compile class for JSP

DO NOT REPLY [Bug 40187] - Unable to compile class for JSP

svn commit: r428884 [2/2] - in /tomcat/tc6.0.x/trunk/java/org/apache: coyote/http11/ tomcat/util/net/ tomcat/util/net/jsse/

svn commit: r428895 - /tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml

svn commit: r428896 - in /tomcat/tc6.0.x/trunk/java/org/apache: coyote/http11/InternalNioInputBuffer.java tomcat/util/net/NioChannel.java tomcat/util/net/NioEndpoint.java tomcat/util/net/SecureNioChan

svn commit: r428907 - /tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/SecureNioChannel.java

14 matches

Site Navigation

Mail list logo

Footer information