5.0.28

[Dakota Jack]

I just recently upgraded to Tomcat 5.0.28 and it seems to really be
cooking compared to my older version, which was not that old.  Nice
work!
-- 
"You can lead a horse to water but you cannot make it float on its back."
~Dakota Jack~

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

RE: 5.0.28 - r.l.

[Soporte Tecnico]

Dear customer,

We regret to tell you  we have not found you in our database with the 
information you provided us.
 If you write from one of the countries that appear in our web site 
(www.pandasoftware.com --> Click on the tab "Partners" ->On the left to the 
screen click "Global Partnerships"-> Select your country at the bottom of the 
screen ) please send your question to the correspondent e-mail address. 

Otherwise, please send us your question with the following information:

Panda Customer Number.
Company Name.
Full Name.
Name of your Country

Best regards,

International Technical Support Department


Panda Software
Buenos Aires 12
48001 BILBAO - SPAIN
Phone: + 34 94 425 11 00

Panda Software presents a new family of solutions to protect against viruses 
and other threats. The new range of IT security products boasts a series of 
outstanding technological innovations and caters for all clients, from home 
users to the largest corporations. More information at: 
 
Ridding the Planet of Viruses! Try our products, FREE! at 






-Mensaje original-
De: Dakota Jack [mailto:[EMAIL PROTECTED]
Enviado el: domingo, 22 de mayo de 2005 14:14
Para: Tomcat Developers List
Asunto: 5.0.28 - r.l.


I just recently upgraded to Tomcat 5.0.28 and it seems to really be
cooking compared to my older version, which was not that old.  Nice
work!
-- 
"You can lead a horse to water but you cannot make it float on its back."
~Dakota Jack~

-
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/http11/src/java/org/apache/coyote/http11 Http11AprProcessor.java Http11AprProtocol.java Http11Processor.java Http11Protocol.java

[markt]

markt   2005/05/22 10:12:11

  Modified:http11/src/java/org/apache/coyote/http11
Http11AprProcessor.java Http11AprProtocol.java
Http11Processor.java Http11Protocol.java
  Log:
  Implement request body replay action.
  Use new maxSavePostSize attribute rather than maxPostSize to control size of 
POST buffered during SSL handshake.
  
  Revision  ChangesPath
  1.12  +17 -7 
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.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- Http11AprProcessor.java   11 May 2005 11:23:26 -  1.11
  +++ Http11AprProcessor.java   22 May 2005 17:12:11 -  1.12
  @@ -36,6 +36,7 @@
   import org.apache.coyote.http11.filters.GzipOutputFilter;
   import org.apache.coyote.http11.filters.IdentityInputFilter;
   import org.apache.coyote.http11.filters.IdentityOutputFilter;
  +import org.apache.coyote.http11.filters.SavedRequestInputFilter;
   import org.apache.coyote.http11.filters.VoidInputFilter;
   import org.apache.coyote.http11.filters.VoidOutputFilter;
   import org.apache.coyote.http11.filters.BufferedInputFilter;
  @@ -268,9 +269,9 @@
   
   
   /**
  - * Max post size.
  + * Max save post size.
*/
  -protected int maxPostSize = 2 * 1024 * 1024;
  +protected int maxSavePostSize = 4 * 1024;
   
   
   /**
  @@ -626,16 +627,16 @@
   /**
* Set the maximum size of a POST which will be buffered in SSL mode.
*/
  -public void setMaxPostSize(int mps) {
  -maxPostSize = mps;
  +public void setMaxSavePostSize(int msps) {
  +maxSavePostSize = msps;
   }
   
   
   /**
* Return the maximum size of a POST which will be buffered in SSL mode.
*/
  -public int getMaxPostSize() {
  -return maxPostSize;
  +public int getMaxSavePostSize() {
  +return maxSavePostSize;
   }
   
   
  @@ -1103,7 +1104,7 @@
*/
   InputFilter[] inputFilters = inputBuffer.getFilters();
   ((BufferedInputFilter) 
inputFilters[Constants.BUFFERED_FILTER])
  -.setLimit(maxPostSize);
  +.setLimit(maxSavePostSize);
   inputBuffer.addActiveFilter
   (inputFilters[Constants.BUFFERED_FILTER]);
   try {
  @@ -1115,6 +1116,15 @@
   } catch (Exception e) {
   log.warn("Exception getting SSL Cert", e);
   }
  +} else if (actionCode == ActionCode.ACTION_REQ_SET_BODY_REPLAY) {
  +ByteChunk body = (ByteChunk) param;
  +
  +InputFilter savedBody = new SavedRequestInputFilter(body);
  +savedBody.setRequest(request);
  +
  +InternalInputBuffer internalBuffer = (InternalInputBuffer)
  +request.getInputBuffer();
  +internalBuffer.addActiveFilter(savedBody);
   }
   }
   
  
  
  
  1.5   +7 -9  
jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11AprProtocol.java
  
  Index: Http11AprProtocol.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11AprProtocol.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Http11AprProtocol.java20 Apr 2005 16:40:52 -  1.4
  +++ Http11AprProtocol.java22 May 2005 17:12:11 -  1.5
  @@ -35,11 +35,9 @@
   import org.apache.coyote.RequestInfo;
   import org.apache.tomcat.util.net.AprEndpoint;
   import org.apache.tomcat.util.net.SSLImplementation;
  -import org.apache.tomcat.util.net.SSLSupport;
   import org.apache.tomcat.util.net.ServerSocketFactory;
   import org.apache.tomcat.util.net.AprEndpoint.Handler;
   import org.apache.tomcat.util.res.StringManager;
  -import org.apache.tomcat.util.threads.ThreadWithAttributes;
   
   
   /**
  @@ -220,7 +218,7 @@
   
   private int maxKeepAliveRequests=100; // as in Apache HTTPD server
   private int timeout = 30;   // 5 minutes as in Apache HTTPD server
  -private int maxPostSize = 2 * 1024 * 1024;
  +private int maxSavePostSize = 4 * 1024;
   private int maxHttpHeaderSize = 4 * 1024;
   private String reportedname;
   private int socketCloseDelay=-1;
  @@ -361,13 +359,13 @@
   setAttribute("compression", valueS);
   }
   
  -public int getMaxPostSize() {
  -return maxPostSize;
  +public int getMaxSavePostSize() {
  +return maxSavePostSize;
   }
   
  -pu

cvs commit: jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/filters SavedRequestInputFilter.java

[markt]

markt   2005/05/22 10:14:29

  Added:   http11/src/java/org/apache/coyote/http11/filters
SavedRequestInputFilter.java
  Log:
  Implement request body replay action.
  New input filter used to insert the request body.
  
  Revision  ChangesPath
  1.1  
jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/filters/SavedRequestInputFilter.java
  
  Index: SavedRequestInputFilter.java
  ===
  /*
   *  Copyright 1999-2005 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.coyote.http11.filters;
  
  import java.io.IOException;
  
  import org.apache.coyote.InputBuffer;
  import org.apache.coyote.http11.InputFilter;
  import org.apache.tomcat.util.buf.ByteChunk;
  
  /**
   * Input filter responsible for replaying the request body when restoring the
   * saved request after FORM authentication.
   */
  public class SavedRequestInputFilter implements InputFilter {
  
/**
   * The original request body.
 */
  protected ByteChunk input = null;
  
  /**
   * Create a new SavedRequestInputFilter.
   * 
   * @param input The saved request body to be replayed.
   */
  public SavedRequestInputFilter(ByteChunk input) {
  this.input = input;
  }
  
  /**
   * Read bytes.
   */
  public int doRead(ByteChunk chunk, org.apache.coyote.Request request)
  throws IOException {
  int writeLength = 0;
  
  if (chunk.getLimit() > 0 && chunk.getLimit() < input.getLength()) {
  writeLength = chunk.getLimit();
  } else {
writeLength = input.getLength();
  }
  
  input.substract(chunk.getBuffer(), 0, writeLength);
  chunk.setOffset(0);
  chunk.setEnd(writeLength);
  
  return writeLength;
  }
  
  /**
   * Set the content length on the request.
   */
  public void setRequest(org.apache.coyote.Request request) {
  request.setContentLength(input.getLength());
  }
  
  /**
   * Make the filter ready to process the next request.
   */
  public void recycle() {
  input = null;
  }
  
  /**
   * Return the name of the associated encoding; here, the value is null.
   */
  public ByteChunk getEncodingName() {
  return null;
  }
  
  /**
   * Set the next buffer in the filter pipeline (has no effect).
   */
  public void setBuffer(InputBuffer buffer) {
  }
  
  /**
   * End the current request (has no effect).
   */
  public long end() throws IOException {
  return 0;
  }
  
  }
  
  
  

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

cvs commit: jakarta-tomcat-catalina/webapps/docs/config ajp.xml http.xml

[markt]

markt   2005/05/22 10:18:28

  Modified:catalina/src/share/org/apache/catalina/authenticator
FormAuthenticator.java LocalStrings.properties
   catalina/src/share/org/apache/catalina/connector
Connector.java
   webapps/docs/config ajp.xml http.xml
  Log:
  Add new attribute maxSavePostSize to connector and document it
  Implement save size limit in form authenticator
  
  Revision  ChangesPath
  1.23  +22 -14
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/FormAuthenticator.java
  
  Index: FormAuthenticator.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/FormAuthenticator.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- FormAuthenticator.java16 May 2005 05:22:21 -  1.22
  +++ FormAuthenticator.java22 May 2005 17:18:28 -  1.23
  @@ -36,7 +36,6 @@
   import org.apache.catalina.deploy.LoginConfig;
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
  -import org.apache.coyote.InputBuffer;
   import org.apache.coyote.ActionCode;
   import org.apache.tomcat.util.buf.ByteChunk;
   import org.apache.tomcat.util.buf.CharChunk;
  @@ -233,7 +232,14 @@
   session = request.getSessionInternal(true);
   if (log.isDebugEnabled())
   log.debug("Save request in session '" + 
session.getIdInternal() + "'");
  -saveRequest(request, session);
  +try {
  +saveRequest(request, session);
  +} catch (IOException ioe) {
  +log.debug("Request body too big to save during 
authentication");
  +response.sendError(HttpServletResponse.SC_FORBIDDEN,
  +sm.getString("authenticator.requestBodyTooBig"));
  +return (false);
  +}
   RequestDispatcher disp =
   context.getServletContext().getRequestDispatcher
   (config.getLoginPage());
  @@ -387,13 +393,16 @@
   
   if ("POST".equalsIgnoreCase(saved.getMethod())) {
   ByteChunk body = saved.getBody();
  -
  - 
request.getCoyoteRequest().action(ActionCode.ACTION_REQ_SET_BODY_REPLAY, body);
  -
  -// Set content type
  -MessageBytes contentType = MessageBytes.newInstance();
  -contentType.setString("application/x-www-form-urlencoded");
  -request.getCoyoteRequest().setContentType(contentType);
  +
  +if (body != null) {
  +request.getCoyoteRequest().action
  +(ActionCode.ACTION_REQ_SET_BODY_REPLAY, body);
  +
  +// Set content type
  +MessageBytes contentType = MessageBytes.newInstance();
  +contentType.setString("application/x-www-form-urlencoded");
  +request.getCoyoteRequest().setContentType(contentType);
  +}
   }
   request.getCoyoteRequest().method().setString(saved.getMethod());
   
  @@ -440,14 +449,13 @@
   }
   
   if ("POST".equalsIgnoreCase(request.getMethod())) {
  -// Note that the size of the request body is limited by:
  -// request.getConnector().getMaxPostSize()
  +ByteChunk body = new ByteChunk();
  +body.setLimit(request.getConnector().getMaxSavePostSize());
   
   byte[] buffer = new byte[4096];
   int bytesRead;
   InputStream is = request.getInputStream();
  -ByteChunk body = new ByteChunk();
  -
  +
   while ( (bytesRead = is.read(buffer) ) >= 0) {
   body.append(buffer, 0, bytesRead);
   }
  
  
  
  1.3   +1 -0  
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/LocalStrings.properties
  
  Index: LocalStrings.properties
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/authenticator/LocalStrings.properties,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- LocalStrings.properties   15 Mar 2004 22:25:35 -  1.2
  +++ LocalStrings.properties   22 May 2005 17:18:28 -  1.3
  @@ -8,6 +8,7 @@
   authenticator.notAuthenticated=Configuration error:  Cannot perform access 
control without an authenticated principal
   authenticator.notContext=Configuration error:  Must be attached to a Context
   authenticator.notStarted=Security Interceptor has not yet been started
  +authenticator.requestBodyTooBig=The request body was too large to be cached 
during the authentication process
   authenticator.sessionExpired=The time allowed 

Re: cvs commit: jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/filters SavedRequestInputFilter.java

[Remy Maucherat]

[EMAIL PROTECTED] wrote:

markt   2005/05/22 10:14:29

  Added:   http11/src/java/org/apache/coyote/http11/filters
SavedRequestInputFilter.java
  Log:
  Implement request body replay action.
  New input filter used to insert the request body.


This is probably not going to work with the APR protocol, since a 
subsequent request may be processed by a different processor.


All this proves saving POST data is a severly broken concept. I would 
like to get back to the previous situation, and have this whole thing 
reverted.


As a result, here's my official -1 to all these POST data related changes.

Rémy

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

Re: cvs commit: jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/filters SavedRequestInputFilter.java

[Mark Thomas]

Remy Maucherat wrote:

[EMAIL PROTECTED] wrote:

  Implement request body replay action.
  New input filter used to insert the request body.


This is probably not going to work with the APR protocol, since a 
subsequent request may be processed by a different processor.


All this proves saving POST data is a severly broken concept. I would 
like to get back to the previous situation, and have this whole thing 
reverted.


As a result, here's my official -1 to all these POST data related changes.


The input filter is added to the processor during the processing of the 
final request in the FORM authentication sequence and the data in it is 
consumed during the processing of this request. There is no need for 
this filter, or the data in it, to persist across multiple requests.


Data is persisted between requests (of course it has to be so FORM auth 
can take place) but this is done in the session and therefore it does 
not matter if the processor that handles the original request is 
different from the one that handles the FORM auth request or the final 
redirect to the original URL.


At the moment I do see what is so badly broken about this that justifies 
a -1.


Mark

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

Re: cvs commit: jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/filters SavedRequestInputFilter.java

[Remy Maucherat]

Mark Thomas wrote:

Remy Maucherat wrote:

The input filter is added to the processor during the processing of the 
final request in the FORM authentication sequence and the data in it is 
consumed during the processing of this request. There is no need for 
this filter, or the data in it, to persist across multiple requests.


Data is persisted between requests (of course it has to be so FORM auth 
can take place) but this is done in the session and therefore it does 
not matter if the processor that handles the original request is 
different from the one that handles the FORM auth request or the final 
redirect to the original URL.


At the moment I do see what is so badly broken about this that justifies 
a -1.


If this still goes to the session, then the -1 is not justified. The 
code is not done in a way that is very intuitive to me, so that's the 
only issue then, and it's not relevant.


I still have trouble with the concept of saving any POST data, which 
tends to be far bigger than parameters (and retrospectively, I have 
trouble allowing this many parameters). This would kill clustered 
Tomcats setups. Could the default be a very small value (like 64KB or 
something) ?


Rémy

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

Re: cvs commit: jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/filters SavedRequestInputFilter.java

[Mark Thomas]

Remy Maucherat wrote:

Mark Thomas wrote:

If this still goes to the session, then the -1 is not justified. 


It does still go to the session.

The 
code is not done in a way that is very intuitive to me, so that's the 
only issue then, and it's not relevant.


It wasn't that intuitive to me while I was trying to figure out how to 
do this either ;) - Bill's assistance was much appreciated for the JK stuff.


I still have trouble with the concept of saving any POST data, which 
tends to be far bigger than parameters (and retrospectively, I have 
trouble allowing this many parameters). This would kill clustered 
Tomcats setups. Could the default be a very small value (like 64KB or 
something) ?


I took a particularly paranoid view and set the default to 4k.

Mark

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

Re: cvs commit: jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/filters SavedRequestInputFilter.java

[Remy Maucherat]

Mark Thomas wrote:

I took a particularly paranoid view and set the default to 4k.


I see this was in the next commit. Great default.

Rémy

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

DO NOT REPLY [Bug 34771] - Unable to set maxHttpHeaderSize

[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=34771





--- Additional Comments From [EMAIL PROTECTED]  2005-05-23 00:25 ---
I'm not going to remove the final declaration but if you attach a patch for the
additional attributes (diff -u format please) to this bug report I will take a
look at it.

You will need to bear in mind that any future 4.1.x release will most likely use
the 5.0.x branch of jakarta-tomcat-connectors.

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

Michael Bünermann/HBF/Minden/kampa/DE ist außer Haus.

[Michael . Buenermann]

Ich werde ab  21.05.2005 nicht im Büro sein. Ich kehre zurück am
30.05.2005.

Ich werde Ihre Nachricht nach meiner Rückkehr beantworten. In dringenden
Fällen wenden Sie sich bitte Herrn Bagehorn
([EMAIL PROTECTED]). Herr Bagehorn hat die Rufnummer
0571/93425-80) Ab Montag, den 23.05.2005 erreichen Sie mich auch über die
Funk-Rufnummer: 0171/99 33 525.

DO NOT REPLY [Bug 35014] New: - Please document the change in the context file XML format

[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=35014

   Summary: Please document the change in the context file XML
format
   Product: Tomcat 5
   Version: 5.5.9
  Platform: All
OS/Version: All
Status: NEW
  Severity: enhancement
  Priority: P2
 Component: Webapps:Documentation
AssignedTo: tomcat-dev@jakarta.apache.org
ReportedBy: [EMAIL PROTECTED]


Have just spent 3 days stuck on upgrading a working webapp from 5.0.28 to 
5.5.9, I finally solved it with help from tomcat-user, but I can't find the 
core issue mentioned in the TC docs.  I therefore humbly suggest it might be a 
useful note to include in the docs for 5.5 (and maybe 5.0 too, as a warning 
that the approach that was previously valid in 5.0 is now invalid in 5.5).  
Also, might it be a good idea to include this in future 5.5.x release notes?

Basically, under 5.0.28 I had a separate xml context config file within my 
warfile/META-INF, that used the nested-tag approach, i.e.  
  , but this did not work under 5.5.9, 
which seems to require the single-tag  approach.  I recognise that 
the JDBC how-to page example uses the new approach, but it makes no comment 
about the previous approach being invalid, perhaps it would help those 
upgrading if the change was explicitly mentioned?  I say this particularly in 
view of the fact that TC offers several ways to config a context, so it might 
be helpful to clarify that here is one way that is no longer valid in 5.5.

The reported exception was "No suitable driver" from java.sql.DriverManager, 
which is why I did not initially suspect an XML problem.  This is a second 
reason why this is a tricky one to solve without help from the docs.

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

[mturk]

mturk   2005/05/22 23:04:02

  Modified:util/java/org/apache/tomcat/util/net AprEndpoint.java
  Log:
  Fix checking for return value from Poll.poll. Now when the native is
  fixed the correct value is returned in case of timeup. Also reset the
  addCount if the poller is recycled.
  
  Revision  ChangesPath
  1.30  +24 -12
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.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- AprEndpoint.java  18 May 2005 16:01:46 -  1.29
  +++ AprEndpoint.java  23 May 2005 06:04:02 -  1.30
  @@ -780,6 +780,7 @@
   keepAliveCount = 0;
   addS = new long[pollerSize];
   addP = new long[pollerSize];
  +addCount = 0;
   }
   
   /**
  @@ -872,12 +873,17 @@
   getWorkerThread().assign(desc[n*4+1], 
desc[n*4+2]);
   }
   maintainTime += pollTime;
  -} else if (rv < -1) {
  -log.error(sm.getString("endpoint.poll.fail"));
  -// Handle poll critical failure
  -synchronized (this) {
  -destroy();
  -init();
  +} else if (rv < 0) {
  +/* Any non timeup error is critical */
  +if (Status.APR_STATUS_IS_TIMEUP(-rv))
  +rv = 0;
  +else {
  +log.error(sm.getString("endpoint.poll.fail"));
  +// Handle poll critical failure
  +synchronized (this) {
  +destroy();
  +init();
  +}
   }
   }
   if (rv == 0 || maintainTime > 100L) {
  @@ -1252,14 +1258,20 @@
   getWorkerThread().assign(desc[n*4+1], 
state.pool);
   }
   }
  -} else if (rv < -1) {
  -log.error(sm.getString("endpoint.poll.fail"));
  -// Handle poll critical failure
  -synchronized (this) {
  -destroy();
  -init();
  +} else if (rv < 0) {
  +/* Any non timeup error is critical */
  +if (Status.APR_STATUS_IS_TIMEUP(-rv))
  +rv = 0;
  +else {
  +log.error(sm.getString("endpoint.poll.fail"));
  +// Handle poll critical failure
  +synchronized (this) {
  +destroy();
  +init();
  +}
   }
   }
  +/* TODO: See if we need to call the maintain for 
sendfile poller */
   } catch (Throwable t) {
   log.error(sm.getString("endpoint.poll.error"), t);
   }
  
  
  

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

Irene Robatscher/Baldessarini/HUGO_BOSS ist außer Haus.

[Irene Robatscher]

Ich werde ab  14.05.2005 nicht im Büro sein. Ich kehre zurück am
30.05.2005.

I will be out of office from 14.05.05 to 30.05.05. and I will not be able
to read your e-mail.

For urgent matters pls. get into contact with my colleague Mrs. Anna
Franzese: +49-89-306684-16









This e-mail (and/or attachments) is confidential and may be privileged. Use
or disclosure of it by anyone other than a designated addressee is
unauthorized.
If you are not an intended recipient, please delete this e-mail from the
computer on which you received it. We thank you for notifying us
immediately.