svn commit: r4369 - /dev/tomcat/tomcat-7/v7.0.51/

2014-02-12 Thread violetagg
Author: violetagg
Date: Wed Feb 12 07:59:33 2014
New Revision: 4369

Log:
7.0.51 did not pass the vote - dropping.

Removed:
dev/tomcat/tomcat-7/v7.0.51/


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



Re: [VOTE] Release Apache Tomcat 7.0.51

2014-02-12 Thread Mark Thomas
On 12/02/2014 07:35, Violeta Georgieva wrote:
> 2014-02-12 Konstantin Kolinko :
>>
>> 2014-02-11 19:15 GMT+04:00 Konstantin Kolinko :
>>> 2014-02-11 18:57 GMT+04:00 Mark Thomas :
 On 11/02/2014 14:38, Konstantin Kolinko wrote:
> 2014-02-11 17:32 GMT+04:00 Mark Thomas :
> I see you also took care of metadata-complete=\"true\". OK.
>
> The following also comes to mind:
> ,  in 2.4  do not support multiple
>  elements.
>  (Each pattern needs its own <**-mapping> element).

>>
>> It does work successfully:
>> I expanded the test case to include conf/web.xml into the mix.
>>
>> Our default conf/web.xml has an example of such usage:
>>
>> 
>> jsp
>> *.jsp
>> *.jspx
>> 
>>
>> That is printed as two separate  elements by merged
> web.xml.
>> So we are OK here.
>>
>>
>> By the way, populating MERGED_WEB_XML context attribute in Tomcat 8
>> can be either removed or be made optional (off by default). Jasper no
>> longer needs it.
>> See "TODO" comment at ContextConfig line 1184.
> 
> Thanks all for validating.
> I'm canceling this vote and I'll start preparing 7.0.52 for voting.

Can you hold off for a little while please? I am investigating a TCK
failure when testing with BIO + APR + mod_jk. I'm currently trying to
narrow down the commit that triggered this failure. I should have more
news in a couple of hours.

Mark


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



svn commit: r1567555 - /tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

2014-02-12 Thread violetagg
Author: violetagg
Date: Wed Feb 12 08:11:44 2014
New Revision: 1567555

URL: http://svn.apache.org/r1567555
Log:
Mark 7.0.51 as not released based on the vote results.

Modified:
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

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=1567555&r1=1567554&r2=1567555&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Feb 12 08:11:44 2014
@@ -65,7 +65,7 @@
 
   
 
-
+
   
 
   



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



svn commit: r1567558 - in /tomcat/tc7.0.x/tags/TOMCAT_7_0_52: ./ build.properties.default

2014-02-12 Thread violetagg
Author: violetagg
Date: Wed Feb 12 08:22:58 2014
New Revision: 1567558

URL: http://svn.apache.org/r1567558
Log:
Tag 7.0.52

Added:
tomcat/tc7.0.x/tags/TOMCAT_7_0_52/   (props changed)
  - copied from r1567555, tomcat/tc7.0.x/trunk/
Modified:
tomcat/tc7.0.x/tags/TOMCAT_7_0_52/build.properties.default

Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_52/
--
bugtraq:append = false

Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_52/
--
bugtraq:label = Bugzilla ID (optional)

Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_52/
--
--- bugtraq:message (added)
+++ bugtraq:message Wed Feb 12 08:22:58 2014
@@ -0,0 +1 @@
+Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=%BUGID%

Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_52/
--
bugtraq:number = true

Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_52/
--
bugtraq:url = https://issues.apache.org/bugzilla/show_bug.cgi?id=%BUGID%

Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_52/
--
bugtraq:warnifnoissue = false

Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_52/
--
--- svn:ignore (added)
+++ svn:ignore Wed Feb 12 08:22:58 2014
@@ -0,0 +1,7 @@
+.*
+build.properties
+logs
+nbproject
+output
+work
+*.iml

Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_52/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Feb 12 08:22:58 2014
@@ -0,0 +1 @@
+/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222328,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114
 
,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342
 
498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,1346794,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348357,1348398,1348425,1348461-1348495,1348498,1348752,1348762,1348772,1348776,1348859,1348968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879,1349887,1349893,1349922,1349984,1350124,1350241,1350243,1350294-1350295,1350299,1350864,1350900,1351010,1351054,1351056,1351068,1351134-1351135,1351148,1351259,1351604,1351636-1351640,1351991,1351993,1352011,1352056,1352059,1352661,1
 
352663,1352788,1352799,1353087,1353125,1353240,1353261,1353414,1353468,1353501,1353581,1

Re: [VOTE] Release Apache Tomcat 7.0.51

2014-02-12 Thread Violeta Georgieva
2014-02-12 Mark Thomas :
>
> On 12/02/2014 07:35, Violeta Georgieva wrote:
> > 2014-02-12 Konstantin Kolinko :
> >>
> >> 2014-02-11 19:15 GMT+04:00 Konstantin Kolinko :
> >>> 2014-02-11 18:57 GMT+04:00 Mark Thomas :
>  On 11/02/2014 14:38, Konstantin Kolinko wrote:
> > 2014-02-11 17:32 GMT+04:00 Mark Thomas :
> > I see you also took care of metadata-complete=\"true\". OK.
> >
> > The following also comes to mind:
> > ,  in 2.4  do not support multiple
> >  elements.
> >  (Each pattern needs its own <**-mapping> element).
> 
> >>
> >> It does work successfully:
> >> I expanded the test case to include conf/web.xml into the mix.
> >>
> >> Our default conf/web.xml has an example of such usage:
> >>
> >> 
> >> jsp
> >> *.jsp
> >> *.jspx
> >> 
> >>
> >> That is printed as two separate  elements by merged
> > web.xml.
> >> So we are OK here.
> >>
> >>
> >> By the way, populating MERGED_WEB_XML context attribute in Tomcat 8
> >> can be either removed or be made optional (off by default). Jasper no
> >> longer needs it.
> >> See "TODO" comment at ContextConfig line 1184.
> >
> > Thanks all for validating.
> > I'm canceling this vote and I'll start preparing 7.0.52 for voting.
>
> Can you hold off for a little while please? I am investigating a TCK
> failure when testing with BIO + APR + mod_jk. I'm currently trying to
> narrow down the commit that triggered this failure. I should have more
> news in a couple of hours.

OK

> Mark
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>


Re: [VOTE] Release Apache Tomcat 7.0.51

2014-02-12 Thread Mark Thomas
On 12/02/2014 08:25, Violeta Georgieva wrote:
> 2014-02-12 Mark Thomas :

>> Can you hold off for a little while please? I am investigating a TCK
>> failure when testing with BIO + APR + mod_jk. I'm currently trying to
>> narrow down the commit that triggered this failure. I should have more
>> news in a couple of hours.
> 
> OK

So far I've narrowed it down to a range of ~30 commits.
r1552806 passes
r1559087 fails

Looking at the commit log, my current suspect is r1558371.

Mark


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



Re: [VOTE] Release Apache Tomcat 7.0.51

2014-02-12 Thread Mark Thomas
On 12/02/2014 09:49, Mark Thomas wrote:
> On 12/02/2014 08:25, Violeta Georgieva wrote:
>> 2014-02-12 Mark Thomas :
> 
>>> Can you hold off for a little while please? I am investigating a TCK
>>> failure when testing with BIO + APR + mod_jk. I'm currently trying to
>>> narrow down the commit that triggered this failure. I should have more
>>> news in a couple of hours.
>>
>> OK
> 
> So far I've narrowed it down to a range of ~30 commits.
> r1552806 passes
> r1559087 fails
> 
> Looking at the commit log, my current suspect is r1558371.

I meant r1558173

Mark


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



svn commit: r1567580 - /tomcat/trunk/test/org/apache/tomcat/util/descriptor/web/TestWebXml.java

2014-02-12 Thread kkolinko
Author: kkolinko
Date: Wed Feb 12 10:08:13 2014
New Revision: 1567580

URL: http://svn.apache.org/r1567580
Log:
Assert that version number of written and re-parsed web.xml is as expected.

Modified:
tomcat/trunk/test/org/apache/tomcat/util/descriptor/web/TestWebXml.java

Modified: 
tomcat/trunk/test/org/apache/tomcat/util/descriptor/web/TestWebXml.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/descriptor/web/TestWebXml.java?rev=1567580&r1=1567579&r2=1567580&view=diff
==
--- tomcat/trunk/test/org/apache/tomcat/util/descriptor/web/TestWebXml.java 
(original)
+++ tomcat/trunk/test/org/apache/tomcat/util/descriptor/web/TestWebXml.java Wed 
Feb 12 10:08:13 2014
@@ -186,13 +186,15 @@ public class TestWebXml {
 // System.out.print(webxml.toXml() + "\n\n\n");
 
 InputSource is = new InputSource(new StringReader(webxml.toXml()));
-digester.push(new WebXml());
+WebXml webxmlResult = new WebXml();
+digester.push(webxmlResult);
 digester.parse(is);
 
 Assert.assertEquals(0, handler.getErrors().size());
 Assert.assertEquals(0, handler.getWarnings().size());
 
 Assert.assertEquals(version, webxml.getVersion());
+Assert.assertEquals(version, webxmlResult.getVersion());
 }
 
 // A simplified copy of ContextConfig.getDefaultWebXmlFragment().



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



svn commit: r1567582 - in /tomcat/tc7.0.x/trunk: ./ test/org/apache/catalina/deploy/TestWebXml.java

2014-02-12 Thread kkolinko
Author: kkolinko
Date: Wed Feb 12 10:13:04 2014
New Revision: 1567582

URL: http://svn.apache.org/r1567582
Log:
Backport r1567580 from tomcat/trunk:
One more followup to r1567148
Assert that version number of written and re-parsed web.xml is as expected.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/test/org/apache/catalina/deploy/TestWebXml.java

Propchange: tomcat/tc7.0.x/trunk/
--
  Merged /tomcat/trunk:r1567580

Modified: tomcat/tc7.0.x/trunk/test/org/apache/catalina/deploy/TestWebXml.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/catalina/deploy/TestWebXml.java?rev=1567582&r1=1567581&r2=1567582&view=diff
==
--- tomcat/tc7.0.x/trunk/test/org/apache/catalina/deploy/TestWebXml.java 
(original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/catalina/deploy/TestWebXml.java Wed 
Feb 12 10:13:04 2014
@@ -171,13 +171,15 @@ public class TestWebXml {
 // System.out.print(webxml.toXml() + "\n\n\n");
 
 InputSource is = new InputSource(new StringReader(webxml.toXml()));
-digester.push(new WebXml());
+WebXml webxmlResult = new WebXml();
+digester.push(webxmlResult);
 digester.parse(is);
 
 Assert.assertEquals(0, handler.getErrors().size());
 Assert.assertEquals(0, handler.getWarnings().size());
 
 Assert.assertEquals(version, webxml.getVersion());
+Assert.assertEquals(version, webxmlResult.getVersion());
 }
 
 // A simplified copy of ContextConfig.getDefaultWebXmlFragment().



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



Re: [VOTE] Release Apache Tomcat 7.0.51

2014-02-12 Thread Mark Thomas
On 12/02/2014 09:50, Mark Thomas wrote:
> On 12/02/2014 09:49, Mark Thomas wrote:
>> On 12/02/2014 08:25, Violeta Georgieva wrote:
>>> 2014-02-12 Mark Thomas :
>>
 Can you hold off for a little while please? I am investigating a TCK
 failure when testing with BIO + APR + mod_jk. I'm currently trying to
 narrow down the commit that triggered this failure. I should have more
 news in a couple of hours.
>>>
>>> OK
>>
>> So far I've narrowed it down to a range of ~30 commits.
>> r1552806 passes
>> r1559087 fails
>>
>> Looking at the commit log, my current suspect is r1558371.
> 
> I meant r1558173

I've confirmed that this is the commit that triggered the failure. I'm
digging into why it fails now.

Mark


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



svn commit: r1567632 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/ java/org/apache/coyote/ajp/ java/org/apache/coyote/http11/ webapps/docs/

2014-02-12 Thread markt
Author: markt
Date: Wed Feb 12 14:26:13 2014
New Revision: 1567632

URL: http://svn.apache.org/r1567632
Log:
Back-port some refactoring required for an async timeout fix.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProcessor.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpProcessor.java

tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11Processor.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
  Merged /tomcat/trunk:r1512034

Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProcessor.java?rev=1567632&r1=1567631&r2=1567632&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProcessor.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/AbstractProcessor.java Wed Feb 
12 14:26:13 2014
@@ -35,6 +35,7 @@ public abstract class AbstractProcessor<
 protected AbstractEndpoint endpoint;
 protected Request request;
 protected Response response;
+protected SocketWrapper socketWrapper = null;
 
 
 /**
@@ -54,7 +55,6 @@ public abstract class AbstractProcessor<
 response = new Response();
 response.setHook(this);
 request.setResponse(response);
-
 }
 
 
@@ -96,6 +96,22 @@ public abstract class AbstractProcessor<
 
 
 /**
+ * Set the socket wrapper being used.
+ */
+protected final void setSocketWrapper(SocketWrapper socketWrapper) {
+this.socketWrapper = socketWrapper;
+}
+
+
+/**
+ * Get the socket wrapper being used.
+ */
+protected final SocketWrapper getSocketWrapper() {
+return socketWrapper;
+}
+
+
+/**
  * Obtain the Executor used by the underlying endpoint.
  */
 @Override

Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java?rev=1567632&r1=1567631&r2=1567632&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProcessor.java Wed 
Feb 12 14:26:13 2014
@@ -74,13 +74,6 @@ public class AjpAprProcessor extends Abs
 
 // - Instance Variables
 
-
-/**
- * Socket associated with the current connection.
- */
-protected SocketWrapper socket;
-
-
 /**
  * Direct buffer used for input.
  */
@@ -109,7 +102,7 @@ public class AjpAprProcessor extends Abs
 rp.setStage(org.apache.coyote.Constants.STAGE_PARSE);
 
 // Setting up the socket
-this.socket = socket;
+this.socketWrapper = socket;
 long socketRef = socket.getSocket().longValue();
 Socket.setrbb(socketRef, inputBuffer);
 Socket.setsbb(socketRef, outputBuffer);
@@ -260,18 +253,18 @@ public class AjpAprProcessor extends Abs
 
 if (actionCode == ActionCode.ASYNC_COMPLETE) {
 if (asyncStateMachine.asyncComplete()) {
-((AprEndpoint)endpoint).processSocketAsync(this.socket,
+((AprEndpoint)endpoint).processSocketAsync(this.socketWrapper,
 SocketStatus.OPEN_READ);
 }
 
 } else if (actionCode == ActionCode.ASYNC_SETTIMEOUT) {
 if (param == null) return;
 long timeout = ((Long)param).longValue();
-socket.setTimeout(timeout);
+socketWrapper.setTimeout(timeout);
 
 } else if (actionCode == ActionCode.ASYNC_DISPATCH) {
 if (asyncStateMachine.asyncDispatch()) {
-((AprEndpoint)endpoint).processSocketAsync(this.socket,
+((AprEndpoint)endpoint).processSocketAsync(this.socketWrapper,
 SocketStatus.OPEN_READ);
 }
 }
@@ -290,7 +283,7 @@ public class AjpAprProcessor extends Abs
 throws IOException {
 outputBuffer.put(src, offset, length);
 
-long socketRef = socket.getSocket().longValue();
+long socketRef = socketWrapper.getSocket().longValue();
 
 if (outputBuffer.position() > 0) {
 if ((socketRef != 0) && Socket.send

svn commit: r1567634 - in /tomcat/trunk: java/org/apache/coyote/ajp/AbstractAjpProcessor.java java/org/apache/coyote/http11/AbstractHttp11Processor.java webapps/docs/changelog.xml

2014-02-12 Thread markt
Author: markt
Date: Wed Feb 12 14:36:26 2014
New Revision: 1567634

URL: http://svn.apache.org/r1567634
Log:
In some circumstances asynchronous requests could time out too soon.

Modified:
tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java?rev=1567634&r1=1567633&r2=1567634&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java Wed Feb 
12 14:36:26 2014
@@ -521,6 +521,8 @@ public abstract class AbstractAjpProcess
 
 } else if (actionCode == ActionCode.ASYNC_START) {
 asyncStateMachine.asyncStart((AsyncContextCallback) param);
+// Async time out is based on SocketWrapper access time
+getSocketWrapper().access();
 
 } else if (actionCode == ActionCode.ASYNC_COMPLETE) {
 socketWrapper.clearDispatches();

Modified: 
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1567634&r1=1567633&r2=1567634&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Wed 
Feb 12 14:36:26 2014
@@ -795,6 +795,8 @@ public abstract class AbstractHttp11Proc
 internalBuffer.addActiveFilter(savedBody);
 } else if (actionCode == ActionCode.ASYNC_START) {
 asyncStateMachine.asyncStart((AsyncContextCallback) param);
+// Async time out is based on SocketWrapper access time
+getSocketWrapper().access();
 } else if (actionCode == ActionCode.ASYNC_DISPATCHED) {
 asyncStateMachine.asyncDispatched();
 } else if (actionCode == ActionCode.ASYNC_TIMEOUT) {

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1567634&r1=1567633&r2=1567634&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Feb 12 14:36:26 2014
@@ -62,6 +62,14 @@
   
 
   
+  
+
+  
+In some circumstances asynchronous requests could time out too soon.
+(markt)
+  
+
+  
   
 
   



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



svn commit: r1567635 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/coyote/ajp/AbstractAjpProcessor.java java/org/apache/coyote/http11/AbstractHttp11Processor.java webapps/docs/changelog.xml

2014-02-12 Thread markt
Author: markt
Date: Wed Feb 12 14:39:04 2014
New Revision: 1567635

URL: http://svn.apache.org/r1567635
Log:
In some circumstances asynchronous requests could time out too soon.

Modified:
tomcat/tc7.0.x/trunk/   (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java

tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
--
  Merged /tomcat/trunk:r1567634

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java?rev=1567635&r1=1567634&r2=1567635&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AbstractAjpProcessor.java 
Wed Feb 12 14:39:04 2014
@@ -451,6 +451,8 @@ public abstract class AbstractAjpProcess
 
 } else if (actionCode == ActionCode.ASYNC_START) {
 asyncStateMachine.asyncStart((AsyncContextCallback) param);
+// Async time out is based on SocketWrapper access time
+getSocketWrapper().access();
 } else if (actionCode == ActionCode.ASYNC_DISPATCHED) {
 asyncStateMachine.asyncDispatched();
 } else if (actionCode == ActionCode.ASYNC_TIMEOUT) {

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1567635&r1=1567634&r2=1567635&view=diff
==
--- 
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java 
(original)
+++ 
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java 
Wed Feb 12 14:39:04 2014
@@ -834,6 +834,8 @@ public abstract class AbstractHttp11Proc
 internalBuffer.addActiveFilter(savedBody);
 } else if (actionCode == ActionCode.ASYNC_START) {
 asyncStateMachine.asyncStart((AsyncContextCallback) param);
+// Async time out is based on SocketWrapper access time
+getSocketWrapper().access();
 } else if (actionCode == ActionCode.ASYNC_DISPATCHED) {
 asyncStateMachine.asyncDispatched();
 } else if (actionCode == ActionCode.ASYNC_TIMEOUT) {

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=1567635&r1=1567634&r2=1567635&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Feb 12 14:39:04 2014
@@ -64,12 +64,16 @@
   
 
   
-  
+  
 
   
 Pull up SocketWrapper to AbstractProcessor.
 (markt)
   
+  
+In some circumstances asynchronous requests could time out too soon.
+(markt)
+  
 
   
 



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



buildbot failure in ASF Buildbot on tomcat-7-trunk

2014-02-12 Thread buildbot
The Buildbot has detected a new failure on builder tomcat-7-trunk while 
building ASF Buildbot.
Full details are available at:
 http://ci.apache.org/builders/tomcat-7-trunk/builds/1756

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: bb-vm_ubuntu

Build Reason: scheduler
Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1567632
Blamelist: markt

BUILD FAILED: failed compile_1

sincerely,
 -The Buildbot





Re: [VOTE] Release Apache Tomcat 7.0.51

2014-02-12 Thread Mark Thomas
On 12/02/2014 12:19, Mark Thomas wrote:
> On 12/02/2014 09:50, Mark Thomas wrote:
>> On 12/02/2014 09:49, Mark Thomas wrote:
>>> On 12/02/2014 08:25, Violeta Georgieva wrote:
 2014-02-12 Mark Thomas :
>>>
> Can you hold off for a little while please? I am investigating a TCK
> failure when testing with BIO + APR + mod_jk. I'm currently trying to
> narrow down the commit that triggered this failure. I should have more
> news in a couple of hours.

 OK
>>>
>>> So far I've narrowed it down to a range of ~30 commits.
>>> r1552806 passes
>>> r1559087 fails
>>>
>>> Looking at the commit log, my current suspect is r1558371.
>>
>> I meant r1558173
> 
> I've confirmed that this is the commit that triggered the failure. I'm
> digging into why it fails now.

Fixed in r1567635.

Mark

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



svn commit: r1567644 - in /tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11: Http11AprProcessor.java Http11Processor.java

2014-02-12 Thread markt
Author: markt
Date: Wed Feb 12 15:19:49 2014
New Revision: 1567644

URL: http://svn.apache.org/r1567644
Log:
Additional fixes required to r1567632. Missed due to naming differences between 
trunk and 7.0.x

Modified:
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11Processor.java

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=1567644&r1=1567643&r2=1567644&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java 
Wed Feb 12 15:19:49 2014
@@ -94,12 +94,6 @@ public class Http11AprProcessor extends 
 
 
 /**
- * Socket associated with the current connection.
- */
-protected SocketWrapper socket = null;
-
-
-/**
  * When client certificate information is presented in a form other than
  * instances of {@link java.security.cert.X509Certificate} it needs to be
  * converted before it can be used and this property controls which JSSE
@@ -205,7 +199,7 @@ public class Http11AprProcessor extends 
 
 @Override
 protected void setSocketTimeout(int timeout) {
-Socket.timeoutSet(socket.getSocket().longValue(), timeout * 1000);
+Socket.timeoutSet(socketWrapper.getSocket().longValue(), timeout * 
1000);
 }
 
 
@@ -252,7 +246,7 @@ public class Http11AprProcessor extends 
 
 @Override
 public void recycleInternal() {
-socket = null;
+socketWrapper = null;
 sendfileData = null;
 }
 
@@ -274,7 +268,7 @@ public class Http11AprProcessor extends 
 @Override
 public void actionInternal(ActionCode actionCode, Object param) {
 
-long socketRef = socket.getSocket().longValue();
+long socketRef = socketWrapper.getSocket().longValue();
 
 if (actionCode == ActionCode.REQ_HOST_ADDR_ATTRIBUTE) {
 
@@ -454,13 +448,13 @@ public class Http11AprProcessor extends 
 } else if (actionCode == ActionCode.COMET_END) {
 comet = false;
 } else if (actionCode == ActionCode.COMET_CLOSE) {
-((AprEndpoint)endpoint).processSocketAsync(this.socket,
+((AprEndpoint)endpoint).processSocketAsync(this.socketWrapper,
 SocketStatus.OPEN_READ);
 } else if (actionCode == ActionCode.COMET_SETTIMEOUT) {
 //no op
 } else if (actionCode == ActionCode.ASYNC_COMPLETE) {
 if (asyncStateMachine.asyncComplete()) {
-((AprEndpoint)endpoint).processSocketAsync(this.socket,
+((AprEndpoint)endpoint).processSocketAsync(this.socketWrapper,
 SocketStatus.OPEN_READ);
 }
 } else if (actionCode == ActionCode.ASYNC_SETTIMEOUT) {
@@ -468,10 +462,10 @@ public class Http11AprProcessor extends 
 return;
 }
 long timeout = ((Long)param).longValue();
-socket.setTimeout(timeout);
+socketWrapper.setTimeout(timeout);
 } else if (actionCode == ActionCode.ASYNC_DISPATCH) {
 if (asyncStateMachine.asyncDispatch()) {
-((AprEndpoint)endpoint).processSocketAsync(this.socket,
+((AprEndpoint)endpoint).processSocketAsync(this.socketWrapper,
 SocketStatus.OPEN_READ);
 }
 }

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1567644&r1=1567643&r2=1567644&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11Processor.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/http11/Http11Processor.java Wed 
Feb 12 15:19:49 2014
@@ -86,12 +86,6 @@ public class Http11Processor extends Abs
 
 
 /**
- * Socket associated with the current connection.
- */
-protected SocketWrapper socket;
-
-
-/**
  * The percentage of threads that have to be in use before keep-alive is
  * disabled to aid scalability.
  */
@@ -151,13 +145,13 @@ public class Http11Processor extends Abs
  * This is a little hacky but better than exposing the socket
  * and the timeout info to the InputBuffer
  */
-if (inputBuffer.lastValid == 0 && socket.getLastAccess() > -1) {
+if (inputBuffer.lastValid == 0 && socketWrapper.getLastAccess() > -1) {
 int firstReadTimeout;
 if (keepAliveTimeout == -1) {
 firstReadTimeout = 0;
 } else {
 long queueTime =
- 

svn commit: r1567653 - /tomcat/trunk/webapps/docs/changelog.xml

2014-02-12 Thread markt
Author: markt
Date: Wed Feb 12 15:35:52 2014
New Revision: 1567653

URL: http://svn.apache.org/r1567653
Log:
Add 8.0.3 release date

Modified:
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1567653&r1=1567652&r2=1567653&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Feb 12 15:35:52 2014
@@ -90,7 +90,7 @@
 
   
 
-
+
   
 
   



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



svn commit: r1567655 - in /tomcat/site/trunk: ./ docs/ xdocs/

2014-02-12 Thread markt
Author: markt
Date: Wed Feb 12 15:41:38 2014
New Revision: 1567655

URL: http://svn.apache.org/r1567655
Log:
Update for 8.0.3 release excluding docs

Modified:
tomcat/site/trunk/build.properties.default
tomcat/site/trunk/docs/doap_Tomcat.rdf
tomcat/site/trunk/docs/download-80.html
tomcat/site/trunk/docs/index.html
tomcat/site/trunk/docs/migration-8.html
tomcat/site/trunk/docs/oldnews.html
tomcat/site/trunk/docs/security-8.html
tomcat/site/trunk/docs/whichversion.html
tomcat/site/trunk/xdocs/doap_Tomcat.rdf
tomcat/site/trunk/xdocs/download-80.xml
tomcat/site/trunk/xdocs/index.xml
tomcat/site/trunk/xdocs/migration-8.xml
tomcat/site/trunk/xdocs/oldnews.xml
tomcat/site/trunk/xdocs/security-8.xml
tomcat/site/trunk/xdocs/whichversion.xml

Modified: tomcat/site/trunk/build.properties.default
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/build.properties.default?rev=1567655&r1=1567654&r2=1567655&view=diff
==
--- tomcat/site/trunk/build.properties.default (original)
+++ tomcat/site/trunk/build.properties.default Wed Feb 12 15:41:38 2014
@@ -38,7 +38,7 @@ tomcat.loc=http://www.apache.org/dist/to
 # - Tomcat versions -
 tomcat60=6.0.39
 tomcat70=7.0.50
-tomcat80=8.0.1
+tomcat80=8.0.3
 
 
 # - Download destination -

Modified: tomcat/site/trunk/docs/doap_Tomcat.rdf
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/doap_Tomcat.rdf?rev=1567655&r1=1567654&r2=1567655&view=diff
==
--- tomcat/site/trunk/docs/doap_Tomcat.rdf (original)
+++ tomcat/site/trunk/docs/doap_Tomcat.rdf Wed Feb 12 15:41:38 2014
@@ -57,8 +57,8 @@
 
   
 Latest 8.0.x Release (Non-stable)
-2014-02-02
-8.0.1 (beta)
+2014-02-11
+8.0.3 (beta)
   
 
 

Modified: tomcat/site/trunk/docs/download-80.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-80.html?rev=1567655&r1=1567654&r2=1567655&view=diff
==
--- tomcat/site/trunk/docs/download-80.html (original)
+++ tomcat/site/trunk/docs/download-80.html Wed Feb 12 15:41:38 2014
@@ -204,8 +204,8 @@
 
 
 https://www.apache.org/dist/tomcat/tomcat-8/KEYS";>KEYS |
-8.0.1 |
-Browse |
+8.0.3 |
+Browse |
 http://archive.apache.org/dist/tomcat/tomcat-8";>Archives
   
 
@@ -251,12 +251,12 @@

   
 
-8.0.1
+8.0.3
 
   
 
   Please see the 
-  README
+  README
   file for packaging information.  It explains what every distribution 
contains.
   
 
@@ -272,44 +272,44 @@
   
 
 
-zip 
-(https://www.apache.org/dist/tomcat/tomcat-8/v8.0.1/bin/apache-tomcat-8.0.1.zip.asc";>pgp,
 
-https://www.apache.org/dist/tomcat/tomcat-8/v8.0.1/bin/apache-tomcat-8.0.1.zip.md5";>md5)
+zip 
+(https://www.apache.org/dist/tomcat/tomcat-8/v8.0.3/bin/apache-tomcat-8.0.3.zip.asc";>pgp,
 
+https://www.apache.org/dist/tomcat/tomcat-8/v8.0.3/bin/apache-tomcat-8.0.3.zip.md5";>md5)
   
   
 
 
-tar.gz 
-(https://www.apache.org/dist/tomcat/tomcat-8/v8.0.1/bin/apache-tomcat-8.0.1.tar.gz.asc";>pgp,
 
-https://www.apache.org/dist/tomcat/tomcat-8/v8.0.1/bin/apache-tomcat-8.0.1.tar.gz.md5";>md5)
+tar.gz 
+(https://www.apache.org/dist/tomcat/tomcat-8/v8.0.3/bin/apache-tomcat-8.0.3.tar.gz.asc";>pgp,
 
+https://www.apache.org/dist/tomcat/tomcat-8/v8.0.3/bin/apache-tomcat-8.0.3.tar.gz.md5";>md5)
   
   
 
 
-32-bit Windows zip 
-(https://www.apache.org/dist/tomcat/tomcat-8/v8.0.1/bin/apache-tomcat-8.0.1-windows-x86.zip.asc";>pgp,
 
-https://www.apache.org/dist/tomcat/tomcat-8/v8.0.1/bin/apache-tomcat-8.0.1-windows-x86.zip.md5";>md5)
+32-bit Windows zip 
+(https://www.apache.org/dist/tomcat/tomcat-8/v8.0.3/bin/apache-tomcat-8.0.3-windows-x86.zip.asc";>pgp,
 
+https://www.apache.org/dist/tomcat/tomcat-8/v8.0.3/bin/apache-tomcat-8.0.3-windows-x86.zip.md5";>md5)
   
   
 
 
-64-bit Windows zip 
-(https://www.apache.org/dist/tomcat/tomcat-8/v8.0.1/bin/apache-tomcat-8.0.1-windows-x64.zip.asc";>pgp,
 
-https://www.apache.org/dist/tomcat/tomcat-8/v8.0.1/bin/apache-tomcat-8.0.1-windows-x64.zip.md5";>md5)
+64-bit Windows zip 
+(https://www.apache.org/dist/tomcat/tomcat-8/v8.0.3/bin/apache-tomcat-8.0.3-windows-x64.zip.asc";>pgp,
 
+https://www.apache.org/dist/tomcat/tomcat-8/v8.0.3/bin/apache-tomcat-8.0.3-windows-x64.zip.md5";>md5)
   
   
 
 
-64-bit Itanium Windows zip 
-(https://www.apache.org/dist/tomcat/tomcat-8/v8.0.1/bin/apache-tomcat-8.0.1-windows-i64.zip.asc";>pgp,
 

svn commit: r4376 - /release/tomcat/tomcat-8/v8.0.1/

2014-02-12 Thread markt
Author: markt
Date: Wed Feb 12 15:44:43 2014
New Revision: 4376

Log:
Drop 8.0.1 release

Removed:
release/tomcat/tomcat-8/v8.0.1/


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



svn commit: r1567659 - /tomcat/trunk/bin/service.bat

2014-02-12 Thread markt
Author: markt
Date: Wed Feb 12 15:52:11 2014
New Revision: 1567659

URL: http://svn.apache.org/r1567659
Log:
Tweak error message to show actual file name

Modified:
tomcat/trunk/bin/service.bat

Modified: tomcat/trunk/bin/service.bat
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/bin/service.bat?rev=1567659&r1=1567658&r2=1567659&view=diff
==
--- tomcat/trunk/bin/service.bat (original)
+++ tomcat/trunk/bin/service.bat Wed Feb 12 15:52:11 2014
@@ -38,7 +38,7 @@ cd ..
 set "CATALINA_HOME=%cd%"
 :gotHome
 if exist "%CATALINA_HOME%\bin\tomcat@VERSION_MAJOR@.exe" goto okHome
-echo The tomcat.exe was not found...
+echo The tomcat@VERSION_MAJOR@.exe was not found...
 echo The CATALINA_HOME environment variable is not defined correctly.
 echo This environment variable is needed to run this program
 goto end



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



svn commit: r1567658 - in /tomcat/site/trunk/docs/tomcat-8.0-doc: ./ api/ api/org/apache/catalina/ api/org/apache/catalina/ant/ api/org/apache/catalina/ant/jmx/ api/org/apache/catalina/authenticator/

2014-02-12 Thread markt
Author: markt
Date: Wed Feb 12 15:52:10 2014
New Revision: 1567658

URL: http://svn.apache.org/r1567658
Log:
Update docs for 8.0.3 release


[This commit notification would consist of 59 parts, 
which exceeds the limit of 50 ones, so it was shortened to the summary.]

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



buildbot success in ASF Buildbot on tomcat-7-trunk

2014-02-12 Thread buildbot
The Buildbot has detected a restored build on builder tomcat-7-trunk while 
building ASF Buildbot.
Full details are available at:
 http://ci.apache.org/builders/tomcat-7-trunk/builds/1758

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: bb-vm_ubuntu

Build Reason: scheduler
Build Source Stamp: [branch tomcat/tc7.0.x/trunk] 1567644
Blamelist: markt

Build succeeded!

sincerely,
 -The Buildbot





Re: [VOTE] Release Apache Tomcat 7.0.51

2014-02-12 Thread Violeta Georgieva
2014-02-12 17:08 GMT+02:00 Mark Thomas :
>
> On 12/02/2014 12:19, Mark Thomas wrote:
> > On 12/02/2014 09:50, Mark Thomas wrote:
> >> On 12/02/2014 09:49, Mark Thomas wrote:
> >>> On 12/02/2014 08:25, Violeta Georgieva wrote:
>  2014-02-12 Mark Thomas :
> >>>
> > Can you hold off for a little while please? I am investigating a TCK
> > failure when testing with BIO + APR + mod_jk. I'm currently trying
to
> > narrow down the commit that triggered this failure. I should have
more
> > news in a couple of hours.
> 
>  OK
> >>>
> >>> So far I've narrowed it down to a range of ~30 commits.
> >>> r1552806 passes
> >>> r1559087 fails
> >>>
> >>> Looking at the commit log, my current suspect is r1558371.
> >>
> >> I meant r1558173
> >
> > I've confirmed that this is the commit that triggered the failure. I'm
> > digging into why it fails now.
>
> Fixed in r1567635.

Is it OK to start now?

> Mark
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>


Re: [VOTE] Release Apache Tomcat 7.0.51

2014-02-12 Thread Mark Thomas
On 12/02/2014 16:51, Violeta Georgieva wrote:
> 2014-02-12 17:08 GMT+02:00 Mark Thomas :
>>
>> On 12/02/2014 12:19, Mark Thomas wrote:
>>> On 12/02/2014 09:50, Mark Thomas wrote:
 On 12/02/2014 09:49, Mark Thomas wrote:
> On 12/02/2014 08:25, Violeta Georgieva wrote:
>> 2014-02-12 Mark Thomas :
>
>>> Can you hold off for a little while please? I am investigating a TCK
>>> failure when testing with BIO + APR + mod_jk. I'm currently trying
> to
>>> narrow down the commit that triggered this failure. I should have
> more
>>> news in a couple of hours.
>>
>> OK
>
> So far I've narrowed it down to a range of ~30 commits.
> r1552806 passes
> r1559087 fails
>
> Looking at the commit log, my current suspect is r1558371.

 I meant r1558173
>>>
>>> I've confirmed that this is the commit that triggered the failure. I'm
>>> digging into why it fails now.
>>
>> Fixed in r1567635.
> 
> Is it OK to start now?

I think so, yes.

Mark


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



buildbot exception in ASF Buildbot on tomcat-trunk

2014-02-12 Thread buildbot
The Buildbot has detected a new failure on builder tomcat-trunk while building 
ASF Buildbot.
Full details are available at:
 http://ci.apache.org/builders/tomcat-trunk/builds/5493

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: bb-vm_ubuntu

Build Reason: scheduler
Build Source Stamp: [branch tomcat/trunk] 1566642
Blamelist: 

BUILD FAILED: exception compile upload_2

sincerely,
 -The Buildbot




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



Re: [Tomcat Wiki] Update of "PoweredBy" by PierreJean

2014-02-12 Thread dahu

Hi

if you want use, i've found the syntax for nofollow link in moinmoin

[[SomePage|some Page|rel="nofollow"]]

It seems that if you put a meta "nofollow" you put down the entire 
MoinMoin because the meta is applied to all page/ all link


PJ



Le 11/02/2014 20:50, Konstantin Kolinko a écrit :

2014-02-11 22:59 GMT+04:00 Konstantin Kolinko :

2014-02-10 19:59 GMT+04:00 dahu :

Le 10/02/2014 16:54, Apache Wiki a écrit :

Explict remove & cleaning :

- AS-ComTec IT Service : url in description only

OK.
(They are out of alphabet order.
If they indeed offer hosting, move them into other section. Otherwise, delete).


- Agendize : subpage optimize in description
- Airsoft PX : all godaddy domnain for sale

OK


- automatedhomefinder.com : subpage optimize in description

(Needs rewording ... )

Done.


- European University Institute in Dspace: 301 -> page not found
- installation instructions in Dspace : -> page not found

All OK.

("Detailed installation instructions are available. " phrase from
DSpace item can be removed)

Done.


-  Gridsphere : timeout && empty

May be still out there...
Retry in a week?

It is now here:
https://github.com/brandt/GridSphere


- ilaclamaportali.com :subpage optimize in description

OK to remove.

Removed.


- mailrevive.com : timeout && empty

(in Synetek.com item).
It is spelled "LeaseEagle" and needs "product" after the name.

Done.


- hahnefeld IT : all 200 && empty

Subpage links can be removed.
(It is section for hosting offering, the rest of text is irrelevant)

Done


- steadfast.net :  301 && empty

Works for me
http://steadfast.net/

Best regards,
Konstantin Kolinko

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





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



svn commit: r1567716 - /tomcat/trunk/build.xml

2014-02-12 Thread markt
Author: markt
Date: Wed Feb 12 18:42:44 2014
New Revision: 1567716

URL: http://svn.apache.org/r1567716
Log:
Remove use of optimize flag that has been a NO-OP since Java 1.1
Patch by ebourg via GitHub

Modified:
tomcat/trunk/build.xml

Modified: tomcat/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1567716&r1=1567715&r2=1567716&view=diff
==
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Wed Feb 12 18:42:44 2014
@@ -580,7 +580,6 @@
deprecation="${compile.deprecation}"
source="${compile.source}"
target="${compile.target}"
-   optimize="${compile.optimize}"
excludes="**/.svn/**"
encoding="ISO-8859-1"
includeAntRuntime="true" >
@@ -635,7 +634,6 @@
deprecation="${compile.deprecation}"
source="${compile.source}"
target="${compile.target}"
-   optimize="${compile.optimize}"
excludes="**/.svn/**"
encoding="ISO-8859-1"
includeAntRuntime="true" >
@@ -1038,7 +1036,6 @@
  debug="${compile.debug}" deprecation="${compile.deprecation}"
  source="${compile.source}"
  target="${compile.target}"
- optimize="${compile.optimize}"
  classpath="${tomcat.classes}"
  excludes="**/CVS/**,**/.svn/**"
  encoding="ISO-8859-1"
@@ -1050,7 +1047,6 @@
  debug="${compile.debug}" deprecation="${compile.deprecation}"
  source="${compile.source}"
  target="${compile.target}"
- optimize="${compile.optimize}"
  classpath="$tomcat.lcasses}"
  excludes="**/CVS/**,**/.svn/**"
  encoding="ISO-8859-1"
@@ -1286,7 +1282,6 @@
debug="${compile.debug}"
deprecation="${compile.deprecation}"
source="${compile.source}"
-   optimize="${compile.optimize}"
encoding="ISO-8859-1"
includeantruntime="true">
   
@@ -1627,7 +1622,6 @@
debug="${compile.debug}"
deprecation="${compile.deprecation}"
source="${compile.source}"
-   optimize="${compile.optimize}"
encoding="ISO-8859-1"
includeantruntime="false">
   
@@ -2774,7 +2768,6 @@ Apache Tomcat ${version} native binaries
   
 
 

svn commit: r1567717 - /tomcat/tc7.0.x/trunk/build.xml

2014-02-12 Thread markt
Author: markt
Date: Wed Feb 12 18:43:45 2014
New Revision: 1567717

URL: http://svn.apache.org/r1567717
Log:
Remove use of optimize flag that has been a NO-OP since Java 1.1

Modified:
tomcat/tc7.0.x/trunk/build.xml

Modified: tomcat/tc7.0.x/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.xml?rev=1567717&r1=1567716&r2=1567717&view=diff
==
--- tomcat/tc7.0.x/trunk/build.xml (original)
+++ tomcat/tc7.0.x/trunk/build.xml Wed Feb 12 18:43:45 2014
@@ -548,7 +548,6 @@
deprecation="${compile.deprecation}"
source="${compile.source}"
target="${compile.target}"
-   optimize="${compile.optimize}"
excludes="**/.svn/**"
encoding="ISO-8859-1"
includeAntRuntime="true" >
@@ -603,7 +602,6 @@
deprecation="${compile.deprecation}"
source="${compile.source}"
target="${compile.target}"
-   optimize="${compile.optimize}"
excludes="**/.svn/**"
encoding="ISO-8859-1"
includeAntRuntime="true" >
@@ -640,7 +638,6 @@
deprecation="${compile.deprecation}"
source="${compile.source}"
target="${compile.target}"
-   optimize="${compile.optimize}"
excludes="**/.svn/**"
encoding="ISO-8859-1"
includeAntRuntime="true"
@@ -1002,7 +999,6 @@
  debug="${compile.debug}" deprecation="${compile.deprecation}"
  source="${compile.source}"
  target="${compile.target}"
- optimize="${compile.optimize}"
  classpath="${tomcat.classes}"
  excludes="**/CVS/**,**/.svn/**"
  encoding="ISO-8859-1"
@@ -1014,7 +1010,6 @@
  debug="${compile.debug}" deprecation="${compile.deprecation}"
  source="${compile.source}"
  target="${compile.target}"
- optimize="${compile.optimize}"
  classpath="$tomcat.lcasses}"
  excludes="**/CVS/**,**/.svn/**"
  encoding="ISO-8859-1"
@@ -1251,7 +1246,6 @@
debug="${compile.debug}"
deprecation="${compile.deprecation}"
source="${compile.source}"
-   optimize="${compile.optimize}"
encoding="ISO-8859-1"
includeantruntime="false">
   
@@ -1610,7 +1604,6 @@
debug="${compile.debug}"
deprecation="${compile.deprecation}"
source="${compile.source}"
-   optimize="${compile.optimize}"
encoding="ISO-8859-1"
includeantruntime="false">
   
@@ -2766,7 +2759,6 @@ Apache Tomcat ${version} native binaries
 
 
 

svn commit: r1567718 - in /tomcat/tc6.0.x/trunk: build.xml extras.xml

2014-02-12 Thread markt
Author: markt
Date: Wed Feb 12 18:44:34 2014
New Revision: 1567718

URL: http://svn.apache.org/r1567718
Log:
Remove use of optimize flag that has been a NO-OP since Java 1.1

Modified:
tomcat/tc6.0.x/trunk/build.xml
tomcat/tc6.0.x/trunk/extras.xml

Modified: tomcat/tc6.0.x/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.xml?rev=1567718&r1=1567717&r2=1567718&view=diff
==
--- tomcat/tc6.0.x/trunk/build.xml (original)
+++ tomcat/tc6.0.x/trunk/build.xml Wed Feb 12 18:44:34 2014
@@ -139,7 +139,6 @@
deprecation="${compile.deprecation}"
source="${compile.source}"
target="${compile.target}"
-   optimize="${compile.optimize}"
excludes="**/CVS/**,**/.svn/**"
encoding="ISO-8859-1">
 

Re: svn commit: r1567717 - /tomcat/tc7.0.x/trunk/build.xml

2014-02-12 Thread Konstantin Kolinko
2014-02-12 22:43 GMT+04:00  :
> Author: markt
> Date: Wed Feb 12 18:43:45 2014
> New Revision: 1567717
>
> URL: http://svn.apache.org/r1567717
> Log:
> Remove use of optimize flag that has been a NO-OP since Java 1.1
>
> Modified:
> tomcat/tc7.0.x/trunk/build.xml
>
> Modified: tomcat/tc7.0.x/trunk/build.xml
> URL: 
> http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.xml?rev=1567717&r1=1567716&r2=1567717&view=diff
> ==
> --- tomcat/tc7.0.x/trunk/build.xml (original)
> +++ tomcat/tc7.0.x/trunk/build.xml Wed Feb 12 18:43:45 2014
> @@ -548,7 +548,6 @@
> deprecation="${compile.deprecation}"

It looks that "compile.deprecation" property is also not defined anywhere.

> source="${compile.source}"
> target="${compile.target}"
> -   optimize="${compile.optimize}"
> excludes="**/.svn/**"
> encoding="ISO-8859-1"
> includeAntRuntime="true" >
> @@ -603,7 +602,6 @@

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



buildbot success in ASF Buildbot on tomcat-trunk

2014-02-12 Thread buildbot
The Buildbot has detected a restored build on builder tomcat-trunk while 
building ASF Buildbot.
Full details are available at:
 http://ci.apache.org/builders/tomcat-trunk/builds/5499

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: bb-vm_ubuntu

Build Reason: scheduler
Build Source Stamp: [branch tomcat/trunk] 1567306
Blamelist: 

Build succeeded!

sincerely,
 -The Buildbot




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



Re: svn commit: r1567717 - /tomcat/tc7.0.x/trunk/build.xml

2014-02-12 Thread Mark Thomas
On 12/02/2014 18:58, Konstantin Kolinko wrote:
> 2014-02-12 22:43 GMT+04:00  :
>> Author: markt
>> Date: Wed Feb 12 18:43:45 2014
>> New Revision: 1567717
>>
>> URL: http://svn.apache.org/r1567717
>> Log:
>> Remove use of optimize flag that has been a NO-OP since Java 1.1
>>
>> Modified:
>> tomcat/tc7.0.x/trunk/build.xml
>>
>> Modified: tomcat/tc7.0.x/trunk/build.xml
>> URL: 
>> http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.xml?rev=1567717&r1=1567716&r2=1567717&view=diff
>> ==
>> --- tomcat/tc7.0.x/trunk/build.xml (original)
>> +++ tomcat/tc7.0.x/trunk/build.xml Wed Feb 12 18:43:45 2014
>> @@ -548,7 +548,6 @@
>> deprecation="${compile.deprecation}"
> 
> It looks that "compile.deprecation" property is also not defined anywhere.

In which case I suspect the default of off will apply but users are
still free to set it if they wish.

Mark

> 
>> source="${compile.source}"
>> target="${compile.target}"
>> -   optimize="${compile.optimize}"
>> excludes="**/.svn/**"
>> encoding="ISO-8859-1"
>> includeAntRuntime="true" >
>> @@ -603,7 +602,6 @@
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
> 


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



svn commit: r1567741 - /tomcat/tc7.0.x/trunk/bin/service.bat

2014-02-12 Thread markt
Author: markt
Date: Wed Feb 12 19:48:36 2014
New Revision: 1567741

URL: http://svn.apache.org/r1567741
Log:
Tweak error message to show actual file name

Modified:
tomcat/tc7.0.x/trunk/bin/service.bat

Modified: tomcat/tc7.0.x/trunk/bin/service.bat
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/bin/service.bat?rev=1567741&r1=1567740&r2=1567741&view=diff
==
--- tomcat/tc7.0.x/trunk/bin/service.bat (original)
+++ tomcat/tc7.0.x/trunk/bin/service.bat Wed Feb 12 19:48:36 2014
@@ -38,7 +38,7 @@ cd ..
 set "CATALINA_HOME=%cd%"
 :gotHome
 if exist "%CATALINA_HOME%\bin\tomcat@VERSION_MAJOR@.exe" goto okHome
-echo The tomcat.exe was not found...
+echo The tomcat@VERSION_MAJOR@.exe was not found...
 echo The CATALINA_HOME environment variable is not defined correctly.
 echo This environment variable is needed to run this program
 goto end



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



svn commit: r1567742 - /tomcat/tc7.0.x/trunk/bin/service.bat

2014-02-12 Thread markt
Author: markt
Date: Wed Feb 12 19:50:29 2014
New Revision: 1567742

URL: http://svn.apache.org/r1567742
Log:
Fix a secondary issue identified in 
https://issues.apache.org/bugzilla/show_bug.cgi?id=56079
Install the service with a single call to the .exe rather than three calls.

Modified:
tomcat/tc7.0.x/trunk/bin/service.bat

Modified: tomcat/tc7.0.x/trunk/bin/service.bat
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/bin/service.bat?rev=1567742&r1=1567741&r2=1567742&view=diff
==
--- tomcat/tc7.0.x/trunk/bin/service.bat (original)
+++ tomcat/tc7.0.x/trunk/bin/service.bat Wed Feb 12 19:50:29 2014
@@ -137,9 +137,20 @@ rem Set the client jvm from JAVA_HOME
 set "PR_JVM=%JRE_HOME%\bin\client\jvm.dll"
 if exist "%PR_JVM%" goto foundJvm
 set PR_JVM=auto
+set PR_STDOUTPUT=auto
+set PR_STDERROR=auto
 :foundJvm
 echo Using JVM:  "%PR_JVM%"
-"%EXECUTABLE%" //IS//%SERVICE_NAME% --StartClass 
org.apache.catalina.startup.Bootstrap --StopClass 
org.apache.catalina.startup.Bootstrap --StartParams start --StopParams stop
+"%EXECUTABLE%" //IS//%SERVICE_NAME% ^
+--StartClass org.apache.catalina.startup.Bootstrap ^
+--StopClass org.apache.catalina.startup.Bootstrap ^
+--StartParams start ^
+--StopParams stop ^
+--JvmOptions 
"-Dcatalina.base=%CATALINA_BASE%;-Dcatalina.home=%CATALINA_HOME%;-Djava.endorsed.dirs=%CATALINA_HOME%\endorsed;-Djava.io.tmpdir=%CATALINA_BASE%\temp;-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager;-Djava.util.logging.config.file=%CATALINA_BASE%\conf\logging.properties"
 ^
+--StartMode jvm ^
+--StopMode jvm ^
+--JvmMs 128 ^
+--JvmMx 256
 if not errorlevel 1 goto installed
 echo Failed installing '%SERVICE_NAME%' service
 goto end
@@ -151,13 +162,6 @@ set PR_INSTALL=
 set PR_LOGPATH=
 set PR_CLASSPATH=
 set PR_JVM=
-rem Set extra parameters
-"%EXECUTABLE%" //US//%SERVICE_NAME% --JvmOptions 
"-Dcatalina.base=%CATALINA_BASE%;-Dcatalina.home=%CATALINA_HOME%;-Djava.endorsed.dirs=%CATALINA_HOME%\endorsed"
 --StartMode jvm --StopMode jvm
-rem More extra parameters
-set "PR_LOGPATH=%CATALINA_BASE%\logs"
-set PR_STDOUTPUT=auto
-set PR_STDERROR=auto
-"%EXECUTABLE%" //US//%SERVICE_NAME% ++JvmOptions 
"-Djava.io.tmpdir=%CATALINA_BASE%\temp;-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager;-Djava.util.logging.config.file=%CATALINA_BASE%\conf\logging.properties"
 --JvmMs 128 --JvmMx 256
 echo The service '%SERVICE_NAME%' has been installed.
 
 :end



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



svn commit: r1567855 - /tomcat/tc7.0.x/tags/TOMCAT_7_0_52/

2014-02-12 Thread violetagg
Author: violetagg
Date: Thu Feb 13 07:02:21 2014
New Revision: 1567855

URL: http://svn.apache.org/r1567855
Log:
Drop the tag in order to pickup the new fixes.

Removed:
tomcat/tc7.0.x/tags/TOMCAT_7_0_52/


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



svn commit: r1567856 - in /tomcat/tc7.0.x/tags/TOMCAT_7_0_52: ./ build.properties.default

2014-02-12 Thread violetagg
Author: violetagg
Date: Thu Feb 13 07:13:36 2014
New Revision: 1567856

URL: http://svn.apache.org/r1567856
Log:
Tag 7.0.52

Added:
tomcat/tc7.0.x/tags/TOMCAT_7_0_52/   (props changed)
  - copied from r1567855, tomcat/tc7.0.x/trunk/
Modified:
tomcat/tc7.0.x/tags/TOMCAT_7_0_52/build.properties.default

Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_52/
--
bugtraq:append = false

Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_52/
--
bugtraq:label = Bugzilla ID (optional)

Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_52/
--
--- bugtraq:message (added)
+++ bugtraq:message Thu Feb 13 07:13:36 2014
@@ -0,0 +1 @@
+Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=%BUGID%

Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_52/
--
bugtraq:number = true

Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_52/
--
bugtraq:url = https://issues.apache.org/bugzilla/show_bug.cgi?id=%BUGID%

Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_52/
--
bugtraq:warnifnoissue = false

Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_52/
--
--- svn:ignore (added)
+++ svn:ignore Thu Feb 13 07:13:36 2014
@@ -0,0 +1,7 @@
+.*
+build.properties
+logs
+nbproject
+output
+work
+*.iml

Propchange: tomcat/tc7.0.x/tags/TOMCAT_7_0_52/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Feb 13 07:13:36 2014
@@ -0,0 +1 @@
+/tomcat/trunk:1156115-1157160,1157162-1157859,1157862-1157942,1157945-1160347,1160349-1163716,1163718-1166689,1166691-1174340,1174342-1175596,1175598-1175611,1175613-1175932,1175934-1177783,1177785-1177980,1178006-1180720,1180722-1183094,1183096-1187753,1187755,1187775,1187801,1187806,1187809,1187826-1188312,1188314-1188401,1188646-1188840,1188842-1190176,1190178-1195223,1195225-1195953,1195955,1195957-1201238,1201240-1203345,1203347-1206623,1206625-1208046,1208073,1208096,1208114,1208145,1208772,1209194-1212125,1212127-1220291,1220293,1220295-1221321,1221323-1222328,1222332-1222401,1222405-1222795,1222850-1222950,1222969-1225326,1225328-1225463,1225465,1225627,1225629-1226534,1226536-1228908,1228911-1228923,1228927-1229532,1229534-1230766,1230768-1231625,1231627-1233414,1233419-1235207,1235209-1237425,1237427,1237429-1237977,1237981,1237985,1237995,1238070,1238073,1239024-1239048,1239050-1239062,1239135,1239256,1239258-1239485,1239785-1240046,1240101,1240106,1240109,1240112,1240114
 
,1240116,1240118,1240121,1240329,1240474-1240850,1240857,1241087,1241160,1241408-1241822,1241908-1241909,1241912-1242110,1242371-1292130,1292134-1292458,1292464-1292670,1292672-1292776,1292780-1293392,1293397-1297017,1297019-1297963,1297965-1299820,1300108,1300111-1300460,1300520-1300948,1300997,1301006,1301280,1302332,1302348,1302608-1302610,1302649,1302837,1303138,1303163,1303338,1303521,1303587,1303698,1303803,1303852,1304011,1304035,1304037,1304135,1304249,1304253,1304260,1304271,1304275,1304468,1304895,1304930-1304932,1305194,1305943,1305965,1306556,1306579-1306580,1307084,1307310,1307511-1307512,1307579,1307591,1307597,1310636,1310639-1310640,1310642,1310701,1311212,1311995,1327617,1327670,1331766,1333161,1333173,1333827,1334787,1335026,1335257,1335547,1335692,1335711,1335731,1336515,1336813,1336864,1336868,1336884,1337419,1337426,1337546,1337572,1337591-1337595,1337643,1337707,1337719,1337734,1337741,1337745,1338151-1338154,1338178,1342027,1342029,1342315,1342320,1342476,1342
 
498,1342503,1342717,1342795,1342805,1343044-1343046,1343335,1343394,1343400,1343629,1343708,1343718,1343895,1344063,1344068,1344250,1344266,1344515,1344528,1344612,1344629,1344725,1344868,1344890,1344893,1344896,1344901,1345020,1345029,1345039,1345287-1345290,1345294,1345309,1345325,1345357,1345367,1345579-1345580,1345582,1345688,1345699,1345704,1345731-1345732,1345737,1345744,1345752,1345754,1345779,1345781,1345846,1346107,1346376,1346404,1346510,1346514,1346519,1346581,1346635,1346644,1346683,1346794,1346885,1346932,1347034,1347047,1347087,1347108-1347109,1347583,1347737,1348105,1348357,1348398,1348425,1348461-1348495,1348498,1348752,1348762,1348772,1348776,1348859,1348968,1348973,1348989,1349007,1349237,1349298,1349317,1349410,1349473,1349539,1349879,1349887,1349893,1349922,1349984,1350124,1350241,1350243,1350294-1350295,1350299,1350864,1350900,1351010,1351054,1351056,1351068,1351134-1351135,1351148,1351259,1351604,1351636-1351640,1351991,1351993,1352011,1352056,1352059,1352661,1
 
352663,1352788,1352799,1353087,1353125,1353240,1353261,1353414,1353468,1353501,1353581,1

[Bug 56133] New: Invalid socket caused signal bus error in jk_is_input_event()

2014-02-12 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=56133

Bug ID: 56133
   Summary: Invalid socket caused signal bus error in
jk_is_input_event()
   Product: Tomcat Connectors
   Version: 1.2.37
  Hardware: PC
OS: Linux
Status: NEW
  Severity: normal
  Priority: P2
 Component: mod_jk
  Assignee: dev@tomcat.apache.org
  Reporter: shimizuhiroto...@gmail.com

Created attachment 31307
  --> https://issues.apache.org/bugzilla/attachment.cgi?id=31307&action=edit
patch against trunk

I used apache httpd-2.2.3-22.el5,mod_jk 1.2.28.
Signal bus error occurs and core dump file is output.
I analyze of follows.

(gdb) bt
#0  0x2b7cb2c946a7 in kill () from /lib64/libc.so.6
#1  
#2  0x2b7cb8870f80 in jk_is_input_event (sd=-1, timeout=4,
l=0x2b7cc3499fe8) at jk_connect.c:878

jk_is_input_event() caused signal bus error, because of sd=-1.

---mod_jk.log
[Sun Jan 19 11:22:12 2014][15227:1221724480] [info]
ajp_connection_tcp_send_message::jk_ajp_common.c
 (1101): sendfull for socket 62 returned -32 (errno=32)
---

ajp_connection_tcp_send_message() set the variable sd to -1 and return
JK_FALSE(0).
Thus rc=0,and the loop continue.
The variable sd is still -1,and jk_is_input_event() caused signal bus error.

I made patch against trunk.

==
--- common/jk_ajp_common.c(revision 1555413)
+++ common/jk_ajp_common.c(working copy)
@@ -2267,7 +2267,7 @@
  */
 op->recoverable = JK_FALSE;
 rc = ajp_connection_tcp_send_message(p, op->post, l);
-if (rc < 0) {
+if (rc != JK_TRUE) {
 jk_log(l, JK_LOG_ERROR,
"(%s) Tomcat is down or network problems",
 p->worker->name);

==
$ gdb /usr/sbin/httpd.worker core.15227
:
(gdb) bt
#0  0x2b7cb2c946a7 in kill () from /lib64/libc.so.6
#1  
#2  0x2b7cb8870f80 in jk_is_input_event (sd=-1, timeout=4,
l=0x2b7cc3499fe8) at jk_connect.c:878
#3  0x2b7cb888c625 in ajp_get_reply (e=, s=0x48d1fd10,
l=0x2b7cc3499fe8, p=0x2b7cc3695770, op=0x48d1ea10) at jk_ajp_common.c:1923
#4  0x2b7cb888f948 in ajp_service (e=0x2b7cc36977b8, s=0x48d1fd10,
l=0x2b7cc3499fe8, is_error=0x48d1eb1c) at jk_ajp_common.c:2356
#5  0x2b7cb887b99b in service (e=, s=0x48d1fd10,
l=0x2b7cc3499fe8, is_error=0x48d1fef8) at jk_lb_worker.c:1214
#6  0x2b7cb886d6ff in jk_handler (r=0x2b7cc378b968) at mod_jk.c:2521
:
(gdb) p *p
$1 = {worker = 0x2b7cc365f1e0, pool = {size = 8192, pos = 144, 
 :
  sd = -1, reuse = 0, endpoint = {rd = 8197, wr = 637, recoverable = 1, 
 :
  last_access = 1390098131, last_errno = 32, last_op = 1}

-- 
You are receiving this mail because:
You are the assignee for the bug.

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



svn commit: r4381 [2/2] - in /dev/tomcat/tomcat-7/v7.0.52: ./ bin/ bin/embed/ bin/extras/ src/

2014-02-12 Thread violetagg
Added: dev/tomcat/tomcat-7/v7.0.52/bin/extras/tomcat-juli-adapters.jar.asc
==
--- dev/tomcat/tomcat-7/v7.0.52/bin/extras/tomcat-juli-adapters.jar.asc (added)
+++ dev/tomcat/tomcat-7/v7.0.52/bin/extras/tomcat-juli-adapters.jar.asc Thu Feb 
13 07:55:42 2014
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v2.0.21 (MingW32)
+
+iQIcBAABCgAGBQJS/HRCAAoJECCLCrHWMBHHJfAP/iy26ZcRsKwgnih8XEUol/oB
+mGHmo2UVxcWkR/lTi6jCVGNwm8AO+tbEm55M1INrKlbC+LeOUVmqdsKbVl2GUkbH
+DmcW4r4F9nAGSUJEt/ADj7ECUwAUzkTaCNru0yVlzlbgPSVWGXnSU70SWdLXHwBd
+uIstrUwqIfTbSTUs0agnhnBRaITN6HGeHMK+IFJfl79zxGi2GvRedlWLmV+vzkRb
+kEYBjkFtNGBBDsfqu+ECE97oOODL3RUhJi2kK2aZc72ZecvHkznVJJdYC/oEt6bM
+CpIlr2oWB9Ge9oeycYyy3Og1UUQK99p9yr5HNGHeRqcC8btNFi9/N7G9tPI4/x1y
+HqfEp6LdLogJEfGOay35eS5LYtM5fXatb7Yj0+aGcBIYc83Zk9uLnwSxHPrCoTph
+1rFV/2IMbMXmKVcatsBSaXfpdEkNqzpjWs73Pbp1KB7pKG2AgLsAuB/YX17+IIfF
+dUKL1lHCidiWV+8S+wO/H/DqxLBk16dK43C76LPqW/bWU5ra/v+ARW/9Gs1BYY1Z
+Ts88pWlEU9UW0LXyPDO9WmMRnwSosgULiGPTwL9I0r6x9u10jjNkPBamt0fM8/XC
+qrbrdSBGFbln2CW+gLtRDesYK5QLrd8LZQmyKnkFEtzX65nle4KiV4UwDBu/10WG
+bwZllDWl9SFqEKvqbVPj
+=j5ff
+-END PGP SIGNATURE-

Added: dev/tomcat/tomcat-7/v7.0.52/bin/extras/tomcat-juli-adapters.jar.md5
==
--- dev/tomcat/tomcat-7/v7.0.52/bin/extras/tomcat-juli-adapters.jar.md5 (added)
+++ dev/tomcat/tomcat-7/v7.0.52/bin/extras/tomcat-juli-adapters.jar.md5 Thu Feb 
13 07:55:42 2014
@@ -0,0 +1 @@
+7ef742c37a457243967ec11787c80b69 *tomcat-juli-adapters.jar
\ No newline at end of file

Added: dev/tomcat/tomcat-7/v7.0.52/bin/extras/tomcat-juli.jar
==
Binary file - no diff available.

Propchange: dev/tomcat/tomcat-7/v7.0.52/bin/extras/tomcat-juli.jar
--
svn:mime-type = application/octet-stream

Added: dev/tomcat/tomcat-7/v7.0.52/bin/extras/tomcat-juli.jar.asc
==
--- dev/tomcat/tomcat-7/v7.0.52/bin/extras/tomcat-juli.jar.asc (added)
+++ dev/tomcat/tomcat-7/v7.0.52/bin/extras/tomcat-juli.jar.asc Thu Feb 13 
07:55:42 2014
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v2.0.21 (MingW32)
+
+iQIcBAABCgAGBQJS/HRBAAoJECCLCrHWMBHHDW8QAJtdkjonF4ae2VVdD/LN4jJu
+pLAwBCr6CSwdI/lMlvfsKZvXqcs9y4K20fHPIKUt8DIkk1drklisyALjSglJNXsT
+25q9nT7gZ4+1FL9aS18l31qXPFDYsJiyU3MmtmZx5PBnGFXwrW5r9aPkWrFJxHim
+4ZqlMmu4X/VEl0/lbZb6kv3qY56y+0MC+8aoMyq5LHYbVuqkGMdqLus1edLCT+ii
+K6ZCYzm28Zz6Pc6UqW7yOUm7mHLlRuuo2iWgKnrE97vzB3r8Dl87wKcq6qbzKZlN
+yOj6Cd30C4aVGjzanipevgc0NEwn2TXkXjJP1/Fy9mQGPYza7/HcOKRiQAPVkv+Y
+SibzhXP3khegSZbROL2tNpEMMbGjmv7hEDQI3+zFKb0KafPciKNJ/qC+O/puiOds
+QFNJci/0bAOi4nPkXKeQ6+QJv2a0gXqTP+YN8EbxvXTtnzgv/6kCP7LB9y2DBO98
+x3wWanpecKeL1I9sZ2CmZUVXwlg40dbygozS0Qz2E7vy4WzvtUfg8o3YI2vQFw1L
+ZrL0ZcRfblIIDux/OM0cbViHRMffWCC8MYkh+pEZHOIVfMNceSPPiajsFqEjiH1b
+sNffPAuMuMgE433I/bdDaVdt+AgO2fWEoBUkVXbkL56f6y+zOo3zYVb0rTRD24MI
+Mj6VEISjAWHMMefKDc/S
+=DP2f
+-END PGP SIGNATURE-

Added: dev/tomcat/tomcat-7/v7.0.52/bin/extras/tomcat-juli.jar.md5
==
--- dev/tomcat/tomcat-7/v7.0.52/bin/extras/tomcat-juli.jar.md5 (added)
+++ dev/tomcat/tomcat-7/v7.0.52/bin/extras/tomcat-juli.jar.md5 Thu Feb 13 
07:55:42 2014
@@ -0,0 +1 @@
+cfe9699cb6984b91e8ffab7bb30a15df *tomcat-juli.jar
\ No newline at end of file

Added: dev/tomcat/tomcat-7/v7.0.52/src/apache-tomcat-7.0.52-src.tar.gz
==
Binary file - no diff available.

Propchange: dev/tomcat/tomcat-7/v7.0.52/src/apache-tomcat-7.0.52-src.tar.gz
--
svn:mime-type = application/x-gzip

Added: dev/tomcat/tomcat-7/v7.0.52/src/apache-tomcat-7.0.52-src.tar.gz.asc
==
--- dev/tomcat/tomcat-7/v7.0.52/src/apache-tomcat-7.0.52-src.tar.gz.asc (added)
+++ dev/tomcat/tomcat-7/v7.0.52/src/apache-tomcat-7.0.52-src.tar.gz.asc Thu Feb 
13 07:55:42 2014
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v2.0.21 (MingW32)
+
+iQIcBAABCgAGBQJS/HdSAAoJECCLCrHWMBHH+zAP/0Kq4TT4VpsTtmh6tNJN6aqP
+H/DPOkoTEgzECf8fXFXdqVq/n2HRiqFNyKyqC3mYEyajrcTvPQjdfkzo92IBCLp7
+ectRxjo9iGOi0zKz9/7+JkBPR0dTZOx+mgrJ8gTYP6sD5dtjkNRENP86e1OXZjvx
+p80MYIJZl6YG+Lv/zcQ587dao7seL5n+SB8GuN/YVIKgIIvV7Q873RlE5XUMTp+J
+JimXGCpBqpi8Tpk/BIci5xPomgP3vYbCxYarv2osI48P7z4+AetDMHYiEW/aFx1N
+CS7TPjaGi1UyRiTsQebHD5OKPRNnOQ9MyjeYOT2SizwccSou4Fldf0SAYTK3Rs0L
+ahvT0Ue6xUDYSDJPGDGdiajMNfnKY+3guJyMGBarxllbp0GG2Vsczg8s5XsZUY/E
+CA04s9EVdT7llS9wG0+reHdyJDyDO4K4Lxk1Hzt16A4YMgpage7yo9LKDNe6PI/V
+C/bXE78w8fHrUjvutpzZcde4Y5Av8voM2FGwI6zS6binaNqHDeYVoTR2GQHCmEte
+ToPgtHh/8RyVrmKnTs9qhNfTa8towqlPb