You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2011/09/05 13:06:06 UTC
svn commit: r1165240 - in /tomcat/tc7.0.x/trunk: ./
webapps/docs/changelog.xml webapps/docs/config/http.xml
Author: markt
Date: Mon Sep 5 11:06:06 2011
New Revision: 1165240
URL: http://svn.apache.org/viewvc?rev=1165240&view=rev
Log:
Correct documented default for connectionTimeout with HTTP connectors
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 5 11:06:06 2011
@@ -1 +1 @@
-/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234
+/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165237
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1165240&r1=1165239&r2=1165240&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Sep 5 11:06:06 2011
@@ -97,6 +97,10 @@
Correct the documentation for connectionLinger for the AJP and HTTP
connectors. (markt)
</fix>
+ <fix>
+ Correct the documentation for the connectionTimeout for the HTTP
+ connectors to show the correct default value. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Other">
Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml?rev=1165240&r1=1165239&r2=1165240&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml Mon Sep 5 11:06:06 2011
@@ -317,7 +317,7 @@
<attribute name="connectionTimeout" required="false">
<p>The number of milliseconds this <strong>Connector</strong> will wait,
after accepting a connection, for the request URI line to be
- presented. The default value is 60000 (i.e. 60 seconds).</p>
+ presented. The default value is 20000 (i.e. 20 seconds).</p>
</attribute>
<attribute name="connectionUploadTimeout" required="false">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1165240 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/changelog.xml
webapps/docs/config/http.xml
Posted by Mark Thomas <ma...@apache.org>.
On 05/09/2011 15:27, Konstantin Kolinko wrote:
> Why are you changing docs without changing the code?
Because the code is 20000 unless I have missed something.
Mark
>
> As far as I see
> org.apache.coyote.http11.Constants.DEFAULT_CONNECTION_TIMEOUT
> is 60000 in 7.0.x.
>
> Best regards,
> Konstantin Kolinko
>
> 2011/9/5 <ma...@apache.org>:
>> Author: markt
>> Date: Mon Sep 5 11:06:06 2011
>> New Revision: 1165240
>>
>> URL: http://svn.apache.org/viewvc?rev=1165240&view=rev
>> Log:
>> Correct documented default for connectionTimeout with HTTP connectors
>>
>> Modified:
>> tomcat/tc7.0.x/trunk/ (props changed)
>> tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
>> tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml
>>
>> Propchange: tomcat/tc7.0.x/trunk/
>> ------------------------------------------------------------------------------
>> --- svn:mergeinfo (original)
>> +++ svn:mergeinfo Mon Sep 5 11:06:06 2011
>> @@ -1 +1 @@
>> -/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234
>> +/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165237
>>
>> Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
>> URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1165240&r1=1165239&r2=1165240&view=diff
>> ==============================================================================
>> --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
>> +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Sep 5 11:06:06 2011
>> @@ -97,6 +97,10 @@
>> Correct the documentation for connectionLinger for the AJP and HTTP
>> connectors. (markt)
>> </fix>
>> + <fix>
>> + Correct the documentation for the connectionTimeout for the HTTP
>> + connectors to show the correct default value. (markt)
>> + </fix>
>> </changelog>
>> </subsection>
>> <subsection name="Other">
>>
>> Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml
>> URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml?rev=1165240&r1=1165239&r2=1165240&view=diff
>> ==============================================================================
>> --- tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml (original)
>> +++ tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml Mon Sep 5 11:06:06 2011
>> @@ -317,7 +317,7 @@
>> <attribute name="connectionTimeout" required="false">
>> <p>The number of milliseconds this <strong>Connector</strong> will wait,
>> after accepting a connection, for the request URI line to be
>> - presented. The default value is 60000 (i.e. 60 seconds).</p>
>> + presented. The default value is 20000 (i.e. 20 seconds).</p>
>> </attribute>
>>
>> <attribute name="connectionUploadTimeout" required="false">
>>
>>
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
>> For additional commands, e-mail: dev-help@tomcat.apache.org
>>
>>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1165240 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/changelog.xml
webapps/docs/config/http.xml
Posted by Mark Thomas <ma...@apache.org>.
On 05/09/2011 15:59, Konstantin Kolinko wrote:
> 2011/9/5 Mark Thomas <ma...@apache.org>:
>> On 05/09/2011 15:27, Konstantin Kolinko wrote:
>>> Why are you changing docs without changing the code?
>>>
>>> As far as I see
>>> org.apache.coyote.http11.Constants.DEFAULT_CONNECTION_TIMEOUT
>>> is 60000 in 7.0.x.
>>
>> Sorry, sent that last reply before I read your message properly. I was
>> going of the default in SocketProperties. I need to do some testing to
>> see which of those defaults is actually being used. Once I've figured
>> that out I'll clean this up. I suspect you are right and that 60s is
>> being used but after all the refactoring it will be worth double checking.
>>
>
> It looks that 20000 is the default value of
> o.a.tomcat.util.net.SocketProperties#soTimeout
>
> but all ***Protocol classes change it in their constructor, e.g.
>
> public Http11Protocol() {
> ...
> setSoTimeout(Constants.DEFAULT_CONNECTION_TIMEOUT);
> }
>
> There are two different constants named "Constants.DEFAULT_CONNECTION_TIMEOUT":
> HTTP connectors use one that is 60000,
> AJP one is -1.
>
> and default server.xml explicitly sets connectionTimeout="20000" on
> its HTTP/1.1 connector.
I'll revert that change later today.
Cheers,
Mark
>
> Best regards,
> Konstantin Kolinko
>
>>> 2011/9/5 <ma...@apache.org>:
>>>> Author: markt
>>>> Date: Mon Sep 5 11:06:06 2011
>>>> New Revision: 1165240
>>>>
>>>> URL: http://svn.apache.org/viewvc?rev=1165240&view=rev
>>>> Log:
>>>> Correct documented default for connectionTimeout with HTTP connectors
>>>>
>>>> Modified:
>>>> tomcat/tc7.0.x/trunk/ (props changed)
>>>> tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
>>>> tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml
>>>>
>>>> Propchange: tomcat/tc7.0.x/trunk/
>>>> ------------------------------------------------------------------------------
>>>> --- svn:mergeinfo (original)
>>>> +++ svn:mergeinfo Mon Sep 5 11:06:06 2011
>>>> @@ -1 +1 @@
>>>> -/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234
>>>> +/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165237
>>>>
>>>> Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
>>>> URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1165240&r1=1165239&r2=1165240&view=diff
>>>> ==============================================================================
>>>> --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
>>>> +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Sep 5 11:06:06 2011
>>>> @@ -97,6 +97,10 @@
>>>> Correct the documentation for connectionLinger for the AJP and HTTP
>>>> connectors. (markt)
>>>> </fix>
>>>> + <fix>
>>>> + Correct the documentation for the connectionTimeout for the HTTP
>>>> + connectors to show the correct default value. (markt)
>>>> + </fix>
>>>> </changelog>
>>>> </subsection>
>>>> <subsection name="Other">
>>>>
>>>> Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml
>>>> URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml?rev=1165240&r1=1165239&r2=1165240&view=diff
>>>> ==============================================================================
>>>> --- tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml (original)
>>>> +++ tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml Mon Sep 5 11:06:06 2011
>>>> @@ -317,7 +317,7 @@
>>>> <attribute name="connectionTimeout" required="false">
>>>> <p>The number of milliseconds this <strong>Connector</strong> will wait,
>>>> after accepting a connection, for the request URI line to be
>>>> - presented. The default value is 60000 (i.e. 60 seconds).</p>
>>>> + presented. The default value is 20000 (i.e. 20 seconds).</p>
>>>> </attribute>
>>>>
>>>> <attribute name="connectionUploadTimeout" required="false">
>>>>
>>>>
>>>>
>>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1165240 - in /tomcat/tc7.0.x/trunk: ./
webapps/docs/changelog.xml webapps/docs/config/http.xml
Posted by Konstantin Kolinko <kn...@gmail.com>.
2011/9/5 Mark Thomas <ma...@apache.org>:
> On 05/09/2011 15:27, Konstantin Kolinko wrote:
>> Why are you changing docs without changing the code?
>>
>> As far as I see
>> org.apache.coyote.http11.Constants.DEFAULT_CONNECTION_TIMEOUT
>> is 60000 in 7.0.x.
>
> Sorry, sent that last reply before I read your message properly. I was
> going of the default in SocketProperties. I need to do some testing to
> see which of those defaults is actually being used. Once I've figured
> that out I'll clean this up. I suspect you are right and that 60s is
> being used but after all the refactoring it will be worth double checking.
>
It looks that 20000 is the default value of
o.a.tomcat.util.net.SocketProperties#soTimeout
but all ***Protocol classes change it in their constructor, e.g.
public Http11Protocol() {
...
setSoTimeout(Constants.DEFAULT_CONNECTION_TIMEOUT);
}
There are two different constants named "Constants.DEFAULT_CONNECTION_TIMEOUT":
HTTP connectors use one that is 60000,
AJP one is -1.
and default server.xml explicitly sets connectionTimeout="20000" on
its HTTP/1.1 connector.
Best regards,
Konstantin Kolinko
>> 2011/9/5 <ma...@apache.org>:
>>> Author: markt
>>> Date: Mon Sep 5 11:06:06 2011
>>> New Revision: 1165240
>>>
>>> URL: http://svn.apache.org/viewvc?rev=1165240&view=rev
>>> Log:
>>> Correct documented default for connectionTimeout with HTTP connectors
>>>
>>> Modified:
>>> tomcat/tc7.0.x/trunk/ (props changed)
>>> tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
>>> tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml
>>>
>>> Propchange: tomcat/tc7.0.x/trunk/
>>> ------------------------------------------------------------------------------
>>> --- svn:mergeinfo (original)
>>> +++ svn:mergeinfo Mon Sep 5 11:06:06 2011
>>> @@ -1 +1 @@
>>> -/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234
>>> +/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165237
>>>
>>> Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
>>> URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1165240&r1=1165239&r2=1165240&view=diff
>>> ==============================================================================
>>> --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
>>> +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Sep 5 11:06:06 2011
>>> @@ -97,6 +97,10 @@
>>> Correct the documentation for connectionLinger for the AJP and HTTP
>>> connectors. (markt)
>>> </fix>
>>> + <fix>
>>> + Correct the documentation for the connectionTimeout for the HTTP
>>> + connectors to show the correct default value. (markt)
>>> + </fix>
>>> </changelog>
>>> </subsection>
>>> <subsection name="Other">
>>>
>>> Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml
>>> URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml?rev=1165240&r1=1165239&r2=1165240&view=diff
>>> ==============================================================================
>>> --- tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml (original)
>>> +++ tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml Mon Sep 5 11:06:06 2011
>>> @@ -317,7 +317,7 @@
>>> <attribute name="connectionTimeout" required="false">
>>> <p>The number of milliseconds this <strong>Connector</strong> will wait,
>>> after accepting a connection, for the request URI line to be
>>> - presented. The default value is 60000 (i.e. 60 seconds).</p>
>>> + presented. The default value is 20000 (i.e. 20 seconds).</p>
>>> </attribute>
>>>
>>> <attribute name="connectionUploadTimeout" required="false">
>>>
>>>
>>>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1165240 - in /tomcat/tc7.0.x/trunk: ./ webapps/docs/changelog.xml
webapps/docs/config/http.xml
Posted by Mark Thomas <ma...@apache.org>.
On 05/09/2011 15:27, Konstantin Kolinko wrote:
> Why are you changing docs without changing the code?
>
> As far as I see
> org.apache.coyote.http11.Constants.DEFAULT_CONNECTION_TIMEOUT
> is 60000 in 7.0.x.
Sorry, sent that last reply before I read your message properly. I was
going of the default in SocketProperties. I need to do some testing to
see which of those defaults is actually being used. Once I've figured
that out I'll clean this up. I suspect you are right and that 60s is
being used but after all the refactoring it will be worth double checking.
Mark
>
> Best regards,
> Konstantin Kolinko
>
> 2011/9/5 <ma...@apache.org>:
>> Author: markt
>> Date: Mon Sep 5 11:06:06 2011
>> New Revision: 1165240
>>
>> URL: http://svn.apache.org/viewvc?rev=1165240&view=rev
>> Log:
>> Correct documented default for connectionTimeout with HTTP connectors
>>
>> Modified:
>> tomcat/tc7.0.x/trunk/ (props changed)
>> tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
>> tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml
>>
>> Propchange: tomcat/tc7.0.x/trunk/
>> ------------------------------------------------------------------------------
>> --- svn:mergeinfo (original)
>> +++ svn:mergeinfo Mon Sep 5 11:06:06 2011
>> @@ -1 +1 @@
>> -/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234
>> +/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165237
>>
>> Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
>> URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1165240&r1=1165239&r2=1165240&view=diff
>> ==============================================================================
>> --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
>> +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Sep 5 11:06:06 2011
>> @@ -97,6 +97,10 @@
>> Correct the documentation for connectionLinger for the AJP and HTTP
>> connectors. (markt)
>> </fix>
>> + <fix>
>> + Correct the documentation for the connectionTimeout for the HTTP
>> + connectors to show the correct default value. (markt)
>> + </fix>
>> </changelog>
>> </subsection>
>> <subsection name="Other">
>>
>> Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml
>> URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml?rev=1165240&r1=1165239&r2=1165240&view=diff
>> ==============================================================================
>> --- tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml (original)
>> +++ tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml Mon Sep 5 11:06:06 2011
>> @@ -317,7 +317,7 @@
>> <attribute name="connectionTimeout" required="false">
>> <p>The number of milliseconds this <strong>Connector</strong> will wait,
>> after accepting a connection, for the request URI line to be
>> - presented. The default value is 60000 (i.e. 60 seconds).</p>
>> + presented. The default value is 20000 (i.e. 20 seconds).</p>
>> </attribute>
>>
>> <attribute name="connectionUploadTimeout" required="false">
>>
>>
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
>> For additional commands, e-mail: dev-help@tomcat.apache.org
>>
>>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1165240 - in /tomcat/tc7.0.x/trunk: ./
webapps/docs/changelog.xml webapps/docs/config/http.xml
Posted by Konstantin Kolinko <kn...@gmail.com>.
Why are you changing docs without changing the code?
As far as I see
org.apache.coyote.http11.Constants.DEFAULT_CONNECTION_TIMEOUT
is 60000 in 7.0.x.
Best regards,
Konstantin Kolinko
2011/9/5 <ma...@apache.org>:
> Author: markt
> Date: Mon Sep 5 11:06:06 2011
> New Revision: 1165240
>
> URL: http://svn.apache.org/viewvc?rev=1165240&view=rev
> Log:
> Correct documented default for connectionTimeout with HTTP connectors
>
> Modified:
> tomcat/tc7.0.x/trunk/ (props changed)
> tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
> tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml
>
> Propchange: tomcat/tc7.0.x/trunk/
> ------------------------------------------------------------------------------
> --- svn:mergeinfo (original)
> +++ svn:mergeinfo Mon Sep 5 11:06:06 2011
> @@ -1 +1 @@
> -/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234
> +/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165237
>
> Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
> URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1165240&r1=1165239&r2=1165240&view=diff
> ==============================================================================
> --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
> +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Sep 5 11:06:06 2011
> @@ -97,6 +97,10 @@
> Correct the documentation for connectionLinger for the AJP and HTTP
> connectors. (markt)
> </fix>
> + <fix>
> + Correct the documentation for the connectionTimeout for the HTTP
> + connectors to show the correct default value. (markt)
> + </fix>
> </changelog>
> </subsection>
> <subsection name="Other">
>
> Modified: tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml
> URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml?rev=1165240&r1=1165239&r2=1165240&view=diff
> ==============================================================================
> --- tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml (original)
> +++ tomcat/tc7.0.x/trunk/webapps/docs/config/http.xml Mon Sep 5 11:06:06 2011
> @@ -317,7 +317,7 @@
> <attribute name="connectionTimeout" required="false">
> <p>The number of milliseconds this <strong>Connector</strong> will wait,
> after accepting a connection, for the request URI line to be
> - presented. The default value is 60000 (i.e. 60 seconds).</p>
> + presented. The default value is 20000 (i.e. 20 seconds).</p>
> </attribute>
>
> <attribute name="connectionUploadTimeout" required="false">
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org