tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Filip Hanik - Dev Lists <devli...@hanik.com>
Subject Re: svn commit: r614974 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/coyote/http11/Http11NioProcessor.java
Date Fri, 25 Jan 2008 15:35:55 GMT
you got it
Filip

Peter Rossbach wrote:
> Hi Filip,
>
> can you remove the STATUS.txt entry, please?
>
> Thanks
> Peter
>
> Am 24.01.2008 um 21:23 schrieb fhanik@apache.org:
>
>> Author: fhanik
>> Date: Thu Jan 24 12:22:59 2008
>> New Revision: 614974
>>
>> URL: http://svn.apache.org/viewvc?rev=614974&view=rev
>> Log:
>> vote and implement
>>
>> Modified:
>>     tomcat/tc6.0.x/trunk/STATUS.txt
>>     
>> tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java 
>>
>>
>> Modified: tomcat/tc6.0.x/trunk/STATUS.txt
>> URL: 
>> http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=614974&r1=614973&r2=614974&view=diff

>>
>> ============================================================================== 
>>
>> --- tomcat/tc6.0.x/trunk/STATUS.txt (original)
>> +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jan 24 12:22:59 2008
>> @@ -80,5 +80,5 @@
>>    Otherwise it's only reachable in the HTMLManager.
>>    http://people.apache.org/~rjung/patches/web_xml_expire.patch
>>    (backport of r614933 from trunk)
>> -  +1: rjung
>> +  +1: rjung, fhanik
>>    -1:
>>
>> Modified: 
>> tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java 
>>
>> URL: 
>> http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=614974&r1=614973&r2=614974&view=diff

>>
>> ============================================================================== 
>>
>> --- 
>> tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java 
>> (original)
>> +++ 
>> tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java 
>> Thu Jan 24 12:22:59 2008
>> @@ -751,7 +751,10 @@
>>                  NioEndpoint.KeyAttachment attach = 
>> (NioEndpoint.KeyAttachment)socket.getAttachment(false);
>>                  if (attach != null) {
>>                      attach.setComet(comet);
>> -                    if (!comet) {
>> +                    if (comet) {
>> +                        Integer comettimeout = (Integer) 
>> request.getAttribute("org.apache.tomcat.comet.timeout");
>> +                        if (comettimeout != null) 
>> attach.setTimeout(comettimeout.longValue());
>> +                    } else {
>>                          //reset the timeout
>>                          
>> attach.setTimeout(endpoint.getSocketProperties().getSoTimeout());
>>                      }
>> @@ -889,6 +892,10 @@
>>                          NioEndpoint.KeyAttachment attach = 
>> (NioEndpoint.KeyAttachment) key.attachment();
>>                          if (attach != null)  {
>>                              attach.setComet(comet);
>> +                            if (comet) {
>> +                                Integer comettimeout = (Integer) 
>> request.getAttribute("org.apache.tomcat.comet.timeout");
>> +                                if (comettimeout != null) 
>> attach.setTimeout(comettimeout.longValue());
>> +                            }
>>                          }
>>                      }
>>                  } catch (InterruptedIOException e) {
>>
>>
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
>> For additional commands, e-mail: dev-help@tomcat.apache.org
>>
>>
>
>
> ------------------------------------------------------------------------
>
> No virus found in this incoming message.
> Checked by AVG Free Edition. 
> Version: 7.5.516 / Virus Database: 269.19.11/1243 - Release Date: 1/25/2008 11:24 AM
>   


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message