Author: rjung Date: Sun Sep 25 22:04:04 2011 New Revision: 1175595 URL: http://svn.apache.org/viewvc?rev=1175595&view=rev Log: Align APR AJP connector with NIO one. Send 503 if endpoint is paused. Marge r1175589, r1175590 from trunk.
Modified: tomcat/tc7.0.x/trunk/ (props changed) 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/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Sep 25 22:04:04 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,1158426,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,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256,1173288,1173333 ,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582 +/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,1158426,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,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256,1173288,1173333 ,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590 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=1175595&r1=1175594&r2=1175595&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 Sun Sep 25 22:04:04 2011 @@ -120,7 +120,6 @@ public class AjpAprProcessor extends Abs boolean keptAlive = false; while (!error && !endpoint.isPaused()) { - // Parsing the request header try { // Get first message of the request @@ -152,7 +151,6 @@ public class AjpAprProcessor extends Abs error = true; break; } - keptAlive = true; request.setStartTime(System.currentTimeMillis()); } catch (IOException e) { @@ -182,6 +180,13 @@ public class AjpAprProcessor extends Abs } } + if (endpoint.isPaused()) { + // 503 - Service unavailable + response.setStatus(503); + adapter.log(request, response, 0); + error = true; + } + // Process the request in the adapter if (!error) { try { @@ -225,13 +230,15 @@ public class AjpAprProcessor extends Abs } rp.setStage(org.apache.coyote.Constants.STAGE_ENDED); - - if (error || endpoint.isPaused()) { - return SocketState.CLOSED; - } else if (isAsync()) { - return SocketState.LONG; + + if (!error && !endpoint.isPaused()) { + if (isAsync()) { + return SocketState.LONG; + } else { + return SocketState.OPEN; + } } else { - return SocketState.OPEN; + return SocketState.CLOSED; } } @@ -254,7 +261,7 @@ public class AjpAprProcessor extends Abs SocketStatus.OPEN); } } else if (actionCode == ActionCode.ASYNC_SETTIMEOUT) { - if (param==null) return; + if (param == null) return; long timeout = ((Long)param).longValue(); socket.setTimeout(timeout); } else if (actionCode == ActionCode.ASYNC_DISPATCH) { @@ -263,8 +270,6 @@ public class AjpAprProcessor extends Abs SocketStatus.OPEN); } } - - } Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java?rev=1175595&r1=1175594&r2=1175595&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/ajp/AjpNioProcessor.java Sun Sep 25 22:04:04 2011 @@ -190,7 +190,7 @@ public class AjpNioProcessor extends Abs error = true; } } - + if (isAsync() && !error) { break; } @@ -220,7 +220,7 @@ public class AjpNioProcessor extends Abs recycle(false); } - + rp.setStage(org.apache.coyote.Constants.STAGE_ENDED); if (!error && !endpoint.isPaused()) { @@ -232,10 +232,9 @@ public class AjpNioProcessor extends Abs } else { return SocketState.CLOSED; } - } - + // ----------------------------------------------------- ActionHook Methods 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=1175595&r1=1175594&r2=1175595&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Sun Sep 25 22:04:04 2011 @@ -166,6 +166,10 @@ Allow the BIO HTTP connector to be used with SSL when running under Java 7. (markt) </fix> + <update> + Align APR AJP connector with NIO one. Send 503 if endpoint is paused. + (rjung) + </update> </changelog> </subsection> <subsection name="Jasper"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org