diff --git a/NOTICE b/NOTICE index 039ee7a0d24b..0a1819373e3a 100644 --- a/NOTICE +++ b/NOTICE @@ -15,13 +15,6 @@ which is open source software. The original software and related information is available at http://www.eclipse.org. -For the bayeux implementation -The org.apache.cometd.bayeux API is derivative work originating at the Dojo Foundation -* Copyright 2007-2008 Guy Molinari -* Copyright 2007-2008 Filip Hanik -* Copyright 2007 Dojo Foundation -* Copyright 2007 Mort Bay Consulting Pty. Ltd. - The original XML Schemas for Java EE Deployment Descriptors: - javaee_5.xsd - javaee_web_services_1_2.xsd diff --git a/TOMCAT-NEXT.txt b/TOMCAT-NEXT.txt index 3798da62c94c..58fb7603d349 100644 --- a/TOMCAT-NEXT.txt +++ b/TOMCAT-NEXT.txt @@ -21,7 +21,8 @@ Notes of things to consider for the next major Tomcat release (9.0.x) 2. Remove BIO AJP and HTTP connector. - 3. Remove Comet support. + 3. DONE. + Remove Comet support. 4. Refactor the connectors to minimise code duplication - All implementation specific per connector code -> Endpoint diff --git a/conf/catalina.policy b/conf/catalina.policy index a48a027fe789..3166def23b1c 100644 --- a/conf/catalina.policy +++ b/conf/catalina.policy @@ -186,9 +186,6 @@ grant { permission java.util.PropertyPermission "org.apache.tomcat.util.http.ServerCookie.FWD_SLASH_IS_SEPARATOR", "read"; - // Applications using Comet need to be able to access this package - permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina.comet"; - // Applications using WebSocket need to be able to access these packages permission java.lang.RuntimePermission "accessClassInPackage.org.apache.tomcat.websocket"; permission java.lang.RuntimePermission "accessClassInPackage.org.apache.tomcat.websocket.server"; diff --git a/conf/context.xml b/conf/context.xml index 98727cb7b338..966a2a9f8248 100644 --- a/conf/context.xml +++ b/conf/context.xml @@ -27,10 +27,4 @@ - - - diff --git a/java/org/apache/catalina/Globals.java b/java/org/apache/catalina/Globals.java index 30eea17a69ed..52cc15320a88 100644 --- a/java/org/apache/catalina/Globals.java +++ b/java/org/apache/catalina/Globals.java @@ -136,41 +136,6 @@ public final class Globals { "org.apache.catalina.realm.GSS_CREDENTIAL"; - /** - * The request attribute that is set to the value of {@code Boolean.TRUE} - * if connector processing this request supports Comet API. - * Duplicated here for neater code in the catalina packages. - */ - public static final String COMET_SUPPORTED_ATTR = - org.apache.coyote.Constants.COMET_SUPPORTED_ATTR; - - - /** - * The request attribute that is set to the value of {@code Boolean.TRUE} - * if connector processing this request supports setting - * per-connection request timeout through Comet API. - * - * @see org.apache.catalina.comet.CometEvent#setTimeout(int) - * - * Duplicated here for neater code in the catalina packages. - */ - public static final String COMET_TIMEOUT_SUPPORTED_ATTR = - org.apache.coyote.Constants.COMET_TIMEOUT_SUPPORTED_ATTR; - - - /** - * The request attribute that can be set to a value of type - * {@code java.lang.Integer} to specify per-connection request - * timeout for Comet API. The value is in milliseconds. - * - * @see org.apache.catalina.comet.CometEvent#setTimeout(int) - * - * Duplicated here for neater code in the catalina packages. - */ - public static final String COMET_TIMEOUT_ATTR = - org.apache.coyote.Constants.COMET_TIMEOUT_ATTR; - - /** * The request attribute that is set to the value of {@code Boolean.TRUE} * if connector processing this request supports use of sendfile. diff --git a/java/org/apache/catalina/Valve.java b/java/org/apache/catalina/Valve.java index ac0af85b4d52..fd05a7d9aa02 100644 --- a/java/org/apache/catalina/Valve.java +++ b/java/org/apache/catalina/Valve.java @@ -14,20 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.apache.catalina; - import java.io.IOException; import javax.servlet.ServletException; -import org.apache.catalina.comet.CometEvent; import org.apache.catalina.connector.Request; import org.apache.catalina.connector.Response; - /** *

A Valve is a request processing component associated with a * particular Container. A series of Valves are generally associated with @@ -123,22 +118,5 @@ public void invoke(Request request, Response response) throws IOException, ServletException; - /** - * Process a Comet event. - * - * @param request The servlet request to be processed - * @param response The servlet response to be created - * - * @exception IOException if an input/output error occurs, or is thrown - * by a subsequently invoked Valve, Filter, or Servlet - * @exception ServletException if a servlet error occurs, or is thrown - * by a subsequently invoked Valve, Filter, or Servlet - */ - public void event(Request request, Response response, CometEvent event) - throws IOException, ServletException; - - public boolean isAsyncSupported(); - - } diff --git a/java/org/apache/catalina/comet/CometEvent.java b/java/org/apache/catalina/comet/CometEvent.java deleted file mode 100644 index 4cadc6c4249b..000000000000 --- a/java/org/apache/catalina/comet/CometEvent.java +++ /dev/null @@ -1,146 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.apache.catalina.comet; - -import java.io.IOException; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -/** - * The CometEvent interface. - * - * @author Remy Maucherat - */ -public interface CometEvent { - - /** - * Enumeration describing the major events that the container can invoke - * the CometProcessors event() method with.
- * BEGIN - will be called at the beginning - * of the processing of the connection. It can be used to initialize any relevant - * fields using the request and response objects. Between the end of the processing - * of this event, and the beginning of the processing of the end or error events, - * it is possible to use the response object to write data on the open connection. - * Note that the response object and dependent OutputStream and Writer are still - * not synchronized, so when they are accessed by multiple threads, - * synchronization is mandatory. After processing the initial event, the request - * is considered to be committed.
- * READ - This indicates that input data is available, and that one read can be made - * without blocking. The available and ready methods of the InputStream or - * Reader may be used to determine if there is a risk of blocking: the servlet - * should read while data is reported available. When encountering a read error, - * the servlet should report it by propagating the exception properly. Throwing - * an exception will cause the error event to be invoked, and the connection - * will be closed. - * Alternately, it is also possible to catch any exception, perform clean up - * on any data structure the servlet may be using, and using the close method - * of the event. It is not allowed to attempt reading data from the request - * object outside of the execution of this method.
- * END - End may be called to end the processing of the request. Fields that have - * been initialized in the begin method should be reset. After this event has - * been processed, the request and response objects, as well as all their dependent - * objects will be recycled and used to process other requests. End will also be - * called when data is available and the end of file is reached on the request input - * (this usually indicates the client has pipelined a request).
- * ERROR - Error will be called by the container in the case where an IO exception - * or a similar unrecoverable error occurs on the connection. Fields that have - * been initialized in the begin method should be reset. After this event has - * been processed, the request and response objects, as well as all their dependent - * objects will be recycled and used to process other requests. - */ - public enum EventType {BEGIN, READ, END, ERROR} - - - /** - * Event details.
- * TIMEOUT - the connection timed out (sub type of ERROR); note that this ERROR type is not fatal, and - * the connection will not be closed unless the servlet uses the close method of the event
- * CLIENT_DISCONNECT - the client connection was closed (sub type of ERROR)
- * IOEXCEPTION - an IO exception occurred, such as invalid content, for example, an invalid chunk block (sub type of ERROR)
- * WEBAPP_RELOAD - the webapplication is being reloaded (sub type of END)
- * SERVER_SHUTDOWN - the server is shutting down (sub type of END)
- * SESSION_END - the servlet ended the session (sub type of END) - */ - public enum EventSubType { TIMEOUT, CLIENT_DISCONNECT, IOEXCEPTION, WEBAPP_RELOAD, SERVER_SHUTDOWN, SESSION_END } - - - /** - * Returns the HttpServletRequest. - * - * @return HttpServletRequest - */ - public HttpServletRequest getHttpServletRequest(); - - /** - * Returns the HttpServletResponse. - * - * @return HttpServletResponse - */ - public HttpServletResponse getHttpServletResponse(); - - /** - * Returns the event type. - * - * @return EventType - */ - public EventType getEventType(); - - /** - * Returns the sub type of this event. - * - * @return EventSubType - */ - public EventSubType getEventSubType(); - - /** - * Ends the Comet session. This signals to the container that - * the container wants to end the comet session. This will send back to the - * client a notice that the server has no more data to send as part of this - * request. The servlet should perform any needed cleanup as if it had received - * an END or ERROR event. - * - * @throws IOException if an IO exception occurs - */ - public void close() throws IOException; - - /** - * Sets the timeout for this Comet connection. Please NOTE, that the implementation - * of a per connection timeout is OPTIONAL and MAY NOT be implemented.
- * This method sets the timeout in milliseconds of idle time on the connection. - * The timeout is reset every time data is received from the connection or data is flushed - * using response.flushBuffer(). If a timeout occurs, the - * error(HttpServletRequest, HttpServletResponse) method is invoked. The - * web application SHOULD NOT attempt to reuse the request and response objects after a timeout - * as the error(HttpServletRequest, HttpServletResponse) method indicates.
- * This method should not be called asynchronously, as that will have no effect. - * - * @param timeout The timeout in milliseconds for this connection, must be a positive value, larger than 0 - * @throws IOException An IOException may be thrown to indicate an IO error, - * or that the EOF has been reached on the connection - * @throws ServletException An exception has occurred, as specified by the root - * cause - * @throws UnsupportedOperationException if per connection timeout is not supported, either at all or at this phase - * of the invocation. - */ - public void setTimeout(int timeout) - throws IOException, ServletException, UnsupportedOperationException; - -} diff --git a/java/org/apache/catalina/comet/CometFilter.java b/java/org/apache/catalina/comet/CometFilter.java deleted file mode 100644 index ffb0d1c2ceae..000000000000 --- a/java/org/apache/catalina/comet/CometFilter.java +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.apache.catalina.comet; - -import java.io.IOException; - -import javax.servlet.Filter; -import javax.servlet.ServletException; - -/** - * A Comet filter, similar to regular filters, performs filtering tasks on either - * the request to a resource (a Comet servlet), or on the response from a resource, or both. - *

- * Filters perform filtering in the doFilterEvent method. Every Filter has access to - * a FilterConfig object from which it can obtain its initialization parameters, a - * reference to the ServletContext which it can use, for example, to load resources - * needed for filtering tasks. - *

- * Filters are configured in the deployment descriptor of a web application - *

- * Examples that have been identified for this design are
- * 1) Authentication Filters
- * 2) Logging and Auditing Filters
- * 3) Image conversion Filters
- * 4) Data compression Filters
- * 5) Encryption Filters
- * 6) Tokenizing Filters
- * 7) Filters that trigger resource access events
- * 8) XSL/T filters
- * 9) Mime-type chain Filter
- *
- * - * @author Remy Maucherat - */ -public interface CometFilter extends Filter { - - - /** - * The doFilterEvent method of the CometFilter is called by the container - * each time a request/response pair is passed through the chain due - * to a client event for a resource at the end of the chain. The CometFilterChain passed in to this - * method allows the Filter to pass on the event to the next entity in the - * chain.

- * A typical implementation of this method would follow the following pattern:-
- * 1. Examine the request
- * 2. Optionally wrap the request object contained in the event with a custom implementation to - * filter content or headers for input filtering and pass a CometEvent instance containing - * the wrapped request to the next filter
- * 3. Optionally wrap the response object contained in the event with a custom implementation to - * filter content or headers for output filtering and pass a CometEvent instance containing - * the wrapped request to the next filter
- * 4. a) Either invoke the next entity in the chain using the CometFilterChain object (chain.doFilterEvent()),
- * 4. b) or not pass on the request/response pair to the next entity in the filter chain to block the event processing
- * 5. Directly set fields on the response after invocation of the next entity in the filter chain. - * - * @param event the event that is being processed. Another event may be passed along the chain. - * @param chain - * @throws IOException - * @throws ServletException - */ - public void doFilterEvent(CometEvent event, CometFilterChain chain) - throws IOException, ServletException; - - -} diff --git a/java/org/apache/catalina/comet/CometFilterChain.java b/java/org/apache/catalina/comet/CometFilterChain.java deleted file mode 100644 index 68ff5f1ccb85..000000000000 --- a/java/org/apache/catalina/comet/CometFilterChain.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.apache.catalina.comet; - -import java.io.IOException; - -import javax.servlet.ServletException; - -/** - * A CometFilterChain is an object provided by the servlet container to the developer - * giving a view into the invocation chain of a filtered event for a resource. Filters - * use the CometFilterChain to invoke the next filter in the chain, or if the calling filter - * is the last filter in the chain, to invoke the resource at the end of the chain. - * - * @author Remy Maucherat - */ -public interface CometFilterChain { - - - /** - * Causes the next filter in the chain to be invoked, or if the calling filter is the last filter - * in the chain, causes the resource at the end of the chain to be invoked. - * - * @param event the event to pass along the chain. - */ - public void doFilterEvent(CometEvent event) throws IOException, ServletException; - - -} diff --git a/java/org/apache/catalina/comet/CometProcessor.java b/java/org/apache/catalina/comet/CometProcessor.java deleted file mode 100644 index 4e22f8d2b917..000000000000 --- a/java/org/apache/catalina/comet/CometProcessor.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package org.apache.catalina.comet; - -import java.io.IOException; - -import javax.servlet.Servlet; -import javax.servlet.ServletException; - -/** - * This interface should be implemented by servlets which would like to handle - * asynchronous IO, receiving events when data is available for reading, and - * being able to output data without the need for being invoked by the container. - * Note: When this interface is implemented, the service method of the servlet will - * never be called, and will be replaced with a begin event. - */ -public interface CometProcessor extends Servlet{ - - /** - * Process the given Comet event. - * - * @param event The Comet event that will be processed - * @throws IOException - * @throws ServletException - */ - public void event(CometEvent event) - throws IOException, ServletException; - -} diff --git a/java/org/apache/catalina/connector/CometEventImpl.java b/java/org/apache/catalina/connector/CometEventImpl.java deleted file mode 100644 index 97c54b14f046..000000000000 --- a/java/org/apache/catalina/connector/CometEventImpl.java +++ /dev/null @@ -1,149 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.catalina.connector; - -import java.io.IOException; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.catalina.Globals; -import org.apache.catalina.comet.CometEvent; -import org.apache.tomcat.util.res.StringManager; - -public class CometEventImpl implements CometEvent { - - - /** - * The string manager for this package. - */ - protected static final StringManager sm = - StringManager.getManager(Constants.Package); - - - public CometEventImpl(Request request, Response response) { - this.request = request; - this.response = response; - } - - - // ----------------------------------------------------- Instance Variables - - - /** - * Associated request. - */ - protected Request request = null; - - - /** - * Associated response. - */ - protected Response response = null; - - - /** - * Event type. - */ - protected EventType eventType = EventType.BEGIN; - - - /** - * Event sub type. - */ - protected EventSubType eventSubType = null; - - - // --------------------------------------------------------- Public Methods - - /** - * Clear the event. - */ - public void clear() { - request = null; - response = null; - } - - public void setEventType(EventType eventType) { - this.eventType = eventType; - } - - public void setEventSubType(EventSubType eventSubType) { - this.eventSubType = eventSubType; - } - - @Override - public void close() throws IOException { - if (request == null) { - throw new IllegalStateException(sm.getString("cometEvent.nullRequest")); - } - request.finishRequest(); - response.finishResponse(); - if (request.isComet()) { - request.cometClose(); - } - } - - @Override - public EventSubType getEventSubType() { - return eventSubType; - } - - @Override - public EventType getEventType() { - return eventType; - } - - @Override - public HttpServletRequest getHttpServletRequest() { - return request.getRequest(); - } - - @Override - public HttpServletResponse getHttpServletResponse() { - return response.getResponse(); - } - - @Override - public void setTimeout(int timeout) throws IOException, ServletException, - UnsupportedOperationException { - if (request.getAttribute(Globals.COMET_TIMEOUT_SUPPORTED_ATTR) == - Boolean.TRUE) { - request.setAttribute(Globals.COMET_TIMEOUT_ATTR, - Integer.valueOf(timeout)); - if (request.isComet()) { - request.setCometTimeout(timeout); - } - } else { - throw new UnsupportedOperationException(); - } - } - - @Override - public String toString() { - StringBuilder buf = new StringBuilder(); - buf.append(super.toString()); - buf.append("[EventType:"); - buf.append(eventType); - buf.append(", EventSubType:"); - buf.append(eventSubType); - buf.append("]"); - return buf.toString(); - } - -} diff --git a/java/org/apache/catalina/connector/CoyoteAdapter.java b/java/org/apache/catalina/connector/CoyoteAdapter.java index 9c7e17886f0d..689b2801450a 100644 --- a/java/org/apache/catalina/connector/CoyoteAdapter.java +++ b/java/org/apache/catalina/connector/CoyoteAdapter.java @@ -31,8 +31,6 @@ import org.apache.catalina.Context; import org.apache.catalina.Host; import org.apache.catalina.Wrapper; -import org.apache.catalina.comet.CometEvent; -import org.apache.catalina.comet.CometEvent.EventType; import org.apache.catalina.core.AsyncContextImpl; import org.apache.catalina.util.ServerInfo; import org.apache.catalina.util.SessionConfig; @@ -147,135 +145,6 @@ public CoyoteAdapter(Connector connector) { // -------------------------------------------------------- Adapter Methods - - /** - * Event method. - * - * @return false to indicate an error, expected or not - */ - @Override - public boolean event(org.apache.coyote.Request req, - org.apache.coyote.Response res, SocketStatus status) { - - Request request = (Request) req.getNote(ADAPTER_NOTES); - Response response = (Response) res.getNote(ADAPTER_NOTES); - - if (request.getWrapper() == null) { - return false; - } - - boolean error = false; - boolean read = false; - try { - if (status == SocketStatus.OPEN_READ) { - if (response.isClosed()) { - // The event has been closed asynchronously, so call end instead of - // read to cleanup the pipeline - request.getEvent().setEventType(CometEvent.EventType.END); - request.getEvent().setEventSubType(null); - } else { - try { - // Fill the read buffer of the servlet layer - if (request.read()) { - read = true; - } - } catch (IOException e) { - error = true; - } - if (read) { - request.getEvent().setEventType(CometEvent.EventType.READ); - request.getEvent().setEventSubType(null); - } else if (error) { - request.getEvent().setEventType(CometEvent.EventType.ERROR); - request.getEvent().setEventSubType(CometEvent.EventSubType.CLIENT_DISCONNECT); - } else { - request.getEvent().setEventType(CometEvent.EventType.END); - request.getEvent().setEventSubType(null); - } - } - } else if (status == SocketStatus.DISCONNECT) { - request.getEvent().setEventType(CometEvent.EventType.ERROR); - request.getEvent().setEventSubType(CometEvent.EventSubType.CLIENT_DISCONNECT); - error = true; - } else if (status == SocketStatus.ERROR) { - request.getEvent().setEventType(CometEvent.EventType.ERROR); - request.getEvent().setEventSubType(CometEvent.EventSubType.IOEXCEPTION); - error = true; - } else if (status == SocketStatus.STOP) { - request.getEvent().setEventType(CometEvent.EventType.END); - request.getEvent().setEventSubType(CometEvent.EventSubType.SERVER_SHUTDOWN); - } else if (status == SocketStatus.TIMEOUT) { - if (response.isClosed()) { - // The event has been closed asynchronously, so call end instead of - // read to cleanup the pipeline - request.getEvent().setEventType(CometEvent.EventType.END); - request.getEvent().setEventSubType(null); - } else { - request.getEvent().setEventType(CometEvent.EventType.ERROR); - request.getEvent().setEventSubType(CometEvent.EventSubType.TIMEOUT); - } - } - - req.getRequestProcessor().setWorkerThreadName(Thread.currentThread().getName()); - - // Calling the container - connector.getService().getContainer().getPipeline().getFirst().event(request, response, request.getEvent()); - - if (!error && !response.isClosed() && (request.getAttribute( - RequestDispatcher.ERROR_EXCEPTION) != null)) { - // An unexpected exception occurred while processing the event, so - // error should be called - request.getEvent().setEventType(CometEvent.EventType.ERROR); - request.getEvent().setEventSubType(null); - error = true; - connector.getService().getContainer().getPipeline().getFirst().event(request, response, request.getEvent()); - } - if (response.isClosed() || !request.isComet()) { - if (status==SocketStatus.OPEN_READ && - request.getEvent().getEventType() != EventType.END) { - //CometEvent.close was called during an event other than END - request.getEvent().setEventType(CometEvent.EventType.END); - request.getEvent().setEventSubType(null); - error = true; - connector.getService().getContainer().getPipeline().getFirst().event(request, response, request.getEvent()); - } - res.action(ActionCode.COMET_END, null); - } else if (!error && read && request.getAvailable()) { - // If this was a read and not all bytes have been read, or if no data - // was read from the connector, then it is an error - request.getEvent().setEventType(CometEvent.EventType.ERROR); - request.getEvent().setEventSubType(CometEvent.EventSubType.IOEXCEPTION); - error = true; - connector.getService().getContainer().getPipeline().getFirst().event(request, response, request.getEvent()); - } - return (!error); - } catch (Throwable t) { - ExceptionUtils.handleThrowable(t); - if (!(t instanceof IOException)) { - log.error(sm.getString("coyoteAdapter.service"), t); - } - error = true; - return false; - } finally { - req.getRequestProcessor().setWorkerThreadName(null); - // Recycle the wrapper request and response - if (error || response.isClosed() || !request.isComet()) { - if (request.getMappingData().context != null) { - request.getMappingData().context.logAccess( - request, response, - System.currentTimeMillis() - req.getStartTime(), - false); - } else { - // Should normally not happen - log(req, res, System.currentTimeMillis() - req.getStartTime()); - } - request.recycle(); - request.setFilterChain(null); - response.recycle(); - } - } - } - @Override public boolean asyncDispatch(org.apache.coyote.Request req, org.apache.coyote.Response res, SocketStatus status) throws Exception { @@ -286,12 +155,11 @@ public boolean asyncDispatch(org.apache.coyote.Request req, throw new IllegalStateException( "Dispatch may only happen on an existing request."); } - boolean comet = false; boolean success = true; AsyncContextImpl asyncConImpl = (AsyncContextImpl)request.getAsyncContext(); req.getRequestProcessor().setWorkerThreadName(Thread.currentThread().getName()); try { - if (!request.isAsync() && !comet) { + if (!request.isAsync()) { // Error or timeout - need to tell listeners the request is over // Have to test this first since state may change while in this // method and this is only required if entering this method in @@ -414,25 +282,7 @@ public boolean asyncDispatch(org.apache.coyote.Request req, } } - if (request.isComet()) { - if (!response.isClosed() && !response.isError()) { - if (request.getAvailable() || (request.getContentLength() > 0 && (!request.isParametersParsed()))) { - // Invoke a read event right away if there are available bytes - if (event(req, res, SocketStatus.OPEN_READ)) { - comet = true; - res.action(ActionCode.COMET_BEGIN, null); - } - } else { - comet = true; - res.action(ActionCode.COMET_BEGIN, null); - } - } else { - // Clear the filter chain, as otherwise it will not be reset elsewhere - // since this is a Comet request - request.setFilterChain(null); - } - } - if (!request.isAsync() && !comet) { + if (!request.isAsync()) { request.finishRequest(); response.finishResponse(); if (request.getMappingData().context != null) { @@ -471,7 +321,7 @@ public boolean asyncDispatch(org.apache.coyote.Request req, } req.getRequestProcessor().setWorkerThreadName(null); // Recycle the wrapper request and response - if (!success || (!comet && !request.isAsync())) { + if (!success || !request.isAsync()) { request.recycle(); response.recycle(); } else { @@ -521,7 +371,6 @@ public void service(org.apache.coyote.Request req, response.addHeader("X-Powered-By", POWERED_BY); } - boolean comet = false; boolean async = false; try { @@ -535,26 +384,6 @@ public void service(org.apache.coyote.Request req, request.setAsyncSupported(connector.getService().getContainer().getPipeline().isAsyncSupported()); // Calling the container connector.getService().getContainer().getPipeline().getFirst().invoke(request, response); - - if (request.isComet()) { - if (!response.isClosed() && !response.isError()) { - if (request.getAvailable() || (request.getContentLength() > 0 && (!request.isParametersParsed()))) { - // Invoke a read event right away if there are available bytes - if (event(req, res, SocketStatus.OPEN_READ)) { - comet = true; - res.action(ActionCode.COMET_BEGIN, null); - } - } else { - comet = true; - res.action(ActionCode.COMET_BEGIN, null); - } - } else { - // Clear the filter chain, as otherwise it will not be reset elsewhere - // since this is a Comet request - request.setFilterChain(null); - } - } - } AsyncContextImpl asyncConImpl = (AsyncContextImpl)request.getAsyncContext(); if (asyncConImpl != null) { @@ -573,15 +402,12 @@ public void service(org.apache.coyote.Request req, request.getContext().unbind(false, oldCL); } } - } else if (!comet) { + } else { request.finishRequest(); response.finishResponse(); - if (postParseSuccess && - request.getMappingData().context != null) { + if (postParseSuccess) { // Log only if processing was invoked. // If postParseRequest() failed, it has already logged it. - // If context is null this was the start of a comet request - // that failed and has already been logged. request.getMappingData().context.logAccess( request, response, System.currentTimeMillis() - req.getStartTime(), @@ -596,7 +422,7 @@ public void service(org.apache.coyote.Request req, AtomicBoolean error = new AtomicBoolean(false); res.action(ActionCode.IS_ERROR, error); // Recycle the wrapper request and response - if (!comet && !async || error.get()) { + if (!async || error.get()) { request.recycle(); response.recycle(); } else { diff --git a/java/org/apache/catalina/connector/InputBuffer.java b/java/org/apache/catalina/connector/InputBuffer.java index 03fb73a74edc..a8f579787cf6 100644 --- a/java/org/apache/catalina/connector/InputBuffer.java +++ b/java/org/apache/catalina/connector/InputBuffer.java @@ -214,7 +214,7 @@ public void recycle() { /** - * Clear cached encoders (to save memory for Comet requests). + * Clear cached encoders (to save memory for async requests). */ public void clearEncoders() { encoders.clear(); diff --git a/java/org/apache/catalina/connector/LocalStrings.properties b/java/org/apache/catalina/connector/LocalStrings.properties index 14c40ad98bf9..1c19c58dad60 100644 --- a/java/org/apache/catalina/connector/LocalStrings.properties +++ b/java/org/apache/catalina/connector/LocalStrings.properties @@ -12,9 +12,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - -cometEvent.nullRequest=The event object has been recycled and is no longer associated with a request - coyoteAdapter.accesslogFail=Exception while attempting to add an entry to the access log coyoteAdapter.asyncDispatch=Exception while processing an asynchronous request coyoteAdapter.checkRecycled.request=Encountered a non-recycled request and recycled it forcedly. diff --git a/java/org/apache/catalina/connector/LocalStrings_es.properties b/java/org/apache/catalina/connector/LocalStrings_es.properties index 229984c44899..0b49c9ea7216 100644 --- a/java/org/apache/catalina/connector/LocalStrings_es.properties +++ b/java/org/apache/catalina/connector/LocalStrings_es.properties @@ -51,7 +51,6 @@ coyoteRequest.uploadLocationInvalid = No es v\u00E1lida la localizaci\u00F3n [{0 coyoteRequest.sessionEndAccessFail = Excepci\u00F3n disparada acabando acceso a sesi\u00F3n mientras se reciclaba el requerimiento requestFacade.nullRequest = El objeto de requerimiento ha sido reciclado y ya no est\u00E1 asociado con esta fachada responseFacade.nullResponse = El objeto de respuesta ha sido reciclado y ya no est\u00E1 asociado con esta fachada -cometEvent.nullRequest = El objeto de evento ha sido reciclado y ya no est\u00E1 asociado con este requerimiento mapperListener.unknownDefaultHost = M\u00E1quina por defecto desconocida\: {0} para el conector [{1}] mapperListener.registerHost = Registrar m\u00E1quina {0} en dominio {1} para el conector [{2}] mapperListener.unregisterHost = Desregistrar m\u00E1quina {0} en dominio {1} para el conector [{2}] diff --git a/java/org/apache/catalina/connector/OutputBuffer.java b/java/org/apache/catalina/connector/OutputBuffer.java index 4a3265061517..d22ed56fcad2 100644 --- a/java/org/apache/catalina/connector/OutputBuffer.java +++ b/java/org/apache/catalina/connector/OutputBuffer.java @@ -249,7 +249,7 @@ public void recycle() { /** - * Clear cached encoders (to save memory for Comet requests). + * Clear cached encoders (to save memory for async requests). */ public void clearEncoders() { encoders.clear(); diff --git a/java/org/apache/catalina/connector/Request.java b/java/org/apache/catalina/connector/Request.java index e6331a7a5505..ee36be8bb3bf 100644 --- a/java/org/apache/catalina/connector/Request.java +++ b/java/org/apache/catalina/connector/Request.java @@ -222,18 +222,6 @@ public org.apache.coyote.Request getCoyoteRequest() { protected String authType = null; - /** - * Associated event. - */ - protected CometEventImpl event = null; - - - /** - * Comet state - */ - protected boolean comet = false; - - /** * The current dispatcher type. */ @@ -446,12 +434,6 @@ public void recycle() { internalDispatcherType = null; requestDispatcherPath = null; - comet = false; - if (event != null) { - event.clear(); - event = null; - } - authType = null; inputBuffer.recycle(); usingInputStream = false; @@ -534,7 +516,7 @@ public void recycle() { } /** - * Clear cached encoders (to save memory for Comet requests). + * Clear cached encoders (to save memory for async requests). */ public void clearEncoders() { inputBuffer.clearEncoders(); @@ -542,7 +524,7 @@ public void clearEncoders() { /** - * Clear cached encoders (to save memory for Comet requests). + * Clear cached encoders (to save memory for async requests). */ public boolean read() throws IOException { @@ -949,8 +931,6 @@ static boolean isSSLAttribute(String name) { * have names starting with "org.apache.tomcat" and include: *

* Connector implementations may return some, all or none of these * attributes and may also support additional attributes. @@ -2454,33 +2434,6 @@ public Session getSessionInternal(boolean create) { } - /** - * Get the event associated with the request. - * @return the event - */ - public CometEventImpl getEvent() { - if (event == null) { - event = new CometEventImpl(this, response); - } - return event; - } - - - /** - * Return true if the current request is handling Comet traffic. - */ - public boolean isComet() { - return comet; - } - - - /** - * Set comet state. - */ - public void setComet(boolean comet) { - this.comet = comet; - } - /** * return true if we have parsed parameters */ @@ -2515,15 +2468,6 @@ protected void checkSwallowInput() { } } - public void cometClose() { - coyoteRequest.action(ActionCode.COMET_CLOSE,getEvent()); - setComet(false); - } - - public void setCometTimeout(long timeout) { - coyoteRequest.action(ActionCode.COMET_SETTIMEOUT, Long.valueOf(timeout)); - } - /** * @throws IOException If an I/O error occurs * @throws IllegalStateException If the response has been committed @@ -3281,32 +3225,6 @@ public Object get(Request request, String name) { return null; } - @Override - public void set(Request request, String name, Object value) { - // NO-OP - } - }); - specialAttributes.put(Globals.COMET_SUPPORTED_ATTR, - new SpecialAttributeAdapter() { - @Override - public Object get(Request request, String name) { - return Boolean.valueOf( - request.getConnector().getProtocolHandler( - ).isCometSupported()); - } - @Override - public void set(Request request, String name, Object value) { - // NO-OP - } - }); - specialAttributes.put(Globals.COMET_TIMEOUT_SUPPORTED_ATTR, - new SpecialAttributeAdapter() { - @Override - public Object get(Request request, String name) { - return Boolean.valueOf( - request.getConnector().getProtocolHandler( - ).isCometTimeoutSupported()); - } @Override public void set(Request request, String name, Object value) { // NO-OP diff --git a/java/org/apache/catalina/connector/Response.java b/java/org/apache/catalina/connector/Response.java index 87395a46185a..ca3fff7e2599 100644 --- a/java/org/apache/catalina/connector/Response.java +++ b/java/org/apache/catalina/connector/Response.java @@ -289,7 +289,7 @@ public void recycle() { /** - * Clear cached encoders (to save memory for Comet requests). + * Clear cached encoders (to save memory for async requests). */ public void clearEncoders() { outputBuffer.clearEncoders(); diff --git a/java/org/apache/catalina/core/ApplicationFilterChain.java b/java/org/apache/catalina/core/ApplicationFilterChain.java index fefcf75c847e..7fffb2416d6d 100644 --- a/java/org/apache/catalina/core/ApplicationFilterChain.java +++ b/java/org/apache/catalina/core/ApplicationFilterChain.java @@ -14,11 +14,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.apache.catalina.core; - import java.io.IOException; import java.security.Principal; import java.security.PrivilegedActionException; @@ -34,10 +31,6 @@ import org.apache.catalina.Globals; import org.apache.catalina.InstanceEvent; -import org.apache.catalina.comet.CometEvent; -import org.apache.catalina.comet.CometFilter; -import org.apache.catalina.comet.CometFilterChain; -import org.apache.catalina.comet.CometProcessor; import org.apache.catalina.security.SecurityUtil; import org.apache.catalina.util.InstanceSupport; import org.apache.tomcat.util.ExceptionUtils; @@ -52,7 +45,7 @@ * * @author Craig R. McClanahan */ -final class ApplicationFilterChain implements FilterChain, CometFilterChain { +final class ApplicationFilterChain implements FilterChain { // Used to enforce requirements of SRV.8.2 / SRV.14.2.5.1 private static final ThreadLocal lastServicedRequest; @@ -144,24 +137,9 @@ public ApplicationFilterChain() { private static final Class[] classTypeUsedInService = new Class[]{ ServletRequest.class, ServletResponse.class}; - /** - * Static class array used when the SecurityManager is turned on and - * doFilterEvent is invoked. - */ - private static final Class[] cometClassType = - new Class[]{ CometEvent.class, CometFilterChain.class}; - - /** - * Static class array used when the SecurityManager is turned on and - * event is invoked. - */ - private static final Class[] classTypeUsedInEvent = - new Class[] { CometEvent.class }; - // ---------------------------------------------------- FilterChain Methods - /** * Invoke the next filter in this chain, passing the specified request * and response. If there are no more filters in this chain, invoke @@ -323,48 +301,6 @@ private void internalDoFilter(ServletRequest request, } - /** - * Process the event, using the security manager if the option is enabled. - * - * @param event the event to process - * - * @exception IOException if an input/output error occurs - * @exception ServletException if a servlet exception occurs - */ - @Override - public void doFilterEvent(CometEvent event) - throws IOException, ServletException { - - if( Globals.IS_SECURITY_ENABLED ) { - final CometEvent ev = event; - try { - java.security.AccessController.doPrivileged( - new java.security.PrivilegedExceptionAction() { - @Override - public Void run() - throws ServletException, IOException { - internalDoFilterEvent(ev); - return null; - } - } - ); - } catch( PrivilegedActionException pe) { - Exception e = pe.getException(); - if (e instanceof ServletException) - throw (ServletException) e; - else if (e instanceof IOException) - throw (IOException) e; - else if (e instanceof RuntimeException) - throw (RuntimeException) e; - else - throw new ServletException(e.getMessage(), e); - } - } else { - internalDoFilterEvent(event); - } - } - - /** * The last request passed to a servlet for servicing from the current * thread. @@ -387,125 +323,8 @@ public static ServletResponse getLastServicedResponse() { } - private void internalDoFilterEvent(CometEvent event) - throws IOException, ServletException { - - // Call the next filter if there is one - if (pos < n) { - ApplicationFilterConfig filterConfig = filters[pos++]; - CometFilter filter = null; - try { - filter = (CometFilter) filterConfig.getFilter(); - // FIXME: No instance listener processing for events for now - /* - support.fireInstanceEvent(InstanceEvent.BEFORE_FILTER_EVENT, - filter, event); - */ - - if( Globals.IS_SECURITY_ENABLED ) { - final CometEvent ev = event; - Principal principal = - ev.getHttpServletRequest().getUserPrincipal(); - - Object[] args = new Object[]{ev, this}; - SecurityUtil.doAsPrivilege("doFilterEvent", filter, - cometClassType, args, principal); - - } else { - filter.doFilterEvent(event, this); - } - - /*support.fireInstanceEvent(InstanceEvent.AFTER_FILTER_EVENT, - filter, event);*/ - } catch (IOException e) { - /* - if (filter != null) - support.fireInstanceEvent(InstanceEvent.AFTER_FILTER_EVENT, - filter, event, e); - */ - throw e; - } catch (ServletException e) { - /* - if (filter != null) - support.fireInstanceEvent(InstanceEvent.AFTER_FILTER_EVENT, - filter, event, e); - */ - throw e; - } catch (RuntimeException e) { - /* - if (filter != null) - support.fireInstanceEvent(InstanceEvent.AFTER_FILTER_EVENT, - filter, event, e); - */ - throw e; - } catch (Throwable e) { - e = ExceptionUtils.unwrapInvocationTargetException(e); - ExceptionUtils.handleThrowable(e); - /*if (filter != null) - support.fireInstanceEvent(InstanceEvent.AFTER_FILTER_EVENT, - filter, event, e);*/ - throw new ServletException - (sm.getString("filterChain.filter"), e); - } - return; - } - - // We fell off the end of the chain -- call the servlet instance - try { - /* - support.fireInstanceEvent(InstanceEvent.BEFORE_SERVICE_EVENT, - servlet, request, response); - */ - if( Globals.IS_SECURITY_ENABLED ) { - final CometEvent ev = event; - Principal principal = - ev.getHttpServletRequest().getUserPrincipal(); - Object[] args = new Object[]{ ev }; - SecurityUtil.doAsPrivilege("event", - servlet, - classTypeUsedInEvent, - args, - principal); - } else { - ((CometProcessor) servlet).event(event); - } - /* - support.fireInstanceEvent(InstanceEvent.AFTER_SERVICE_EVENT, - servlet, request, response);*/ - } catch (IOException e) { - /* - support.fireInstanceEvent(InstanceEvent.AFTER_SERVICE_EVENT, - servlet, request, response, e); - */ - throw e; - } catch (ServletException e) { - /* - support.fireInstanceEvent(InstanceEvent.AFTER_SERVICE_EVENT, - servlet, request, response, e); - */ - throw e; - } catch (RuntimeException e) { - /* - support.fireInstanceEvent(InstanceEvent.AFTER_SERVICE_EVENT, - servlet, request, response, e); - */ - throw e; - } catch (Throwable e) { - ExceptionUtils.handleThrowable(e); - /* - support.fireInstanceEvent(InstanceEvent.AFTER_SERVICE_EVENT, - servlet, request, response, e); - */ - throw new ServletException - (sm.getString("filterChain.servlet"), e); - } - - } - - // -------------------------------------------------------- Package Methods - /** * Add a filter to the set of filters that will be executed in this chain. * diff --git a/java/org/apache/catalina/core/ApplicationFilterFactory.java b/java/org/apache/catalina/core/ApplicationFilterFactory.java index 2142530ba3b9..d8c9978a3a21 100644 --- a/java/org/apache/catalina/core/ApplicationFilterFactory.java +++ b/java/org/apache/catalina/core/ApplicationFilterFactory.java @@ -22,9 +22,7 @@ import org.apache.catalina.Globals; import org.apache.catalina.Wrapper; -import org.apache.catalina.comet.CometFilter; import org.apache.catalina.connector.Request; -import org.apache.tomcat.util.ExceptionUtils; import org.apache.tomcat.util.descriptor.web.FilterMap; /** @@ -87,19 +85,13 @@ public static ApplicationFilterFactory getInstance() { if (servlet == null) return (null); - boolean comet = false; - // Create and initialize a filter chain object ApplicationFilterChain filterChain = null; if (request instanceof Request) { Request req = (Request) request; - comet = req.isComet(); if (Globals.IS_SECURITY_ENABLED) { // Security: Do not recycle filterChain = new ApplicationFilterChain(); - if (comet) { - req.setFilterChain(filterChain); - } } else { filterChain = (ApplicationFilterChain) req.getFilterChain(); if (filterChain == null) { @@ -141,23 +133,7 @@ public static ApplicationFilterFactory getInstance() { // FIXME - log configuration problem continue; } - boolean isCometFilter = false; - if (comet) { - try { - isCometFilter = filterConfig.getFilter() instanceof CometFilter; - } catch (Exception e) { - // Note: The try catch is there because getFilter has a lot of - // declared exceptions. However, the filter is allocated much - // earlier - Throwable t = ExceptionUtils.unwrapInvocationTargetException(e); - ExceptionUtils.handleThrowable(t); - } - if (isCometFilter) { - filterChain.addFilter(filterConfig); - } - } else { - filterChain.addFilter(filterConfig); - } + filterChain.addFilter(filterConfig); } // Add filters that match on servlet name second @@ -173,26 +149,11 @@ public static ApplicationFilterFactory getInstance() { // FIXME - log configuration problem continue; } - boolean isCometFilter = false; - if (comet) { - try { - isCometFilter = filterConfig.getFilter() instanceof CometFilter; - } catch (Exception e) { - // Note: The try catch is there because getFilter has a lot of - // declared exceptions. However, the filter is allocated much - // earlier - } - if (isCometFilter) { - filterChain.addFilter(filterConfig); - } - } else { - filterChain.addFilter(filterConfig); - } + filterChain.addFilter(filterConfig); } // Return the completed filter chain - return (filterChain); - + return filterChain; } diff --git a/java/org/apache/catalina/core/StandardContextValve.java b/java/org/apache/catalina/core/StandardContextValve.java index 8419fce4ff97..f72d8989ad70 100644 --- a/java/org/apache/catalina/core/StandardContextValve.java +++ b/java/org/apache/catalina/core/StandardContextValve.java @@ -24,7 +24,6 @@ import org.apache.catalina.Container; import org.apache.catalina.Wrapper; -import org.apache.catalina.comet.CometEvent; import org.apache.catalina.connector.Request; import org.apache.catalina.connector.Response; import org.apache.catalina.valves.ValveBase; @@ -105,27 +104,4 @@ public final void invoke(Request request, Response response) } wrapper.getPipeline().getFirst().invoke(request, response); } - - - /** - * Select the appropriate child Wrapper to process this request, - * based on the specified request URI. If no matching Wrapper can - * be found, return an appropriate HTTP error. - * - * @param request Request to be processed - * @param response Response to be produced - * @param event - * - * @exception IOException if an input/output error occurred - * @exception ServletException if a servlet error occurred - */ - @Override - public final void event(Request request, Response response, CometEvent event) - throws IOException, ServletException { - - // Select the Wrapper to be used for this Request - Wrapper wrapper = request.getWrapper(); - - wrapper.getPipeline().getFirst().event(request, response, event); - } } diff --git a/java/org/apache/catalina/core/StandardEngineValve.java b/java/org/apache/catalina/core/StandardEngineValve.java index 41c5a00edf8b..8ec5ef32fb55 100644 --- a/java/org/apache/catalina/core/StandardEngineValve.java +++ b/java/org/apache/catalina/core/StandardEngineValve.java @@ -22,7 +22,6 @@ import javax.servlet.http.HttpServletResponse; import org.apache.catalina.Host; -import org.apache.catalina.comet.CometEvent; import org.apache.catalina.connector.Request; import org.apache.catalina.connector.Response; import org.apache.catalina.valves.ValveBase; @@ -88,25 +87,4 @@ public final void invoke(Request request, Response response) host.getPipeline().getFirst().invoke(request, response); } - - - /** - * Process Comet event. - * - * @param request Request to be processed - * @param response Response to be produced - * @param event the event - * - * @exception IOException if an input/output error occurred - * @exception ServletException if a servlet error occurred - */ - @Override - public final void event(Request request, Response response, CometEvent event) - throws IOException, ServletException { - - // Ask this Host to process this request - request.getHost().getPipeline().getFirst().event(request, response, event); - - } - } diff --git a/java/org/apache/catalina/core/StandardHostValve.java b/java/org/apache/catalina/core/StandardHostValve.java index 86e37abb528f..1dbded4c2050 100644 --- a/java/org/apache/catalina/core/StandardHostValve.java +++ b/java/org/apache/catalina/core/StandardHostValve.java @@ -27,7 +27,6 @@ import org.apache.catalina.Context; import org.apache.catalina.Globals; import org.apache.catalina.Wrapper; -import org.apache.catalina.comet.CometEvent; import org.apache.catalina.connector.ClientAbortException; import org.apache.catalina.connector.Request; import org.apache.catalina.connector.Response; @@ -192,52 +191,6 @@ public final void invoke(Request request, Response response) } - /** - * Process Comet event. - * - * @param request Request to be processed - * @param response Response to be produced - * @param event the event - * - * @exception IOException if an input/output error occurred - * @exception ServletException if a servlet error occurred - */ - @Override - public final void event(Request request, Response response, CometEvent event) - throws IOException, ServletException { - - // Select the Context to be used for this Request - Context context = request.getContext(); - - context.bind(false, MY_CLASSLOADER); - - // Ask this Context to process this request - context.getPipeline().getFirst().event(request, response, event); - - - // Error page processing - response.setSuspended(false); - - Throwable t = (Throwable) request.getAttribute( - RequestDispatcher.ERROR_EXCEPTION); - - if (t != null) { - throwable(request, response, t); - } else { - status(request, response); - } - - // Access a session (if present) to update last accessed time, based on a - // strict interpretation of the specification - if (ACCESS_SESSION) { - request.getSession(false); - } - - // Restore the context classloader - context.unbind(false, MY_CLASSLOADER); - } - - // -------------------------------------------------------- Private Methods /** diff --git a/java/org/apache/catalina/core/StandardWrapperValve.java b/java/org/apache/catalina/core/StandardWrapperValve.java index 67bb01f6e742..9e8b92fdfc1d 100644 --- a/java/org/apache/catalina/core/StandardWrapperValve.java +++ b/java/org/apache/catalina/core/StandardWrapperValve.java @@ -32,8 +32,6 @@ import org.apache.catalina.Context; import org.apache.catalina.Globals; import org.apache.catalina.LifecycleException; -import org.apache.catalina.comet.CometEvent; -import org.apache.catalina.comet.CometProcessor; import org.apache.catalina.connector.ClientAbortException; import org.apache.catalina.connector.Request; import org.apache.catalina.connector.Response; @@ -163,14 +161,6 @@ public final void invoke(Request request, Response response) servlet = null; } - // Identify if the request is Comet related now that the servlet has been allocated - boolean comet = false; - if (servlet instanceof CometProcessor && request.getAttribute( - Globals.COMET_SUPPORTED_ATTR) == Boolean.TRUE) { - comet = true; - request.setComet(true); - } - MessageBytes requestPathMB = request.getRequestPathMB(); DispatcherType dispatcherType = DispatcherType.REQUEST; if (request.getDispatcherType()==DispatcherType.ASYNC) dispatcherType = DispatcherType.ASYNC; @@ -183,9 +173,6 @@ public final void invoke(Request request, Response response) ApplicationFilterChain filterChain = factory.createFilterChain(request, wrapper, servlet); - // Reset comet flag value after creating the filter chain - request.setComet(false); - // Call the filter chain for this request // NOTE: This also calls the servlet's service() method try { @@ -196,9 +183,6 @@ public final void invoke(Request request, Response response) SystemLogHandler.startCapture(); if (request.isAsyncDispatching()) { ((AsyncContextImpl)request.getAsyncContext()).doInternalDispatch(); - } else if (comet) { - filterChain.doFilterEvent(request.getEvent()); - request.setComet(true); } else { filterChain.doFilter(request.getRequest(), response.getResponse()); @@ -212,9 +196,6 @@ public final void invoke(Request request, Response response) } else { if (request.isAsyncDispatching()) { ((AsyncContextImpl)request.getAsyncContext()).doInternalDispatch(); - } else if (comet) { - request.setComet(true); - filterChain.doFilterEvent(request.getEvent()); } else { filterChain.doFilter (request.getRequest(), response.getResponse()); @@ -272,180 +253,7 @@ public final void invoke(Request request, Response response) // Release the filter chain (if any) for this request if (filterChain != null) { - if (request.isComet()) { - // If this is a Comet request, then the same chain will be used for the - // processing of all subsequent events. - filterChain.reuse(); - } else { - filterChain.release(); - } - } - - // Deallocate the allocated servlet instance - try { - if (servlet != null) { - wrapper.deallocate(servlet); - } - } catch (Throwable e) { - ExceptionUtils.handleThrowable(e); - container.getLogger().error(sm.getString("standardWrapper.deallocateException", - wrapper.getName()), e); - if (throwable == null) { - throwable = e; - exception(request, response, e); - } - } - - // If this servlet has been marked permanently unavailable, - // unload it and release this instance - try { - if ((servlet != null) && - (wrapper.getAvailable() == Long.MAX_VALUE)) { - wrapper.unload(); - } - } catch (Throwable e) { - ExceptionUtils.handleThrowable(e); - container.getLogger().error(sm.getString("standardWrapper.unloadException", - wrapper.getName()), e); - if (throwable == null) { - throwable = e; - exception(request, response, e); - } - } - long t2=System.currentTimeMillis(); - - long time=t2-t1; - processingTime += time; - if( time > maxTime) maxTime=time; - if( time < minTime) minTime=time; - - } - - - /** - * Process a Comet event. The main differences here are to not use sendError - * (the response is committed), to avoid creating a new filter chain - * (which would work but be pointless), and a few very minor tweaks. - * - * @param request The servlet request to be processed - * @param response The servlet response to be created - * - * @exception IOException if an input/output error occurs, or is thrown - * by a subsequently invoked Valve, Filter, or Servlet - * @exception ServletException if a servlet error occurs, or is thrown - * by a subsequently invoked Valve, Filter, or Servlet - */ - @Override - public void event(Request request, Response response, CometEvent event) - throws IOException, ServletException { - - // Initialize local variables we may need - Throwable throwable = null; - // This should be a Request attribute... - long t1=System.currentTimeMillis(); - // FIXME: Add a flag to count the total amount of events processed ? requestCount++; - - StandardWrapper wrapper = (StandardWrapper) getContainer(); - if (wrapper == null) { - // Context has been shutdown. Nothing to do here. - return; - } - - Servlet servlet = null; - Context context = (Context) wrapper.getParent(); - - // Check for the application being marked unavailable - boolean unavailable = !context.getState().isAvailable() || - wrapper.isUnavailable(); - - // Allocate a servlet instance to process this request - try { - if (!unavailable) { - servlet = wrapper.allocate(); - } - } catch (UnavailableException e) { - // The response is already committed, so it's not possible to do anything - } catch (ServletException e) { - container.getLogger().error(sm.getString("standardWrapper.allocateException", - wrapper.getName()), StandardWrapper.getRootCause(e)); - throwable = e; - exception(request, response, e); - } catch (Throwable e) { - ExceptionUtils.handleThrowable(e); - container.getLogger().error(sm.getString("standardWrapper.allocateException", - wrapper.getName()), e); - throwable = e; - exception(request, response, e); - servlet = null; - } - - MessageBytes requestPathMB = request.getRequestPathMB(); - request.setAttribute(Globals.DISPATCHER_TYPE_ATTR, - DispatcherType.REQUEST); - request.setAttribute(Globals.DISPATCHER_REQUEST_PATH_ATTR, - requestPathMB); - // Get the current (unchanged) filter chain for this request - ApplicationFilterChain filterChain = - (ApplicationFilterChain) request.getFilterChain(); - - // Call the filter chain for this request - // NOTE: This also calls the servlet's event() method - try { - if ((servlet != null) && (filterChain != null)) { - - // Swallow output if needed - if (context.getSwallowOutput()) { - try { - SystemLogHandler.startCapture(); - filterChain.doFilterEvent(request.getEvent()); - } finally { - String log = SystemLogHandler.stopCapture(); - if (log != null && log.length() > 0) { - context.getLogger().info(log); - } - } - } else { - filterChain.doFilterEvent(request.getEvent()); - } - - } - } catch (ClientAbortException e) { - throwable = e; - exception(request, response, e); - } catch (IOException e) { - container.getLogger().error(sm.getString( - "standardWrapper.serviceException", wrapper.getName(), - context.getName()), e); - throwable = e; - exception(request, response, e); - } catch (UnavailableException e) { - container.getLogger().error(sm.getString( - "standardWrapper.serviceException", wrapper.getName(), - context.getName()), e); - // Do not save exception in 'throwable', because we - // do not want to do exception(request, response, e) processing - } catch (ServletException e) { - Throwable rootCause = StandardWrapper.getRootCause(e); - if (!(rootCause instanceof ClientAbortException)) { - container.getLogger().error(sm.getString( - "standardWrapper.serviceExceptionRoot", - wrapper.getName(), context.getName(), e.getMessage()), - rootCause); - } - throwable = e; - exception(request, response, e); - } catch (Throwable e) { - ExceptionUtils.handleThrowable(e); - container.getLogger().error(sm.getString( - "standardWrapper.serviceException", wrapper.getName(), - context.getName()), e); - throwable = e; - exception(request, response, e); - } - - // Release the filter chain (if any) for this request - if (filterChain != null) { - filterChain.reuse(); + filterChain.release(); } // Deallocate the allocated servlet instance @@ -479,7 +287,6 @@ public void event(Request request, Response response, CometEvent event) exception(request, response, e); } } - long t2=System.currentTimeMillis(); long time=t2-t1; @@ -492,7 +299,6 @@ public void event(Request request, Response response, CometEvent event) // -------------------------------------------------------- Private Methods - /** * Handle the specified ServletException encountered while processing * the specified Request to produce the specified Response. Any diff --git a/java/org/apache/catalina/filters/FailedRequestFilter.java b/java/org/apache/catalina/filters/FailedRequestFilter.java index 045372d0aa1b..52f49dd58de2 100644 --- a/java/org/apache/catalina/filters/FailedRequestFilter.java +++ b/java/org/apache/catalina/filters/FailedRequestFilter.java @@ -25,9 +25,6 @@ import javax.servlet.http.HttpServletResponse; import org.apache.catalina.Globals; -import org.apache.catalina.comet.CometEvent; -import org.apache.catalina.comet.CometFilter; -import org.apache.catalina.comet.CometFilterChain; import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; @@ -43,7 +40,7 @@ * request.getInputStream() and request.getReader(), * if requests parsed by them do not use standard value for content mime-type. */ -public class FailedRequestFilter extends FilterBase implements CometFilter { +public class FailedRequestFilter extends FilterBase { private static final Log log = LogFactory.getLog(FailedRequestFilter.class); @@ -63,19 +60,6 @@ public void doFilter(ServletRequest request, ServletResponse response, chain.doFilter(request, response); } - @Override - public void doFilterEvent(CometEvent event, CometFilterChain chain) - throws IOException, ServletException { - if (event.getEventType() == CometEvent.EventType.BEGIN - && !isGoodRequest(event.getHttpServletRequest())) { - event.getHttpServletResponse().sendError( - HttpServletResponse.SC_BAD_REQUEST); - event.close(); - return; - } - chain.doFilterEvent(event); - } - private boolean isGoodRequest(ServletRequest request) { // Trigger parsing of parameters request.getParameter("none"); diff --git a/java/org/apache/catalina/filters/RemoteAddrFilter.java b/java/org/apache/catalina/filters/RemoteAddrFilter.java index 8fe9fc682807..4da7d2cc681f 100644 --- a/java/org/apache/catalina/filters/RemoteAddrFilter.java +++ b/java/org/apache/catalina/filters/RemoteAddrFilter.java @@ -16,7 +16,6 @@ */ package org.apache.catalina.filters; - import java.io.IOException; import javax.servlet.FilterChain; @@ -24,12 +23,9 @@ import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; -import org.apache.catalina.comet.CometEvent; -import org.apache.catalina.comet.CometFilterChain; import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; - /** * Concrete implementation of RequestFilter that filters * based on the string representation of the remote client's IP address. @@ -72,24 +68,6 @@ public void doFilter(ServletRequest request, ServletResponse response, } - /** - * Extract the desired request property, and pass it (along with the comet - * event and filter chain) to the protected process() method - * to perform the actual filtering. - * - * @param event The comet event to be processed - * @param chain The filter chain for this event - * - * @exception IOException if an input/output error occurs - * @exception ServletException if a servlet error occurs - */ - @Override - public void doFilterEvent(CometEvent event, CometFilterChain chain) - throws IOException, ServletException { - processCometEvent(event.getHttpServletRequest().getRemoteAddr(), - event, chain); - } - @Override protected Log getLogger() { return log; diff --git a/java/org/apache/catalina/filters/RemoteHostFilter.java b/java/org/apache/catalina/filters/RemoteHostFilter.java index de8a327b0e37..0871a405acf4 100644 --- a/java/org/apache/catalina/filters/RemoteHostFilter.java +++ b/java/org/apache/catalina/filters/RemoteHostFilter.java @@ -16,7 +16,6 @@ */ package org.apache.catalina.filters; - import java.io.IOException; import javax.servlet.FilterChain; @@ -24,12 +23,9 @@ import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; -import org.apache.catalina.comet.CometEvent; -import org.apache.catalina.comet.CometFilterChain; import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; - /** * Concrete implementation of RequestFilter that filters * based on the remote client's host name. @@ -67,24 +63,6 @@ public void doFilter(ServletRequest request, ServletResponse response, } - /** - * Extract the desired request property, and pass it (along with the comet - * event and filter chain) to the protected process() method - * to perform the actual filtering. - * - * @param event The comet event to be processed - * @param chain The filter chain for this event - * - * @exception IOException if an input/output error occurs - * @exception ServletException if a servlet error occurs - */ - @Override - public void doFilterEvent(CometEvent event, CometFilterChain chain) - throws IOException, ServletException { - processCometEvent(event.getHttpServletRequest().getRemoteHost(), - event, chain); - } - @Override protected Log getLogger() { return log; diff --git a/java/org/apache/catalina/filters/RequestFilter.java b/java/org/apache/catalina/filters/RequestFilter.java index e6c79ddb010b..859c36fee606 100644 --- a/java/org/apache/catalina/filters/RequestFilter.java +++ b/java/org/apache/catalina/filters/RequestFilter.java @@ -26,10 +26,6 @@ import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletResponse; -import org.apache.catalina.comet.CometEvent; -import org.apache.catalina.comet.CometFilter; -import org.apache.catalina.comet.CometFilterChain; - /** * Implementation of a Filter that performs filtering based on comparing the * appropriate request property (selected based on which subclass you choose @@ -55,7 +51,7 @@ *
  • The request will be rejected with a "Forbidden" HTTP response.
    • * */ -public abstract class RequestFilter extends FilterBase implements CometFilter { +public abstract class RequestFilter extends FilterBase { // ----------------------------------------------------- Instance Variables @@ -213,28 +209,6 @@ protected void process(String property, ServletRequest request, } - /** - * Perform the filtering that has been configured for this Filter, matching - * against the specified request property. - * - * @param property The property to check against the allow/deny rules - * @param event The comet event to be filtered - * @param chain The comet filter chain - * @exception IOException if an input/output error occurs - * @exception ServletException if a servlet error occurs - */ - protected void processCometEvent(String property, CometEvent event, - CometFilterChain chain) throws IOException, ServletException { - HttpServletResponse response = event.getHttpServletResponse(); - - if (isAllowed(property)) { - chain.doFilterEvent(event); - } else { - response.sendError(denyStatus); - event.close(); - } - } - /** * Process the allow and deny rules for the provided property. * diff --git a/java/org/apache/catalina/valves/CometConnectionManagerValve.java b/java/org/apache/catalina/valves/CometConnectionManagerValve.java deleted file mode 100644 index 1d9b82d5d7e3..000000000000 --- a/java/org/apache/catalina/valves/CometConnectionManagerValve.java +++ /dev/null @@ -1,343 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.catalina.valves; - - -import java.io.IOException; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpSession; -import javax.servlet.http.HttpSessionEvent; -import javax.servlet.http.HttpSessionListener; - -import org.apache.catalina.Context; -import org.apache.catalina.Lifecycle; -import org.apache.catalina.LifecycleEvent; -import org.apache.catalina.LifecycleException; -import org.apache.catalina.LifecycleListener; -import org.apache.catalina.LifecycleState; -import org.apache.catalina.comet.CometEvent; -import org.apache.catalina.comet.CometProcessor; -import org.apache.catalina.connector.CometEventImpl; -import org.apache.catalina.connector.Request; -import org.apache.catalina.connector.Response; - - -/** - *

    Implementation of a Valve that tracks Comet connections, and closes them - * when the associated session expires or the webapp is reloaded.

    - * - *

    This Valve should be attached to a Context.

    - * - * @author Remy Maucherat - */ -public class CometConnectionManagerValve extends ValveBase - implements HttpSessionListener, LifecycleListener { - - //------------------------------------------------------ Constructor - public CometConnectionManagerValve() { - super(false); - } - - - // ----------------------------------------------------- Instance Variables - - /** - * List of current Comet connections. - */ - protected final List cometRequests = - Collections.synchronizedList(new ArrayList()); - - - /** - * Name of session attribute used to store list of comet connections. - */ - protected final String cometRequestsAttribute = - "org.apache.tomcat.comet.connectionList"; - - - /** - * Start this component and implement the requirements - * of {@link org.apache.catalina.util.LifecycleBase#startInternal()}. - * - * @exception LifecycleException if this component detects a fatal error - * that prevents this component from being used - */ - @Override - protected synchronized void startInternal() throws LifecycleException { - - if (container instanceof Context) { - container.addLifecycleListener(this); - } - - setState(LifecycleState.STARTING); - } - - - /** - * Stop this component and implement the requirements - * of {@link org.apache.catalina.util.LifecycleBase#stopInternal()}. - * - * @exception LifecycleException if this component detects a fatal error - * that prevents this component from being used - */ - @Override - protected synchronized void stopInternal() throws LifecycleException { - - setState(LifecycleState.STOPPING); - - if (container instanceof Context) { - container.removeLifecycleListener(this); - } - } - - - @Override - public void lifecycleEvent(LifecycleEvent event) { - if (Lifecycle.BEFORE_STOP_EVENT.equals(event.getType())) { - // The container is getting stopped, close all current connections - Iterator iterator = cometRequests.iterator(); - while (iterator.hasNext()) { - Request request = iterator.next(); - // Remove the session tracking attribute as it isn't - // serializable or required. - HttpSession session = request.getSession(false); - if (session != null) { - session.removeAttribute(cometRequestsAttribute); - } - // Close the comet connection - CometEventImpl cometEvent = request.getEvent(); - try { - cometEvent.setEventType(CometEvent.EventType.END); - cometEvent.setEventSubType( - CometEvent.EventSubType.WEBAPP_RELOAD); - getNext().event(request, request.getResponse(), cometEvent); - } catch (Exception e) { - container.getLogger().warn( - sm.getString("cometConnectionManagerValve.event"), - e); - } finally { - try { - cometEvent.close(); - } catch (IOException e) { - container.getLogger().warn(sm.getString( - "cometConnectionManagerValve.event"), e); - } - } - } - cometRequests.clear(); - } - } - - - // --------------------------------------------------------- Public Methods - - /** - * Register requests for tracking, whenever needed. - * - * @param request The servlet request to be processed - * @param response The servlet response to be created - * - * @exception IOException if an input/output error occurs - * @exception ServletException if a servlet error occurs - */ - @Override - public void invoke(Request request, Response response) - throws IOException, ServletException { - // Perform the request - getNext().invoke(request, response); - - if (request.isComet() && !response.isClosed()) { - // Start tracking this connection, since this is a - // begin event, and Comet mode is on - HttpSession session = request.getSession(true); - - // Track the connection for webapp reload - cometRequests.add(request); - - // Track the connection for session expiration - synchronized (session) { - ConnectionList list = (ConnectionList) session.getAttribute( - cometRequestsAttribute); - Request[] requests = null; - if (list != null) { - requests = list.get(); - } - if (requests == null) { - requests = new Request[1]; - requests[0] = request; - session.setAttribute(cometRequestsAttribute, - new ConnectionList(requests)); - } else { - Request[] newRequests = - new Request[requests.length + 1]; - for (int i = 0; i < requests.length; i++) { - newRequests[i] = requests[i]; - } - newRequests[requests.length] = request; - session.setAttribute(cometRequestsAttribute, - new ConnectionList(newRequests)); - } - } - } - - } - - - /** - * Use events to update the connection state. - * - * @param request The servlet request to be processed - * @param response The servlet response to be created - * - * @exception IOException if an input/output error occurs - * @exception ServletException if a servlet error occurs - */ - @Override - public void event(Request request, Response response, CometEvent event) - throws IOException, ServletException { - - // Perform the request - boolean ok = false; - try { - getNext().event(request, response, event); - ok = true; - } finally { - if (!ok || response.isClosed() - || (event.getEventType() == CometEvent.EventType.END) - || (event.getEventType() == CometEvent.EventType.ERROR - && !(event.getEventSubType() == - CometEvent.EventSubType.TIMEOUT))) { - - // Remove the connection from webapp reload tracking - cometRequests.remove(request); - - // Remove connection from session expiration tracking - // Note: can't get the session if it has been invalidated but - // OK since session listener will have done clean-up - HttpSession session = request.getSession(false); - if (session != null) { - synchronized (session) { - Request[] reqs = null; - try { - ConnectionList list = - (ConnectionList) session.getAttribute( - cometRequestsAttribute); - if (list != null) { - reqs = list.get(); - } - } catch (IllegalStateException ise) { - // Ignore - session has been invalidated - // Listener will have cleaned up - } - if (reqs != null) { - boolean found = false; - for (int i = 0; !found && (i < reqs.length); i++) { - found = (reqs[i] == request); - } - if (found) { - if (reqs.length > 1) { - Request[] newConnectionInfos = - new Request[reqs.length - 1]; - int pos = 0; - for (int i = 0; i < reqs.length; i++) { - if (reqs[i] != request) { - newConnectionInfos[pos++] = reqs[i]; - } - } - try { - session.setAttribute( - cometRequestsAttribute, - new ConnectionList( - newConnectionInfos)); - } catch (IllegalStateException ise) { - // Ignore - session has been invalidated - // Listener will have cleaned up - } - } else { - try { - session.removeAttribute( - cometRequestsAttribute); - } catch (IllegalStateException ise) { - // Ignore - session has been invalidated - // Listener will have cleaned up - } - } - } - } - } - } - } - } - - } - - - @Override - public void sessionCreated(HttpSessionEvent se) { - // NOOP - } - - - @Override - public void sessionDestroyed(HttpSessionEvent se) { - // Close all Comet connections associated with this session - ConnectionList list = (ConnectionList) se.getSession().getAttribute( - cometRequestsAttribute); - Request[] reqs = null; - if (list != null) { - reqs = list.get(); - } - if (reqs != null) { - for (int i = 0; i < reqs.length; i++) { - Request req = reqs[i]; - try { - CometEventImpl event = req.getEvent(); - event.setEventType(CometEvent.EventType.END); - event.setEventSubType(CometEvent.EventSubType.SESSION_END); - ((CometProcessor) - req.getWrapper().getServlet()).event(event); - event.close(); - } catch (Exception e) { - req.getWrapper().getParent().getLogger().warn(sm.getString( - "cometConnectionManagerValve.listenerEvent"), e); - } - } - } - } - - - private static class ConnectionList implements Serializable { - - private static final long serialVersionUID = 1L; - - private transient Request[] connectionList = null; - - private ConnectionList(Request[] connectionList){ - this.connectionList = connectionList; - } - - public Request[] get(){ - return connectionList; - } - } -} diff --git a/java/org/apache/catalina/valves/LocalStrings.properties b/java/org/apache/catalina/valves/LocalStrings.properties index c11240d0851f..fbb8da259511 100644 --- a/java/org/apache/catalina/valves/LocalStrings.properties +++ b/java/org/apache/catalina/valves/LocalStrings.properties @@ -14,8 +14,6 @@ # limitations under the License. jdbcAccessLogValve.exception=Exception performing insert access entry -cometConnectionManagerValve.event=Exception processing event -cometConnectionManagerValve.listenerEvent=Exception processing session listener event # Access log valve accessLogValve.openFail=Failed to open access log file [{0}] diff --git a/java/org/apache/catalina/valves/LocalStrings_es.properties b/java/org/apache/catalina/valves/LocalStrings_es.properties index bba69a5dff9d..412d12aaf446 100644 --- a/java/org/apache/catalina/valves/LocalStrings_es.properties +++ b/java/org/apache/catalina/valves/LocalStrings_es.properties @@ -13,8 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. jdbcAccessLogValve.exception = Excepci\u00F3n realizando entrada de acceso a inserci\u00F3n -cometConnectionManagerValve.event = Excepci\u00F3n procesando evento -cometConnectionManagerValve.listenerEvent = Excepci\u00F3n procesando evento de oyente de sesi\u00F3n accessLogValve.closeFail = No pude cerrar fichero de historial accessLogValve.openDirFail = No pude crear directorio [{0}] para historiales de acceso accessLogValve.rotateFail = No pude rotar historial de acceso diff --git a/java/org/apache/catalina/valves/ValveBase.java b/java/org/apache/catalina/valves/ValveBase.java index fcf092346ef1..0603f70bbaf1 100644 --- a/java/org/apache/catalina/valves/ValveBase.java +++ b/java/org/apache/catalina/valves/ValveBase.java @@ -16,7 +16,6 @@ */ package org.apache.catalina.valves; - import java.io.IOException; import javax.servlet.ServletException; @@ -27,14 +26,12 @@ import org.apache.catalina.LifecycleState; import org.apache.catalina.Pipeline; import org.apache.catalina.Valve; -import org.apache.catalina.comet.CometEvent; import org.apache.catalina.connector.Request; import org.apache.catalina.connector.Response; import org.apache.catalina.util.LifecycleMBeanBase; import org.apache.juli.logging.Log; import org.apache.tomcat.util.res.StringManager; - /** * Convenience base class for implementations of the Valve interface. * A subclass MUST implement an invoke() @@ -182,27 +179,6 @@ public abstract void invoke(Request request, Response response) throws IOException, ServletException; - /** - * Process a Comet event. This method will rarely need to be provided by - * a subclass, unless it needs to reassociate a particular object with - * the thread that is processing the request. - * - * @param request The servlet request to be processed - * @param response The servlet response to be created - * - * @exception IOException if an input/output error occurs, or is thrown - * by a subsequently invoked Valve, Filter, or Servlet - * @exception ServletException if a servlet error occurs, or is thrown - * by a subsequently invoked Valve, Filter, or Servlet - */ - @Override - public void event(Request request, Response response, CometEvent event) - throws IOException, ServletException { - // Perform the request - getNext().event(request, response, event); - } - - @Override protected void initInternal() throws LifecycleException { super.initInternal(); diff --git a/java/org/apache/coyote/AbstractProcessor.java b/java/org/apache/coyote/AbstractProcessor.java index 762cc5f58b95..be45c5c40552 100644 --- a/java/org/apache/coyote/AbstractProcessor.java +++ b/java/org/apache/coyote/AbstractProcessor.java @@ -178,9 +178,6 @@ public void errorDispatch() { getAdapter().errorDispatch(request, response); } - @Override - public abstract boolean isComet(); - @Override public abstract boolean isUpgrade(); @@ -191,12 +188,6 @@ public void errorDispatch() { @Override public abstract SocketState process(SocketWrapper socket) throws IOException; - /** - * Process in-progress Comet requests. These will start as HTTP requests. - */ - @Override - public abstract SocketState event(SocketStatus status) throws IOException; - /** * Process in-progress Servlet 3.0 Async requests. These will start as HTTP * requests. diff --git a/java/org/apache/coyote/AbstractProtocol.java b/java/org/apache/coyote/AbstractProtocol.java index b7ec2af7cc91..e4fee7f005cc 100644 --- a/java/org/apache/coyote/AbstractProtocol.java +++ b/java/org/apache/coyote/AbstractProtocol.java @@ -160,18 +160,6 @@ public boolean isAprRequired() { } - @Override - public boolean isCometSupported() { - return endpoint.getUseComet(); - } - - - @Override - public boolean isCometTimeoutSupported() { - return endpoint.getUseCometTimeout(); - } - - @Override public boolean isSendfileSupported() { return endpoint.getUseSendfile(); @@ -640,16 +628,11 @@ public SocketState process(SocketWrapper wrapper, state = processor.asyncDispatch( nextDispatch.getSocketStatus()); } - } else if (status == SocketStatus.DISCONNECT && - !processor.isComet()) { + } else if (status == SocketStatus.DISCONNECT) { // Do nothing here, just wait for it to get recycled - // Don't do this for Comet we need to generate an end - // event (see BZ 54022) } else if (processor.isAsync() || state == SocketState.ASYNC_END) { state = processor.asyncDispatch(status); - } else if (processor.isComet()) { - state = processor.event(status); } else if (processor.isUpgrade()) { state = processor.upgradeDispatch(status); } else if (status == SocketStatus.OPEN_WRITE) { diff --git a/java/org/apache/coyote/ActionCode.java b/java/org/apache/coyote/ActionCode.java index efcf4d8824d9..7fdbcc33c612 100644 --- a/java/org/apache/coyote/ActionCode.java +++ b/java/org/apache/coyote/ActionCode.java @@ -109,31 +109,11 @@ public enum ActionCode { */ REQ_SET_BODY_REPLAY, - /** - * Callback for begin Comet processing. - */ - COMET_BEGIN, - - /** - * Callback for end Comet processing. - */ - COMET_END, - /** * Callback for getting the amount of available bytes. */ AVAILABLE, - /** - * Callback for an asynchronous close of the Comet event - */ - COMET_CLOSE, - - /** - * Callback for setting the timeout asynchronously - */ - COMET_SETTIMEOUT, - /** * Callback for an async request. */ diff --git a/java/org/apache/coyote/Adapter.java b/java/org/apache/coyote/Adapter.java index 19a46d35b96a..86edd1708c9d 100644 --- a/java/org/apache/coyote/Adapter.java +++ b/java/org/apache/coyote/Adapter.java @@ -45,9 +45,6 @@ public interface Adapter { public void service(Request req, Response res) throws Exception; - public boolean event(Request req, Response res, SocketStatus status) - throws Exception; - public boolean asyncDispatch(Request req,Response res, SocketStatus status) throws Exception; diff --git a/java/org/apache/coyote/Constants.java b/java/org/apache/coyote/Constants.java index b79884b7659b..b674a0e37626 100644 --- a/java/org/apache/coyote/Constants.java +++ b/java/org/apache/coyote/Constants.java @@ -60,36 +60,6 @@ public final class Constants { "org.apache.coyote.USE_CUSTOM_STATUS_MSG_IN_HEADER", "false")).booleanValue(); - /** - * The request attribute that is set to the value of {@code Boolean.TRUE} - * if connector processing this request supports Comet API. - */ - public static final String COMET_SUPPORTED_ATTR = - "org.apache.tomcat.comet.support"; - - - /** - * The request attribute that is set to the value of {@code Boolean.TRUE} - * if connector processing this request supports setting - * per-connection request timeout through Comet API. - * - * @see org.apache.catalina.comet.CometEvent#setTimeout(int) - */ - public static final String COMET_TIMEOUT_SUPPORTED_ATTR = - "org.apache.tomcat.comet.timeout.support"; - - - /** - * The request attribute that can be set to a value of type - * {@code java.lang.Integer} to specify per-connection request - * timeout for Comet API. The value is in milliseconds. - * - * @see org.apache.catalina.comet.CometEvent#setTimeout(int) - */ - public static final String COMET_TIMEOUT_ATTR = - "org.apache.tomcat.comet.timeout"; - - /** * The request attribute that is set to the value of {@code Boolean.TRUE} * if connector processing this request supports use of sendfile. diff --git a/java/org/apache/coyote/Processor.java b/java/org/apache/coyote/Processor.java index 81a1d2518b3d..991af90e4ee5 100644 --- a/java/org/apache/coyote/Processor.java +++ b/java/org/apache/coyote/Processor.java @@ -36,8 +36,6 @@ public interface Processor { SocketState process(SocketWrapper socketWrapper) throws IOException; - SocketState event(SocketStatus status) throws IOException; - SocketState asyncDispatch(SocketStatus status); SocketState asyncPostProcess(); @@ -46,7 +44,6 @@ public interface Processor { void errorDispatch(); - boolean isComet(); boolean isAsync(); boolean isUpgrade(); diff --git a/java/org/apache/coyote/ProtocolHandler.java b/java/org/apache/coyote/ProtocolHandler.java index ed1d0b8f4b9f..757c044c4e25 100644 --- a/java/org/apache/coyote/ProtocolHandler.java +++ b/java/org/apache/coyote/ProtocolHandler.java @@ -90,18 +90,6 @@ public interface ProtocolHandler { public boolean isAprRequired(); - /** - * Does this ProtocolHandler support Comet? - */ - public boolean isCometSupported(); - - - /** - * Does this ProtocolHandler support Comet timeouts? - */ - public boolean isCometTimeoutSupported(); - - /** * Does this ProtocolHandler support sendfile? */ diff --git a/java/org/apache/coyote/ajp/AbstractAjpProcessor.java b/java/org/apache/coyote/ajp/AbstractAjpProcessor.java index d99cdaeade7d..3feff79f0e06 100644 --- a/java/org/apache/coyote/ajp/AbstractAjpProcessor.java +++ b/java/org/apache/coyote/ajp/AbstractAjpProcessor.java @@ -587,26 +587,6 @@ public final void action(ActionCode actionCode, Object param) { throw new UnsupportedOperationException( sm.getString("ajpprocessor.httpupgrade.notsupported")); } - case COMET_BEGIN: { - // HTTP connections only. Unsupported for AJP. - throw new UnsupportedOperationException( - sm.getString("ajpprocessor.comet.notsupported")); - } - case COMET_END: { - // HTTP connections only. Unsupported for AJP. - throw new UnsupportedOperationException( - sm.getString("ajpprocessor.comet.notsupported")); - } - case COMET_CLOSE: { - // HTTP connections only. Unsupported for AJP. - throw new UnsupportedOperationException( - sm.getString("ajpprocessor.comet.notsupported")); - } - case COMET_SETTIMEOUT: { - // HTTP connections only. Unsupported for AJP. - throw new UnsupportedOperationException( - sm.getString("ajpprocessor.comet.notsupported")); - } case AVAILABLE: { if (available()) { request.setAvailable(1); @@ -893,14 +873,6 @@ public void setSslSupport(SSLSupport sslSupport) { } - @Override - public SocketState event(SocketStatus status) throws IOException { - // Should never reach this code but in case we do... - throw new IOException( - sm.getString("ajpprocessor.comet.notsupported")); - } - - @Override public SocketState upgradeDispatch(SocketStatus status) throws IOException { // Should never reach this code but in case we do... @@ -1070,13 +1042,6 @@ else if (messageLength == 0) { } - @Override - public final boolean isComet() { - // AJP does not support Comet - return false; - } - - @Override public final boolean isUpgrade() { // AJP does not support HTTP upgrade diff --git a/java/org/apache/coyote/ajp/AjpNio2Protocol.java b/java/org/apache/coyote/ajp/AjpNio2Protocol.java index df720134f5e7..d5ca5506be53 100644 --- a/java/org/apache/coyote/ajp/AjpNio2Protocol.java +++ b/java/org/apache/coyote/ajp/AjpNio2Protocol.java @@ -27,7 +27,6 @@ import org.apache.tomcat.util.net.Nio2Endpoint; import org.apache.tomcat.util.net.Nio2Endpoint.Handler; import org.apache.tomcat.util.net.SSLImplementation; -import org.apache.tomcat.util.net.SocketStatus; import org.apache.tomcat.util.net.SocketWrapper; @@ -156,7 +155,7 @@ public void onCreateSSLEngine(SSLEngine engine) { @Override public void closeAll() { for (Nio2Channel channel : connections.keySet()) { - ((Nio2Endpoint) proto.endpoint).closeSocket(channel.getSocket(), SocketStatus.STOP); + ((Nio2Endpoint) proto.endpoint).closeSocket(channel.getSocket()); } } } diff --git a/java/org/apache/coyote/ajp/LocalStrings.properties b/java/org/apache/coyote/ajp/LocalStrings.properties index fc7b387687fb..d16033401bda 100644 --- a/java/org/apache/coyote/ajp/LocalStrings.properties +++ b/java/org/apache/coyote/ajp/LocalStrings.properties @@ -15,7 +15,6 @@ ajpnioprotocol.releaseStart=Iterating through our connections to release a socket channel [{0}] ajpnioprotocol.releaseEnd=Done iterating through our connections to release a socket channel [{0}] released [{1}] -ajpprocessor.comet.notsupported=Comet is not supported by the AJP protocol ajpprocessor.failedread=Socket read failed ajpprocessor.failedsend=Failed to send AJP message ajpprocessor.header.error=Header message parsing failed @@ -24,7 +23,6 @@ ajpprocessor.readtimeout=Timeout attempting to read data from the socket ajpprocessor.request.prepare=Error preparing request ajpprocessor.request.process=Error processing request ajpprocessor.certs.fail=Certificate conversion failed -ajpprocessor.comet.notsupported=The Comet protocol is not supported by this connector ajpprocessor.ssl.notsupported=The SSL protocol is not supported by this connector ajpprocessor.httpupgrade.notsupported=HTTP upgrade is not supported by the AJP protocol diff --git a/java/org/apache/coyote/http11/AbstractHttp11Processor.java b/java/org/apache/coyote/http11/AbstractHttp11Processor.java index c576dda10249..297d94dc7a2f 100644 --- a/java/org/apache/coyote/http11/AbstractHttp11Processor.java +++ b/java/org/apache/coyote/http11/AbstractHttp11Processor.java @@ -149,12 +149,6 @@ public abstract class AbstractHttp11Processor extends AbstractProcessor { protected boolean expectation = false; - /** - * Comet used. - */ - protected boolean comet = false; - - /** * Regular expression that defines the restricted user agents. */ @@ -976,7 +970,6 @@ public SocketState process(SocketWrapper socketWrapper) // Flags keepAlive = true; - comet = false; openSocket = false; sendfileInProgress = false; readComplete = true; @@ -990,7 +983,7 @@ public SocketState process(SocketWrapper socketWrapper) socketWrapper.setKeepAliveLeft(0); } - while (!getErrorState().isError() && keepAlive && !comet && !isAsync() && + while (!getErrorState().isError() && keepAlive && !isAsync() && httpUpgradeHandler == null && !endpoint.isPaused()) { // Parsing the request header @@ -1095,7 +1088,6 @@ public SocketState process(SocketWrapper socketWrapper) statusDropsConnection(response.getStatus())))) { setErrorState(ErrorState.CLOSE_CLEAN, null); } - setCometTimeouts(socketWrapper); } catch (InterruptedIOException e) { setErrorState(ErrorState.CLOSE_NOW, e); } catch (HeadersTooLargeException e) { @@ -1123,7 +1115,7 @@ public SocketState process(SocketWrapper socketWrapper) // Finish the handling of the request rp.setStage(org.apache.coyote.Constants.STAGE_ENDINPUT); - if (!isAsync() && !comet) { + if (!isAsync()) { if (getErrorState().isError()) { // If we know we are closing the connection, don't drain // input. This way uploading a 100GB file doesn't tie up the @@ -1152,7 +1144,7 @@ public SocketState process(SocketWrapper socketWrapper) } request.updateCounters(); - if (!isAsync() && !comet || getErrorState().isError()) { + if (!isAsync() || getErrorState().isError()) { if (getErrorState().isIoAllowed()) { getInputBuffer().nextRequest(); getOutputBuffer().nextRequest(); @@ -1178,7 +1170,7 @@ public SocketState process(SocketWrapper socketWrapper) if (getErrorState().isError() || endpoint.isPaused()) { return SocketState.CLOSED; - } else if (isAsync() || comet) { + } else if (isAsync()) { return SocketState.LONG; } else if (isUpgrade()) { return SocketState.UPGRADING; @@ -1710,12 +1702,6 @@ public SocketState asyncDispatch(SocketStatus status) { } - @Override - public boolean isComet() { - return comet; - } - - @Override public boolean isUpgrade() { return httpUpgradeHandler != null; @@ -1745,12 +1731,6 @@ public HttpUpgradeHandler getHttpUpgradeHandler() { protected abstract void resetTimeouts(); - /** - * Provides a mechanism for those connectors (currently only NIO) that need - * that need to set comet timeouts. - */ - protected abstract void setCometTimeouts(SocketWrapper socketWrapper); - public void endRequest() { // Finish the handling of the request @@ -1807,7 +1787,6 @@ public final void recycle(boolean isSocketClosing) { asyncStateMachine.recycle(); } httpUpgradeHandler = null; - comet = false; resetErrorState(); recycleInternal(); } diff --git a/java/org/apache/coyote/http11/Http11AprProcessor.java b/java/org/apache/coyote/http11/Http11AprProcessor.java index e4ecd1a37089..9241f07c9672 100644 --- a/java/org/apache/coyote/http11/Http11AprProcessor.java +++ b/java/org/apache/coyote/http11/Http11AprProcessor.java @@ -18,13 +18,11 @@ import java.io.ByteArrayInputStream; import java.io.IOException; -import java.io.InterruptedIOException; import java.security.cert.CertificateFactory; import java.security.cert.X509Certificate; import org.apache.coyote.ActionCode; import org.apache.coyote.ErrorState; -import org.apache.coyote.RequestInfo; import org.apache.coyote.http11.filters.BufferedInputFilter; import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; @@ -33,11 +31,8 @@ import org.apache.tomcat.jni.SSLSocket; import org.apache.tomcat.jni.Sockaddr; import org.apache.tomcat.jni.Socket; -import org.apache.tomcat.util.ExceptionUtils; -import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState; import org.apache.tomcat.util.net.AprEndpoint; import org.apache.tomcat.util.net.SSLSupport; -import org.apache.tomcat.util.net.SocketStatus; import org.apache.tomcat.util.net.SocketWrapper; @@ -98,47 +93,6 @@ public Http11AprProcessor(int headerBufferSize, AprEndpoint endpoint, // --------------------------------------------------------- Public Methods - /** - * Process pipelined HTTP requests using the specified input and output - * streams. - * - * @throws IOException error during an I/O operation - */ - @Override - public SocketState event(SocketStatus status) - throws IOException { - - RequestInfo rp = request.getRequestProcessor(); - - try { - rp.setStage(org.apache.coyote.Constants.STAGE_SERVICE); - if (!getAdapter().event(request, response, status)) { - setErrorState(ErrorState.CLOSE_NOW, null); - } - } catch (InterruptedIOException e) { - setErrorState(ErrorState.CLOSE_NOW, e); - } catch (Throwable t) { - ExceptionUtils.handleThrowable(t); - // 500 - Internal Server Error - response.setStatus(500); - setErrorState(ErrorState.CLOSE_NOW, t); - getAdapter().log(request, response, 0); - log.error(sm.getString("http11processor.request.process"), t); - } - - rp.setStage(org.apache.coyote.Constants.STAGE_ENDED); - - if (getErrorState().isError() || status==SocketStatus.STOP) { - return SocketState.CLOSED; - } else if (!comet) { - inputBuffer.nextRequest(); - outputBuffer.nextRequest(); - return SocketState.OPEN; - } else { - return SocketState.LONG; - } - } - @Override protected boolean disableKeepAlive() { return false; @@ -185,12 +139,6 @@ protected void setSocketTimeout(int timeout) { } - @Override - protected void setCometTimeouts(SocketWrapper socketWrapper) { - // NO-OP for APR/native - } - - @Override protected boolean breakKeepAliveLoop(SocketWrapper socketWrapper) { openSocket = keepAlive; @@ -455,23 +403,6 @@ public void actionInternal(ActionCode actionCode, Object param) { } break; } - case COMET_BEGIN: { - comet = true; - break; - } - case COMET_END: { - comet = false; - break; - } - case COMET_CLOSE: { - ((AprEndpoint)endpoint).processSocket(this.socketWrapper, - SocketStatus.OPEN_READ, true); - break; - } - case COMET_SETTIMEOUT: { - //no op - break; - } } } diff --git a/java/org/apache/coyote/http11/Http11AprProtocol.java b/java/org/apache/coyote/http11/Http11AprProtocol.java index 1ba9c8fadb13..716cb5869cb1 100644 --- a/java/org/apache/coyote/http11/Http11AprProtocol.java +++ b/java/org/apache/coyote/http11/Http11AprProtocol.java @@ -266,7 +266,7 @@ public SocketState process(SocketWrapper socket, } if (processor == null) { - // if not null - this is a former comet request, handled by http11 + // if not null - handled by http11 SocketState socketState = proto.npnHandler.process(socket, status); // handled by npn protocol. if (socketState == SocketState.CLOSED || @@ -291,19 +291,6 @@ protected void longPoll(SocketWrapper socket, if (processor.isAsync()) { // Async socket.setAsync(true); - } else if (processor.isComet()) { - // Comet - if (proto.endpoint.isRunning()) { - socket.setComet(true); - ((AprEndpoint) proto.endpoint).getPoller().add( - socket.getSocket().longValue(), - proto.endpoint.getSoTimeout(), true, false); - } else { - // Process a STOP directly - ((AprEndpoint) proto.endpoint).processSocket( - socket.getSocket().longValue(), - SocketStatus.STOP); - } } else { // Upgraded Poller p = ((AprEndpoint) proto.endpoint).getPoller(); diff --git a/java/org/apache/coyote/http11/Http11Nio2Processor.java b/java/org/apache/coyote/http11/Http11Nio2Processor.java index 6abd2004b85c..6e3df5d53134 100644 --- a/java/org/apache/coyote/http11/Http11Nio2Processor.java +++ b/java/org/apache/coyote/http11/Http11Nio2Processor.java @@ -17,7 +17,6 @@ package org.apache.coyote.http11; import java.io.IOException; -import java.io.InterruptedIOException; import java.net.InetAddress; import java.net.InetSocketAddress; @@ -25,11 +24,9 @@ import org.apache.coyote.ActionCode; import org.apache.coyote.ErrorState; -import org.apache.coyote.RequestInfo; import org.apache.coyote.http11.filters.BufferedInputFilter; import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; -import org.apache.tomcat.util.ExceptionUtils; import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState; import org.apache.tomcat.util.net.Nio2Channel; import org.apache.tomcat.util.net.Nio2Endpoint; @@ -84,72 +81,6 @@ public Http11Nio2Processor(int maxHttpHeaderSize, Nio2Endpoint endpoint, // --------------------------------------------------------- Public Methods - @Override - public SocketState event(SocketStatus status) - throws IOException { - - long soTimeout = endpoint.getSoTimeout(); - - RequestInfo rp = request.getRequestProcessor(); - try { - rp.setStage(org.apache.coyote.Constants.STAGE_SERVICE); - if (!getAdapter().event(request, response, status)) { - setErrorState(ErrorState.CLOSE_NOW, null); - } - if (!getErrorState().isError()) { - if (socketWrapper != null) { - socketWrapper.setComet(comet); - if (comet) { - Integer comettimeout = (Integer) request.getAttribute( - org.apache.coyote.Constants.COMET_TIMEOUT_ATTR); - if (comettimeout != null) { - socketWrapper.setTimeout(comettimeout.longValue()); - } - } else { - //reset the timeout - if (keepAlive) { - socketWrapper.setTimeout(keepAliveTimeout); - } else { - socketWrapper.setTimeout(soTimeout); - } - } - - } - } - } catch (InterruptedIOException e) { - setErrorState(ErrorState.CLOSE_NOW, e); - } catch (Throwable t) { - ExceptionUtils.handleThrowable(t); - // 500 - Internal Server Error - response.setStatus(500); - setErrorState(ErrorState.CLOSE_NOW, t); - getAdapter().log(request, response, 0); - log.error(sm.getString("http11processor.request.process"), t); - } - - rp.setStage(org.apache.coyote.Constants.STAGE_ENDED); - - if (getErrorState().isError() || status==SocketStatus.STOP) { - return SocketState.CLOSED; - } else if (!comet) { - if (keepAlive) { - inputBuffer.nextRequest(); - outputBuffer.nextRequest(); - if (((InternalNio2InputBuffer) inputBuffer).isPending()) { - // Following comet processing, a read is still pending, so - // keep the processor associated - return SocketState.LONG; - } else { - return SocketState.OPEN; - } - } else { - return SocketState.CLOSED; - } - } else { - return SocketState.LONG; - } - } - @Override public SocketState asyncDispatch(SocketStatus status) { SocketState state = super.asyncDispatch(status); @@ -257,21 +188,6 @@ protected void setSocketTimeout(int timeout) throws IOException { } - @Override - protected void setCometTimeouts(SocketWrapper socketWrapper) { - if (socketWrapper != null) { - socketWrapper.setComet(comet); - if (comet) { - Integer comettimeout = (Integer) request.getAttribute( - org.apache.coyote.Constants.COMET_TIMEOUT_ATTR); - if (comettimeout != null) { - socketWrapper.setTimeout(comettimeout.longValue()); - } - } - } - } - - @Override protected boolean breakKeepAliveLoop( SocketWrapper socketWrapper) { @@ -503,42 +419,6 @@ public void actionInternal(ActionCode actionCode, Object param) { } break; } - case COMET_BEGIN: { - comet = true; - break; - } - case COMET_END: { - comet = false; - break; - } - case COMET_CLOSE: { - if (socketWrapper == null || socketWrapper.getSocket() == null) { - return; - } - RequestInfo rp = request.getRequestProcessor(); - if (rp.getStage() != org.apache.coyote.Constants.STAGE_SERVICE) { - // Close event for this processor triggered by request - // processing in another processor, a non-Tomcat thread (i.e. - // an application controlled thread) or similar. - endpoint.processSocket(this.socketWrapper, SocketStatus.OPEN_READ, true); - } - break; - } - case COMET_SETTIMEOUT: { - if (param == null) { - return; - } - if (socketWrapper == null) { - return; - } - long timeout = ((Long)param).longValue(); - //if we are not piggy backing on a worker thread, set the timeout - RequestInfo rp = request.getRequestProcessor(); - if ( rp.getStage() != org.apache.coyote.Constants.STAGE_SERVICE ) { - socketWrapper.setTimeout(timeout); - } - break; - } } } diff --git a/java/org/apache/coyote/http11/Http11Nio2Protocol.java b/java/org/apache/coyote/http11/Http11Nio2Protocol.java index 64edf2ef8cf1..5fffea8bd454 100644 --- a/java/org/apache/coyote/http11/Http11Nio2Protocol.java +++ b/java/org/apache/coyote/http11/Http11Nio2Protocol.java @@ -236,7 +236,6 @@ protected void longPoll(SocketWrapper socket, } } else { // Either: - // - this is comet request // - this is an upgraded connection // - the request line/headers have not been completely // read @@ -275,7 +274,7 @@ public void onCreateSSLEngine(SSLEngine engine) { @Override public void closeAll() { for (Nio2Channel channel : connections.keySet()) { - ((Nio2Endpoint) proto.endpoint).closeSocket(channel.getSocket(), SocketStatus.STOP); + ((Nio2Endpoint) proto.endpoint).closeSocket(channel.getSocket()); } } } diff --git a/java/org/apache/coyote/http11/Http11NioProcessor.java b/java/org/apache/coyote/http11/Http11NioProcessor.java index edf4b72a8b65..c9b358d14d1f 100644 --- a/java/org/apache/coyote/http11/Http11NioProcessor.java +++ b/java/org/apache/coyote/http11/Http11NioProcessor.java @@ -17,7 +17,6 @@ package org.apache.coyote.http11; import java.io.IOException; -import java.io.InterruptedIOException; import java.net.InetAddress; import java.nio.channels.SelectionKey; @@ -25,18 +24,14 @@ import org.apache.coyote.ActionCode; import org.apache.coyote.ErrorState; -import org.apache.coyote.RequestInfo; import org.apache.coyote.http11.filters.BufferedInputFilter; import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; -import org.apache.tomcat.util.ExceptionUtils; -import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState; import org.apache.tomcat.util.net.NioChannel; import org.apache.tomcat.util.net.NioEndpoint; import org.apache.tomcat.util.net.NioEndpoint.KeyAttachment; import org.apache.tomcat.util.net.SSLSupport; import org.apache.tomcat.util.net.SecureNioChannel; -import org.apache.tomcat.util.net.SocketStatus; import org.apache.tomcat.util.net.SocketWrapper; @@ -87,73 +82,6 @@ public Http11NioProcessor(int maxHttpHeaderSize, NioEndpoint endpoint, // --------------------------------------------------------- Public Methods - /** - * Process pipelined HTTP requests using the specified input and output - * streams. - * - * @throws IOException error during an I/O operation - */ - @Override - public SocketState event(SocketStatus status) throws IOException { - - long soTimeout = endpoint.getSoTimeout(); - - RequestInfo rp = request.getRequestProcessor(); - final NioEndpoint.KeyAttachment attach = (NioEndpoint.KeyAttachment)socketWrapper.getSocket().getAttachment(false); - try { - rp.setStage(org.apache.coyote.Constants.STAGE_SERVICE); - if (!getAdapter().event(request, response, status)) { - setErrorState(ErrorState.CLOSE_NOW, null); - } - if (!getErrorState().isError()) { - if (attach != null) { - attach.setComet(comet); - if (comet) { - Integer comettimeout = (Integer) request.getAttribute( - org.apache.coyote.Constants.COMET_TIMEOUT_ATTR); - if (comettimeout != null) { - attach.setTimeout(comettimeout.longValue()); - } - } else { - //reset the timeout - if (keepAlive) { - attach.setTimeout(keepAliveTimeout); - } else { - attach.setTimeout(soTimeout); - } - } - - } - } - } catch (InterruptedIOException e) { - setErrorState(ErrorState.CLOSE_NOW, e); - } catch (Throwable t) { - ExceptionUtils.handleThrowable(t); - // 500 - Internal Server Error - response.setStatus(500); - setErrorState(ErrorState.CLOSE_NOW, t); - log.error(sm.getString("http11processor.request.process"), t); - getAdapter().log(request, response, 0); - } - - rp.setStage(org.apache.coyote.Constants.STAGE_ENDED); - - if (getErrorState().isError() || status==SocketStatus.STOP) { - return SocketState.CLOSED; - } else if (!comet) { - if (keepAlive) { - inputBuffer.nextRequest(); - outputBuffer.nextRequest(); - return SocketState.OPEN; - } else { - return SocketState.CLOSED; - } - } else { - return SocketState.LONG; - } - } - - @Override protected void registerForEvent(boolean read, boolean write) { final NioChannel socket = socketWrapper.getSocket(); @@ -250,27 +178,6 @@ protected void setSocketTimeout(int timeout) throws IOException { } - @Override - protected void setCometTimeouts(SocketWrapper socketWrapper) { - // Comet support - SelectionKey key = socketWrapper.getSocket().getIOChannel().keyFor( - socketWrapper.getSocket().getPoller().getSelector()); - if (key != null) { - NioEndpoint.KeyAttachment attach = (NioEndpoint.KeyAttachment) key.attachment(); - if (attach != null) { - attach.setComet(comet); - if (comet) { - Integer comettimeout = (Integer) request.getAttribute( - org.apache.coyote.Constants.COMET_TIMEOUT_ATTR); - if (comettimeout != null) { - attach.setTimeout(comettimeout.longValue()); - } - } - } - } - } - - @Override protected boolean breakKeepAliveLoop(SocketWrapper socketWrapper) { openSocket = keepAlive; @@ -472,43 +379,6 @@ public void actionInternal(ActionCode actionCode, Object param) { } break; } - case COMET_BEGIN: { - comet = true; - break; - } - case COMET_END: { - comet = false; - break; - } - case COMET_CLOSE: { - if (socketWrapper==null || socketWrapper.getSocket().getAttachment(false)==null) { - return; - } - RequestInfo rp = request.getRequestProcessor(); - if (rp.getStage() != org.apache.coyote.Constants.STAGE_SERVICE) { - // Close event for this processor triggered by request - // processing in another processor, a non-Tomcat thread (i.e. - // an application controlled thread) or similar. - socketWrapper.getSocket().getPoller().add(socketWrapper.getSocket()); - } - break; - } - case COMET_SETTIMEOUT: { - if (param==null) { - return; - } - if (socketWrapper==null || socketWrapper.getSocket().getAttachment(false)==null) { - return; - } - NioEndpoint.KeyAttachment attach = (NioEndpoint.KeyAttachment)socketWrapper.getSocket().getAttachment(false); - long timeout = ((Long)param).longValue(); - //if we are not piggy backing on a worker thread, set the timeout - RequestInfo rp = request.getRequestProcessor(); - if ( rp.getStage() != org.apache.coyote.Constants.STAGE_SERVICE ) { - attach.setTimeout(timeout); - } - break; - } } } diff --git a/java/org/apache/coyote/http11/Http11NioProtocol.java b/java/org/apache/coyote/http11/Http11NioProtocol.java index 0d421a3f770f..791a0be4d607 100644 --- a/java/org/apache/coyote/http11/Http11NioProtocol.java +++ b/java/org/apache/coyote/http11/Http11NioProtocol.java @@ -269,7 +269,6 @@ protected void longPoll(SocketWrapper socket, socket.setAsync(true); } else { // Either: - // - this is comet request // - this is an upgraded connection // - the request line/headers have not been completely // read diff --git a/java/org/apache/coyote/http11/Http11Processor.java b/java/org/apache/coyote/http11/Http11Processor.java index 98f8dbad163e..6d56db138d8a 100644 --- a/java/org/apache/coyote/http11/Http11Processor.java +++ b/java/org/apache/coyote/http11/Http11Processor.java @@ -25,10 +25,8 @@ import org.apache.coyote.http11.filters.BufferedInputFilter; import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; -import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState; import org.apache.tomcat.util.net.JIoEndpoint; import org.apache.tomcat.util.net.SSLSupport; -import org.apache.tomcat.util.net.SocketStatus; import org.apache.tomcat.util.net.SocketWrapper; @@ -178,12 +176,6 @@ protected void setSocketTimeout(int timeout) throws IOException { } - @Override - protected void setCometTimeouts(SocketWrapper socketWrapper) { - // NO-OP for BIO - } - - @Override protected boolean breakKeepAliveLoop(SocketWrapper socketWrapper) { openSocket = keepAlive; @@ -216,16 +208,8 @@ protected void recycleInternal() { } - @Override - public SocketState event(SocketStatus status) throws IOException { - // Should never reach this code but in case we do... - throw new IOException( - sm.getString("http11processor.comet.notsupported")); - } - // ----------------------------------------------------- ActionHook Methods - /** * Send an action to the connector. * diff --git a/java/org/apache/coyote/http11/LocalStrings.properties b/java/org/apache/coyote/http11/LocalStrings.properties index e55ce1a19961..a3c7c63d6a7b 100644 --- a/java/org/apache/coyote/http11/LocalStrings.properties +++ b/java/org/apache/coyote/http11/LocalStrings.properties @@ -23,7 +23,6 @@ http11processor.response.finish=Error finishing response http11processor.socket.info=Exception getting socket information http11processor.socket.ssl=Exception getting SSL attributes http11processor.socket.sslreneg=Exception re-negotiating SSL connection -http11processor.comet.notsupported=The Comet protocol is not supported by this connector http11processor.sendfile.error=Error sending data using sendfile. May be caused by invalid request attributes for start/end points http11Processor.upgrade=An internal error has occurred as upgraded connections should only be processed by the dedicated upgrade processor implementations diff --git a/java/org/apache/coyote/http11/upgrade/AbstractProcessor.java b/java/org/apache/coyote/http11/upgrade/AbstractProcessor.java index 46f20ac0f6a8..68cf01531c6a 100644 --- a/java/org/apache/coyote/http11/upgrade/AbstractProcessor.java +++ b/java/org/apache/coyote/http11/upgrade/AbstractProcessor.java @@ -140,11 +140,6 @@ public final SocketState process(SocketWrapper socketWrapper) return null; } - @Override - public final SocketState event(SocketStatus status) throws IOException { - return null; - } - @Override public final SocketState asyncDispatch(SocketStatus status) { return null; @@ -160,11 +155,6 @@ public final SocketState asyncPostProcess() { return null; } - @Override - public final boolean isComet() { - return false; - } - @Override public final boolean isAsync() { return false; diff --git a/java/org/apache/coyote/spdy/SpdyProcessor.java b/java/org/apache/coyote/spdy/SpdyProcessor.java index 618e41e7ee18..f35de64c37f3 100644 --- a/java/org/apache/coyote/spdy/SpdyProcessor.java +++ b/java/org/apache/coyote/spdy/SpdyProcessor.java @@ -506,23 +506,12 @@ private void sendResponseHead() { outCommit = true; } - @Override - public boolean isComet() { - return false; - } - @Override public SocketState process(SocketWrapper socket) throws IOException { throw new IOException("Unimplemented"); } - @Override - public SocketState event(SocketStatus status) throws IOException { - System.err.println("EVENT: " + status); - return null; - } - @Override public SocketState asyncDispatch(SocketStatus status) { System.err.println("ASYNC DISPATCH: " + status); diff --git a/java/org/apache/tomcat/util/net/AbstractEndpoint.java b/java/org/apache/tomcat/util/net/AbstractEndpoint.java index 31ce4f08d197..063bbb02f938 100644 --- a/java/org/apache/tomcat/util/net/AbstractEndpoint.java +++ b/java/org/apache/tomcat/util/net/AbstractEndpoint.java @@ -821,8 +821,6 @@ private String adjustRelativePath(String path, String relativeTo) { // Some of these are always hard-coded, some are hard-coded to false (i.e. // the endpoint does not support them) and some are configurable. public abstract boolean getUseSendfile(); - public abstract boolean getUseComet(); - public abstract boolean getUseCometTimeout(); public abstract boolean getUsePolling(); protected LimitLatch initializeConnectionLatch() { diff --git a/java/org/apache/tomcat/util/net/AprEndpoint.java b/java/org/apache/tomcat/util/net/AprEndpoint.java index b5d9b0409bc6..a4275701b8af 100644 --- a/java/org/apache/tomcat/util/net/AprEndpoint.java +++ b/java/org/apache/tomcat/util/net/AprEndpoint.java @@ -159,15 +159,6 @@ public void setUseSendfile(boolean useSendfile) { public boolean getUseSendfile() { return useSendfile; } - /** - * Allow comet request handling. - */ - protected boolean useComet = true; - public void setUseComet(boolean useComet) { this.useComet = useComet; } - @Override - public boolean getUseComet() { return useComet; } - @Override - public boolean getUseCometTimeout() { return false; } // Not supported @Override public boolean getUsePolling() { return true; } // Always supported @@ -857,8 +848,7 @@ protected boolean processSocketWithOptions(long socket) { /** - * Process given socket. Called in non-comet mode, typically keep alive - * or upgraded protocol. + * Process given socket. Typically keep alive or upgraded protocol. */ public boolean processSocket(long socket, SocketStatus status) { try { @@ -1405,14 +1395,9 @@ protected void destroy() { // Close all sockets in the add queue SocketInfo info = addList.get(); while (info != null) { - boolean comet = - connections.get(Long.valueOf(info.socket)).isComet(); - if (!comet || (comet && !processSocket( - info.socket, SocketStatus.STOP))) { - // Poller isn't running at this point so use destroySocket() - // directly - destroySocket(info.socket); - } + // Poller isn't running at this point so use destroySocket() + // directly + destroySocket(info.socket); info = addList.get(); } addList.clear(); @@ -1421,12 +1406,7 @@ protected void destroy() { int rv = Poll.pollset(pollers[i], desc); if (rv > 0) { for (int n = 0; n < rv; n++) { - boolean comet = connections.get( - Long.valueOf(desc[n*2+1])).isComet(); - if (!comet || (comet && !processSocket( - desc[n*2+1], SocketStatus.STOP))) { - destroySocket(desc[n*2+1]); - } + destroySocket(desc[n*2+1]); } } } @@ -1483,12 +1463,7 @@ private void add(long socket, int timeout, int flags) { } if (!ok) { // Can't do anything: close the socket right away - boolean comet = connections.get( - Long.valueOf(socket)).isComet(); - if (!comet || (comet && !processSocket( - socket, SocketStatus.ERROR))) { - closeSocket(socket); - } + closeSocket(socket); } } @@ -1576,12 +1551,7 @@ private void maintain() { Long.valueOf(socket))); } removeFromPoller(socket); - boolean comet = connections.get( - Long.valueOf(socket)).isComet(); - if (!comet || (comet && !processSocket( - socket, SocketStatus.TIMEOUT))) { - destroySocket(socket); - } + destroySocket(socket); socket = timeouts.check(date); } @@ -1703,20 +1673,11 @@ public void run() { continue; } if (info.read() || info.write()) { - boolean comet = wrapper.isComet(); - if (comet || wrapper.pollerFlags != 0) { - removeFromPoller(info.socket); - } wrapper.pollerFlags = wrapper.pollerFlags | (info.read() ? Poll.APR_POLLIN : 0) | (info.write() ? Poll.APR_POLLOUT : 0); if (!addToPoller(info.socket, wrapper.pollerFlags)) { - // Can't do anything: close the socket right - // away - if (!comet || (comet && !processSocket( - info.socket, SocketStatus.ERROR))) { - closeSocket(info.socket); - } + closeSocket(info.socket); } else { timeouts.add(info.socket, System.currentTimeMillis() + @@ -1770,42 +1731,7 @@ public void run() { } wrapper.pollerFlags = wrapper.pollerFlags & ~((int) desc[n*2]); // Check for failed sockets and hand this socket off to a worker - if (wrapper.isComet()) { - // Event processes either a read or a write depending on what the poller returns - if (((desc[n*2] & Poll.APR_POLLHUP) == Poll.APR_POLLHUP) - || ((desc[n*2] & Poll.APR_POLLERR) == Poll.APR_POLLERR) - || ((desc[n*2] & Poll.APR_POLLNVAL) == Poll.APR_POLLNVAL)) { - if (!processSocket(desc[n*2+1], SocketStatus.ERROR)) { - // Close socket and clear pool - closeSocket(desc[n*2+1]); - } - } else if ((desc[n*2] & Poll.APR_POLLIN) == Poll.APR_POLLIN) { - if (wrapper.pollerFlags != 0) { - add(desc[n*2+1], 1, wrapper.pollerFlags); - } - if (!processSocket(desc[n*2+1], SocketStatus.OPEN_READ)) { - // Close socket and clear pool - closeSocket(desc[n*2+1]); - } - } else if ((desc[n*2] & Poll.APR_POLLOUT) == Poll.APR_POLLOUT) { - if (wrapper.pollerFlags != 0) { - add(desc[n*2+1], 1, wrapper.pollerFlags); - } - if (!processSocket(desc[n*2+1], SocketStatus.OPEN_WRITE)) { - // Close socket and clear pool - closeSocket(desc[n*2+1]); - } - } else { - // Unknown event - getLog().warn(sm.getString( - "endpoint.apr.pollUnknownEvent", - Long.valueOf(desc[n*2]))); - if (!processSocket(desc[n*2+1], SocketStatus.ERROR)) { - // Close socket and clear pool - closeSocket(desc[n*2+1]); - } - } - } else if (((desc[n*2] & Poll.APR_POLLHUP) == Poll.APR_POLLHUP) + if (((desc[n*2] & Poll.APR_POLLHUP) == Poll.APR_POLLHUP) || ((desc[n*2] & Poll.APR_POLLERR) == Poll.APR_POLLERR) || ((desc[n*2] & Poll.APR_POLLNVAL) == Poll.APR_POLLNVAL)) { if (wrapper.isAsync() || wrapper.isUpgraded()) { diff --git a/java/org/apache/tomcat/util/net/JIoEndpoint.java b/java/org/apache/tomcat/util/net/JIoEndpoint.java index 749af9672e4e..0b2526e0698d 100644 --- a/java/org/apache/tomcat/util/net/JIoEndpoint.java +++ b/java/org/apache/tomcat/util/net/JIoEndpoint.java @@ -118,10 +118,6 @@ public String[] getCiphersUsed() { @Override public boolean getUseSendfile() { return false; } // Not supported @Override - public boolean getUseComet() { return false; } // Not supported - @Override - public boolean getUseCometTimeout() { return false; } // Not supported - @Override public boolean getDeferAccept() { return false; } // Not supported @Override public boolean getUsePolling() { return false; } // Not supported diff --git a/java/org/apache/tomcat/util/net/Nio2Endpoint.java b/java/org/apache/tomcat/util/net/Nio2Endpoint.java index 0f9a02378e6a..9f742ff02e0d 100644 --- a/java/org/apache/tomcat/util/net/Nio2Endpoint.java +++ b/java/org/apache/tomcat/util/net/Nio2Endpoint.java @@ -151,15 +151,6 @@ public class Nio2Endpoint extends AbstractEndpoint { public Handler getHandler() { return handler; } - /** - * Allow comet request handling. - */ - private boolean useComet = true; - public void setUseComet(boolean useComet) { this.useComet = useComet; } - @Override - public boolean getUseComet() { return useComet; } - @Override - public boolean getUseCometTimeout() { return getUseComet(); } @Override public boolean getUsePolling() { return true; } // Always supported @@ -610,22 +601,11 @@ protected boolean processSocket0(SocketWrapper socketWrapper, Socke return true; } - public void closeSocket(SocketWrapper socket, SocketStatus status) { + public void closeSocket(SocketWrapper socket) { if (socket == null) { return; } try { - if (socket.isComet() && status != null) { - socket.setComet(false);//to avoid a loop - if (status == SocketStatus.TIMEOUT) { - if (processSocket0(socket, status, true)) { - return; // don't close on comet timeout - } - } else { - // Don't dispatch if the lines below are canceling the key - processSocket0(socket, status, false); - } - } handler.release(socket); try { if (socket.getSocket() != null) { @@ -1088,8 +1068,7 @@ private void doRun() { } if (state == SocketState.CLOSED) { // Close socket and pool - socket.setComet(false); - closeSocket(socket, SocketStatus.ERROR); + closeSocket(socket); if (useCaches && running && !paused) { nioChannels.push(socket.getSocket()); socketWrapperCache.push((Nio2SocketWrapper) socket); @@ -1100,7 +1079,7 @@ private void doRun() { launch = true; } } else if (handshake == -1 ) { - closeSocket(socket, SocketStatus.DISCONNECT); + closeSocket(socket); if (useCaches && running && !paused) { nioChannels.push(socket.getSocket()); socketWrapperCache.push(((Nio2SocketWrapper) socket)); @@ -1110,7 +1089,7 @@ private void doRun() { try { oomParachuteData = null; log.error("", oom); - closeSocket(socket, SocketStatus.ERROR); + closeSocket(socket); releaseCaches(); } catch (Throwable oomt) { try { @@ -1125,7 +1104,7 @@ private void doRun() { } catch (Throwable t) { log.error(sm.getString("endpoint.processing.fail"), t); if (socket != null) { - closeSocket(socket, SocketStatus.ERROR); + closeSocket(socket); } } finally { if (launch) { diff --git a/java/org/apache/tomcat/util/net/NioEndpoint.java b/java/org/apache/tomcat/util/net/NioEndpoint.java index 023019104883..bc4d2648f5bc 100644 --- a/java/org/apache/tomcat/util/net/NioEndpoint.java +++ b/java/org/apache/tomcat/util/net/NioEndpoint.java @@ -183,15 +183,6 @@ public boolean setProperty(String name, String value) { public Handler getHandler() { return handler; } - /** - * Allow comet request handling. - */ - private boolean useComet = true; - public void setUseComet(boolean useComet) { this.useComet = useComet; } - @Override - public boolean getUseComet() { return useComet; } - @Override - public boolean getUseCometTimeout() { return getUseComet(); } @Override public boolean getUsePolling() { return true; } // Always supported @@ -618,7 +609,6 @@ protected boolean processSocket(KeyAttachment attachment, SocketStatus status, b if (attachment == null) { return false; } - attachment.setCometNotify(false); //will get reset upon next reg SocketProcessor sc = processorCache.pop(); if ( sc == null ) sc = new SocketProcessor(attachment, status); else sc.reset(attachment, status); @@ -801,28 +791,22 @@ public void run() { final KeyAttachment att = (KeyAttachment) key.attachment(); if ( att!=null ) { //handle callback flag - if ((interestOps & OP_CALLBACK) == OP_CALLBACK ) { - att.setCometNotify(true); - } else { - att.setCometNotify(false); - } interestOps = (interestOps & (~OP_CALLBACK));//remove the callback flag att.access();//to prevent timeout //we are registering the key to start with, reset the fairness counter. int ops = key.interestOps() | interestOps; att.interestOps(ops); - if (att.getCometNotify()) key.interestOps(0); - else key.interestOps(ops); + key.interestOps(ops); } else { cancel = true; } } else { cancel = true; } - if ( cancel ) socket.getPoller().cancelledKey(key,SocketStatus.ERROR); + if ( cancel ) socket.getPoller().cancelledKey(key); }catch (CancelledKeyException ckx) { try { - socket.getPoller().cancelledKey(key,SocketStatus.DISCONNECT); + socket.getPoller().cancelledKey(key); }catch (Exception ignore) {} } }//end if @@ -950,21 +934,10 @@ public void register(final NioChannel socket) { addEvent(r); } - public void cancelledKey(SelectionKey key, SocketStatus status) { + public void cancelledKey(SelectionKey key) { try { if ( key == null ) return;//nothing to do KeyAttachment ka = (KeyAttachment) key.attachment(); - if (ka != null && ka.isComet() && status != null) { - ka.setComet(false);//to avoid a loop - if (status == SocketStatus.TIMEOUT ) { - if (processSocket(ka, status, true)) { - return; // don't close on comet timeout - } - } else { - // Don't dispatch if the lines below are canceling the key - processSocket(ka, status, false); - } - } key.attach(null); if (ka!=null) handler.release(ka); else handler.release((SocketChannel)key.channel()); @@ -1114,7 +1087,7 @@ protected boolean processKey(SelectionKey sk, KeyAttachment attachment) { boolean result = true; try { if ( close ) { - cancelledKey(sk, SocketStatus.STOP); + cancelledKey(sk); } else if ( sk.isValid() && attachment != null ) { attachment.access();//make sure we don't time out valid sockets if (sk.isReadable() || sk.isWritable() ) { @@ -1136,7 +1109,7 @@ protected boolean processKey(SelectionKey sk, KeyAttachment attachment) { } } if (closeSocket) { - cancelledKey(sk,SocketStatus.DISCONNECT); + cancelledKey(sk); } } else { result = false; @@ -1145,10 +1118,10 @@ protected boolean processKey(SelectionKey sk, KeyAttachment attachment) { } } else { //invalid key - cancelledKey(sk, SocketStatus.ERROR); + cancelledKey(sk); } } catch ( CancelledKeyException ckx ) { - cancelledKey(sk, SocketStatus.ERROR); + cancelledKey(sk); } catch (Throwable t) { ExceptionUtils.handleThrowable(t); log.error("",t); @@ -1170,7 +1143,7 @@ public boolean processSendfile(SelectionKey sk, KeyAttachment attachment, boolea if ( sd.fchannel == null ) { File f = new File(sd.fileName); if ( !f.exists() ) { - cancelledKey(sk,SocketStatus.ERROR); + cancelledKey(sk); return false; } @SuppressWarnings("resource") // Closed when channel is closed @@ -1226,7 +1199,7 @@ public boolean processSendfile(SelectionKey sk, KeyAttachment attachment, boolea if (log.isDebugEnabled()) { log.debug("Send file connection is being closed"); } - cancelledKey(sk,SocketStatus.STOP); + cancelledKey(sk); return false; } } else { @@ -1241,11 +1214,11 @@ public boolean processSendfile(SelectionKey sk, KeyAttachment attachment, boolea } }catch ( IOException x ) { if ( log.isDebugEnabled() ) log.debug("Unable to complete sendfile request:", x); - cancelledKey(sk,SocketStatus.ERROR); + cancelledKey(sk); return false; }catch ( Throwable t ) { log.error("",t); - cancelledKey(sk, SocketStatus.ERROR); + cancelledKey(sk); return false; }finally { if (sc!=null) sc.setSendFile(false); @@ -1284,15 +1257,9 @@ protected void timeout(int keyCount, boolean hasEvents) { try { KeyAttachment ka = (KeyAttachment) key.attachment(); if ( ka == null ) { - cancelledKey(key, SocketStatus.ERROR); //we don't support any keys without attachments + cancelledKey(key); //we don't support any keys without attachments } else if ( ka.getError() ) { - cancelledKey(key, SocketStatus.ERROR);//TODO this is not yet being used - } else if (ka.getCometNotify() ) { - ka.setCometNotify(false); - int ops = ka.interestOps() & ~OP_CALLBACK; - reg(key,ka,0);//avoid multiple calls, this gets re-registered after invocation - ka.interestOps(ops); - if (!processSocket(ka, SocketStatus.OPEN_READ, true)) processSocket(ka, SocketStatus.DISCONNECT, true); + cancelledKey(key);//TODO this is not yet being used } else if ((ka.interestOps()&SelectionKey.OP_READ) == SelectionKey.OP_READ || (ka.interestOps()&SelectionKey.OP_WRITE) == SelectionKey.OP_WRITE) { //only timeout sockets that we are waiting for a read from @@ -1306,9 +1273,9 @@ protected void timeout(int keyCount, boolean hasEvents) { } else if (isTimedout) { key.interestOps(0); ka.interestOps(0); //avoid duplicate timeout calls - cancelledKey(key, SocketStatus.TIMEOUT); + cancelledKey(key); } - } else if (ka.isAsync() || ka.isComet()) { + } else if (ka.isAsync()) { if (close) { key.interestOps(0); ka.interestOps(0); //avoid duplicate stop calls @@ -1326,7 +1293,7 @@ protected void timeout(int keyCount, boolean hasEvents) { } }//end if }catch ( CancelledKeyException ckx ) { - cancelledKey(key, SocketStatus.ERROR); + cancelledKey(key); } }//for long prevExp = nextExpiration; //for logging purposes only @@ -1352,7 +1319,6 @@ public KeyAttachment(NioChannel channel) { public void reset(Poller poller, NioChannel channel, long soTimeout) { super.reset(channel, soTimeout); - cometNotify = false; interestOps = 0; this.poller = poller; sendfileData = null; @@ -1384,8 +1350,6 @@ public void reset() { public Poller getPoller() { return poller;} public void setPoller(Poller poller){this.poller = poller;} - public void setCometNotify(boolean notify) { this.cometNotify = notify; } - public boolean getCometNotify() { return cometNotify; } public int interestOps() { return interestOps;} public int interestOps(int ops) { this.interestOps = ops; return ops; } public CountDownLatch getReadLatch() { return readLatch; } @@ -1426,7 +1390,6 @@ public void setWriteTimeout(long writeTimeout) { private Poller poller = null; private int interestOps = 0; - private boolean cometNotify = false; private CountDownLatch readLatch = null; private CountDownLatch writeLatch = null; private SendfileData sendfileData = null; @@ -1558,8 +1521,7 @@ private void doRun(SelectionKey key, KeyAttachment ka) { if (state == SocketState.CLOSED) { // Close socket and pool try { - ka.setComet(false); - socket.getPoller().cancelledKey(key, SocketStatus.ERROR); + socket.getPoller().cancelledKey(key); if (running && !paused) { nioChannels.push(socket); } @@ -1577,7 +1539,7 @@ private void doRun(SelectionKey key, KeyAttachment ka) { } } else if (handshake == -1 ) { if (key != null) { - socket.getPoller().cancelledKey(key, SocketStatus.DISCONNECT); + socket.getPoller().cancelledKey(key); } if (running && !paused) { nioChannels.push(socket); @@ -1592,14 +1554,14 @@ private void doRun(SelectionKey key, KeyAttachment ka) { } } catch (CancelledKeyException cx) { if (socket != null) { - socket.getPoller().cancelledKey(key, null); + socket.getPoller().cancelledKey(key); } } catch (OutOfMemoryError oom) { try { oomParachuteData = null; log.error("", oom); if (socket != null) { - socket.getPoller().cancelledKey(key,SocketStatus.ERROR); + socket.getPoller().cancelledKey(key); } releaseCaches(); } catch (Throwable oomt) { @@ -1615,7 +1577,7 @@ private void doRun(SelectionKey key, KeyAttachment ka) { } catch (Throwable t) { log.error("", t); if (socket != null) { - socket.getPoller().cancelledKey(key,SocketStatus.ERROR); + socket.getPoller().cancelledKey(key); } } finally { socket = null; diff --git a/java/org/apache/tomcat/util/net/SecureNio2Channel.java b/java/org/apache/tomcat/util/net/SecureNio2Channel.java index ba16492244c2..ec51f75ec8ac 100644 --- a/java/org/apache/tomcat/util/net/SecureNio2Channel.java +++ b/java/org/apache/tomcat/util/net/SecureNio2Channel.java @@ -84,7 +84,7 @@ public void completed(Integer result, SocketWrapper attachment) { } @Override public void failed(Throwable exc, SocketWrapper attachment) { - endpoint.closeSocket(attachment, SocketStatus.ERROR); + endpoint.closeSocket(attachment); } }; handshakeWriteCompletionHandler = new CompletionHandler>() { @@ -98,7 +98,7 @@ public void completed(Integer result, SocketWrapper attachment) { } @Override public void failed(Throwable exc, SocketWrapper attachment) { - endpoint.closeSocket(attachment, SocketStatus.ERROR); + endpoint.closeSocket(attachment); } }; } diff --git a/java/org/apache/tomcat/util/net/SocketWrapper.java b/java/org/apache/tomcat/util/net/SocketWrapper.java index 5cd540df6fe7..9ebf87c0d29f 100644 --- a/java/org/apache/tomcat/util/net/SocketWrapper.java +++ b/java/org/apache/tomcat/util/net/SocketWrapper.java @@ -31,7 +31,6 @@ public class SocketWrapper { private long timeout = -1; private boolean error = false; private volatile int keepAliveLeft = 100; - private volatile boolean comet = false; private volatile boolean async = false; private boolean keptAlive = false; private volatile boolean upgraded = false; @@ -76,8 +75,6 @@ public E getSocket() { return socket; } - public boolean isComet() { return comet; } - public void setComet(boolean comet) { this.comet = comet; } public boolean isAsync() { return async; } public void setAsync(boolean async) { this.async = async; } public boolean isUpgraded() { return upgraded; } @@ -155,7 +152,6 @@ public void clearDispatches() { public void reset(E socket, long timeout) { async = false; blockingStatus = true; - comet = false; dispatches.clear(); error = false; keepAliveLeft = 100; diff --git a/test/org/apache/catalina/comet/TestCometProcessor.java b/test/org/apache/catalina/comet/TestCometProcessor.java deleted file mode 100644 index 86ce56fa9a21..000000000000 --- a/test/org/apache/catalina/comet/TestCometProcessor.java +++ /dev/null @@ -1,669 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.catalina.comet; - -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.net.Socket; - -import javax.net.SocketFactory; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - -import org.junit.Assert; -import org.junit.Assume; -import org.junit.Test; - -import org.apache.catalina.Context; -import org.apache.catalina.Wrapper; -import org.apache.catalina.comet.CometEvent.EventType; -import org.apache.catalina.connector.CometEventImpl; -import org.apache.catalina.connector.Request; -import org.apache.catalina.connector.Response; -import org.apache.catalina.startup.Tomcat; -import org.apache.catalina.startup.TomcatBaseTest; -import org.apache.catalina.valves.TesterAccessLogValve; -import org.apache.catalina.valves.ValveBase; - -public class TestCometProcessor extends TomcatBaseTest { - - @Test - public void testAsyncClose() throws Exception { - Assume.assumeTrue( - "This test is skipped, because this connector does not support Comet.", - isCometSupported()); - - // Setup Tomcat instance - Tomcat tomcat = getTomcatInstance(); - Context root = tomcat.addContext("", TEMP_DIR); - Tomcat.addServlet(root, "comet", new SimpleCometServlet()); - root.addServletMapping("/comet", "comet"); - Tomcat.addServlet(root, "hello", new HelloWorldServlet()); - root.addServletMapping("/hello", "hello"); - root.getPipeline().addValve(new AsyncCometCloseValve()); - tomcat.getConnector().setProperty("connectionTimeout", "5000"); - tomcat.start(); - - // Create connection to Comet servlet - final Socket socket = - SocketFactory.getDefault().createSocket("localhost", getPort()); - socket.setSoTimeout(5000); - - final OutputStream os = socket.getOutputStream(); - String requestLine = "POST http://localhost:" + getPort() + - "/comet HTTP/1.1\r\n"; - os.write(requestLine.getBytes()); - os.write("transfer-encoding: chunked\r\n".getBytes()); - os.write("\r\n".getBytes()); - - InputStream is = socket.getInputStream(); - ResponseReaderThread readThread = new ResponseReaderThread(is); - readThread.start(); - - // Wait for the comet request/response to finish - int count = 0; - while (count < 10 && !readThread.getResponse().endsWith("0\r\n\r\n")) { - Thread.sleep(500); - count++; - } - - if (count == 10) { - fail("Comet request did not complete"); - } - - // Send a standard HTTP request on the same connection - requestLine = "GET http://localhost:" + getPort() + - "/hello HTTP/1.1\r\n"; - os.write(requestLine.getBytes()); - os.write("\r\n".getBytes()); - - // Check for the expected response - count = 0; - while (count < 10 && !readThread.getResponse().contains( - HelloWorldServlet.RESPONSE_TEXT)) { - Thread.sleep(500); - count++; - } - - if (count == 10) { - fail("Non-comet request did not complete"); - } - - readThread.join(); - os.close(); - is.close(); - } - - @Test - public void testSyncClose() throws Exception { - Assume.assumeTrue( - "This test is skipped, because this connector does not support Comet.", - isCometSupported()); - - // Setup Tomcat instance - Tomcat tomcat = getTomcatInstance(); - Context root = tomcat.addContext("", TEMP_DIR); - Tomcat.addServlet(root, "comet", new CometCloseServlet()); - root.addServletMapping("/comet", "comet"); - Tomcat.addServlet(root, "hello", new HelloWorldServlet()); - root.addServletMapping("/hello", "hello"); - tomcat.getConnector().setProperty("connectionTimeout", "5000"); - tomcat.start(); - - // Create connection to Comet servlet - final Socket socket = - SocketFactory.getDefault().createSocket("localhost", getPort()); - socket.setSoTimeout(5000); - - final OutputStream os = socket.getOutputStream(); - String requestLine = "POST http://localhost:" + getPort() + - "/comet HTTP/1.1\r\n"; - os.write(requestLine.getBytes()); - os.write("transfer-encoding: chunked\r\n".getBytes()); - os.write("\r\n".getBytes()); - // Don't send any data - os.write("0\r\n\r\n".getBytes()); - - InputStream is = socket.getInputStream(); - ResponseReaderThread readThread = new ResponseReaderThread(is); - readThread.start(); - - // Wait for the comet request/response to finish - int count = 0; - while (count < 10 && !readThread.getResponse().endsWith("0\r\n\r\n")) { - Thread.sleep(500); - count++; - } - - Assert.assertTrue(readThread.getResponse().contains("2\r\nOK")); - - if (count == 10) { - fail("Comet request did not complete"); - } - - // Send a standard HTTP request on the same connection - requestLine = "GET http://localhost:" + getPort() + - "/hello HTTP/1.1\r\n"; - os.write(requestLine.getBytes()); - os.write("connection: close\r\n".getBytes()); - os.write("\r\n".getBytes()); - - // Check for the expected response - count = 0; - while (count < 10 && !readThread.getResponse().contains( - HelloWorldServlet.RESPONSE_TEXT)) { - Thread.sleep(500); - count++; - } - - if (count == 10) { - fail("Non-comet request did not complete"); - } - - readThread.join(); - os.close(); - is.close(); - } - - @Test - public void testConnectionClose() throws Exception { - Assume.assumeTrue( - "This test is skipped, because this connector does not support Comet.", - isCometSupported()); - - // Setup Tomcat instance - Tomcat tomcat = getTomcatInstance(); - Context root = tomcat.addContext("", TEMP_DIR); - Tomcat.addServlet(root, "comet", new ConnectionCloseServlet()); - root.addServletMapping("/comet", "comet"); - Tomcat.addServlet(root, "hello", new HelloWorldServlet()); - root.addServletMapping("/hello", "hello"); - tomcat.getConnector().setProperty("connectionTimeout", "5000"); - tomcat.start(); - - // Create connection to Comet servlet - final Socket socket = - SocketFactory.getDefault().createSocket("localhost", getPort()); - socket.setSoTimeout(5000); - - final OutputStream os = socket.getOutputStream(); - String requestLine = "POST http://localhost:" + getPort() + - "/comet HTTP/1.1\r\n"; - os.write(requestLine.getBytes()); - os.write("transfer-encoding: chunked\r\n".getBytes()); - os.write("\r\n".getBytes()); - // Don't send any data - os.write("0\r\n\r\n".getBytes()); - - InputStream is = socket.getInputStream(); - ResponseReaderThread readThread = new ResponseReaderThread(is); - readThread.start(); - - // Wait for the comet request/response to finish - int count = 0; - while (count < 10 && !readThread.getResponse().endsWith("OK")) { - Thread.sleep(500); - count++; - } - - if (count == 10) { - fail("Comet request did not complete"); - } - - // Read thread should have terminated cleanly when the server closed the - // socket - Assert.assertFalse(readThread.isAlive()); - Assert.assertNull(readThread.getException()); - - os.close(); - is.close(); - } - - @Test - public void testSimpleCometClient() throws Exception { - doSimpleCometTest(null); - } - - @Test - public void testSimpleCometClientBeginFail() throws Exception { - doSimpleCometTest(SimpleCometServlet.FAIL_ON_BEGIN); - } - - @Test - public void testSimpleCometClientReadFail() throws Exception { - doSimpleCometTest(SimpleCometServlet.FAIL_ON_READ); - } - - @Test - public void testSimpleCometClientEndFail() throws Exception { - doSimpleCometTest(SimpleCometServlet.FAIL_ON_END); - } - - private void doSimpleCometTest(String initParam) throws Exception { - Assume.assumeTrue( - "This test is skipped, because this connector does not support Comet.", - isCometSupported()); - - // Setup Tomcat instance - Tomcat tomcat = getTomcatInstance(); - Context root = tomcat.addContext("", TEMP_DIR); - Wrapper w = Tomcat.addServlet(root, "comet", new SimpleCometServlet()); - if (initParam != null) { - w.addInitParameter(initParam, "true"); - } - root.addServletMapping("/", "comet"); - - TesterAccessLogValve alv = new TesterAccessLogValve(); - root.getPipeline().addValve(alv); - - tomcat.start(); - - // Create connection to Comet servlet - final Socket socket = - SocketFactory.getDefault().createSocket("localhost", getPort()); - socket.setSoTimeout(60000); - - final OutputStream os = socket.getOutputStream(); - String requestLine = "POST http://localhost:" + getPort() + - "/ HTTP/1.1\r\n"; - os.write(requestLine.getBytes()); - os.write("transfer-encoding: chunked\r\n".getBytes()); - os.write("\r\n".getBytes()); - - PingWriterThread writeThread = new PingWriterThread(4, os); - writeThread.start(); - - socket.setSoTimeout(25000); - InputStream is = socket.getInputStream(); - ResponseReaderThread readThread = new ResponseReaderThread(is); - readThread.start(); - readThread.join(); - os.close(); - is.close(); - - String[] response = readThread.getResponse().split("\r\n"); - if (initParam == null) { - // Normal response expected - // Validate response - assertEquals("HTTP/1.1 200 OK", response[0]); - assertEquals("Server: Apache-Coyote/1.1", response[1]); - assertTrue(response[2].startsWith("Set-Cookie: JSESSIONID=")); - assertEquals("Content-Type: text/plain;charset=ISO-8859-1", response[3]); - assertEquals("Transfer-Encoding: chunked", response[4]); - assertTrue(response[5].startsWith("Date: ")); - assertEquals("", response[6]); - assertEquals("7", response[7]); - assertEquals("BEGIN", response[8]); - assertEquals("", response[9]); - assertEquals("17", response[10]); - assertEquals("Client: READ: 4 bytes", response[11]); - assertEquals("", response[12]); - assertEquals("17", response[13]); - assertEquals("Client: READ: 4 bytes", response[14]); - assertEquals("", response[15]); - assertEquals("17", response[16]); - assertEquals("Client: READ: 4 bytes", response[17]); - assertEquals("", response[18]); - assertEquals("17", response[19]); - assertEquals("Client: READ: 4 bytes", response[20]); - assertEquals("", response[21]); - assertEquals("d", response[22]); - assertEquals("Client: END", response[23]); - assertEquals("", response[24]); - assertEquals("0", response[25]); - // Expect 26 lines - assertEquals(26, response.length); - } else { - // Failure expected only expected for the fail on begin - // Failure at any later stage and the response headers (including - // the 200 response code will already have been sent to the client - if (SimpleCometServlet.FAIL_ON_BEGIN.equals(initParam)) { - assertEquals("500", getStatusCode(response[0])); - alv.validateAccessLog(1, 500, 0, 1000); - } else { - assertEquals("HTTP/1.1 200 OK", response[0]); - alv.validateAccessLog(1, 200, 0, 5000); - } - - } - } - - /* - * Tests if the Comet connection is closed if the Tomcat connector is - * stopped. - */ - @Test - public void testCometConnectorStop() throws Exception { - Assume.assumeTrue( - "This test is skipped, because this connector does not support Comet.", - isCometSupported()); - - // Setup Tomcat instance - SimpleCometServlet servlet = new SimpleCometServlet(); - Tomcat tomcat = getTomcatInstance(); - Context root = tomcat.addContext("", TEMP_DIR); - Tomcat.addServlet(root, "comet", servlet); - root.addServletMapping("/", "comet"); - tomcat.start(); - - // Create connection to Comet servlet - final Socket socket = - SocketFactory.getDefault().createSocket("localhost", getPort()); - socket.setSoTimeout(10000); - - final OutputStream os = socket.getOutputStream(); - String requestLine = "POST http://localhost:" + getPort() + - "/ HTTP/1.1\r\n"; - os.write(requestLine.getBytes()); - os.write("transfer-encoding: chunked\r\n".getBytes()); - os.write("\r\n".getBytes()); - - PingWriterThread writeThread = new PingWriterThread(100, os); - writeThread.start(); - - InputStream is = socket.getInputStream(); - ResponseReaderThread readThread = new ResponseReaderThread(is); - readThread.start(); - - // Allow the first couple of PING messages to be written - Thread.sleep(3000); - - tomcat.getConnector().stop(); - - // Wait for the read and write threads to stop - readThread.join(5000); - writeThread.join(5000); - - // Destroy the connector once the executor has sent the end event - tomcat.getConnector().destroy(); - - String[] response = readThread.getResponse().split("\r\n"); - String lastMessage = ""; - String lastResponseLine = ""; - for (int i = response.length; --i >= 0;) { - lastMessage = response[i]; - if (lastMessage.startsWith("Client:")) { - break; - } - } - for (int i = response.length; --i >= 0;) { - lastResponseLine = response[i]; - if (lastResponseLine.length() > 0) { - break; - } - } - StringBuilder status = new StringBuilder(); - // Expected, but is not 100% reliable: - // WriteThread exception: java.net.SocketException - // ReaderThread exception: null - // Last message: [Client: END] - // Last response line: [0] (empty chunk) - // Last comet event: [END] - // END event occurred: [true] - status.append("Status:"); - status.append("\nWriterThread exception: " + writeThread.getException()); - status.append("\nReaderThread exception: " + readThread.getException()); - status.append("\nLast message: [" + lastMessage + "]"); - status.append("\nLast response line: [" + lastResponseLine + "]"); - status.append("\nLast comet event: [" + servlet.getLastEvent() + "]"); - status.append("\nEND event occurred: [" + servlet.getEndEventOccurred() + "]"); - if (writeThread.getException() == null - || !lastMessage.contains("Client: END") - || !EventType.END.equals(servlet.getLastEvent())) { - log.error(status); - } else { - log.info(status); - } - assertTrue("Comet END event not received", - EventType.END.equals(servlet.getLastEvent())); - } - - private boolean isCometSupported() { - String protocol = - getTomcatInstance().getConnector().getProtocolHandlerClassName(); - return (protocol.contains("Nio") || protocol.contains("Apr")); - } - - private static class SimpleCometServlet extends HttpServlet - implements CometProcessor { - - private static final long serialVersionUID = 1L; - - public static final String FAIL_ON_BEGIN = "failOnBegin"; - public static final String FAIL_ON_READ = "failOnRead"; - public static final String FAIL_ON_END = "failOnEnd"; - - private boolean failOnBegin = false; - private boolean failOnRead = false; - private boolean failOnEnd = false; - - private volatile EventType lastEvent; - - private volatile boolean endEventOccurred = false; - - public EventType getLastEvent() { - return lastEvent; - } - - public boolean getEndEventOccurred() { - return endEventOccurred; - } - - @Override - public void init() throws ServletException { - failOnBegin = Boolean.valueOf(getServletConfig().getInitParameter( - FAIL_ON_BEGIN)).booleanValue(); - failOnRead = Boolean.valueOf(getServletConfig().getInitParameter( - FAIL_ON_READ)).booleanValue(); - failOnEnd = Boolean.valueOf(getServletConfig().getInitParameter( - FAIL_ON_END)).booleanValue(); - } - - - @Override - public void event(CometEvent event) throws IOException, - ServletException { - - HttpServletRequest request = event.getHttpServletRequest(); - HttpServletResponse response = event.getHttpServletResponse(); - - HttpSession session = request.getSession(true); - session.setMaxInactiveInterval(30); - - lastEvent = event.getEventType(); - - if (event.getEventType() == EventType.BEGIN) { - if (failOnBegin) { - throw new IOException("Fail on begin"); - } - response.setContentType("text/plain"); - response.getWriter().print("BEGIN" + "\r\n"); - } else if (event.getEventType() == EventType.READ) { - if (failOnRead) { - throw new IOException("Fail on read"); - } - InputStream is = request.getInputStream(); - int count = 0; - while (is.available() > 0) { - is.read(); - count ++; - } - String msg = "READ: " + count + " bytes"; - response.getWriter().print("Client: " + msg + "\r\n"); - } else if (event.getEventType() == EventType.END) { - endEventOccurred = true; - if (failOnEnd) { - throw new IOException("Fail on end"); - } - String msg = "END"; - response.getWriter().print("Client: " + msg + "\r\n"); - event.close(); - } else { - response.getWriter().print(event.getEventSubType() + "\r\n"); - event.close(); - } - response.getWriter().flush(); - } - } - - private static class CometCloseServlet extends HttpServlet - implements CometProcessor { - - private static final long serialVersionUID = 1L; - - @Override - public void event(CometEvent event) throws IOException, - ServletException { - HttpServletResponse response = event.getHttpServletResponse(); - response.setContentType("text/plain"); - // Force a chunked response since that is what the test client - // expects - response.flushBuffer(); - response.getWriter().print("OK"); - event.close(); - } - - } - - private static class ConnectionCloseServlet extends HttpServlet - implements CometProcessor { - - private static final long serialVersionUID = 1L; - - @Override - public void event(CometEvent event) throws IOException, - ServletException { - HttpServletResponse response = event.getHttpServletResponse(); - response.setContentType("text/plain"); - // Disable keep-alive - response.setHeader("Connection", "close"); - response.flushBuffer(); - response.getWriter().print("OK"); - event.close(); - } - } - - private static class PingWriterThread extends Thread { - - private final int pingCount; - private final OutputStream os; - private volatile Exception e = null; - - public PingWriterThread(int pingCount, OutputStream os) { - this.pingCount = pingCount; - this.os = os; - } - - public Exception getException() { - return e; - } - - @Override - public void run() { - try { - for (int i = 0; i < pingCount; i++) { - os.write("4\r\n".getBytes()); - os.write("PING\r\n".getBytes()); - os.flush(); - Thread.sleep(1000); - } - os.write("0\r\n".getBytes()); - os.write("\r\n".getBytes()); - } catch (Exception e) { - this.e = e; - } - } - } - - private static class ResponseReaderThread extends Thread { - - private final InputStream is; - private StringBuilder response = new StringBuilder(); - - private volatile Exception e = null; - - public ResponseReaderThread(InputStream is) { - this.is = is; - } - - public Exception getException() { - return e; - } - - public String getResponse() { - return response.toString(); - } - - @Override - public void run() { - try { - int c = is.read(); - while (c > -1) { - response.append((char) c); - c = is.read(); - } - } catch (Exception e) { - this.e = e; - } - } - } - - private static class AsyncCometCloseValve extends ValveBase { - - @Override - public void invoke(Request request, Response response) - throws IOException, ServletException { - - CometEventImpl event = new CometEventImpl(request, response); - - getNext().invoke(request, response); - - if (request.isComet()) { - Thread t = new AsyncCometCloseThread(event); - t.start(); - } - } - } - - private static class AsyncCometCloseThread extends Thread { - - private final CometEvent event; - - public AsyncCometCloseThread(CometEvent event) { - this.event = event; - } - - @Override - public void run() { - try { - Thread.sleep(2000); - event.close(); - } catch (Exception e) { - // Test should fail. Report what went wrong. - e.printStackTrace(); - } - } - } -} diff --git a/webapps/docs/aio.xml b/webapps/docs/aio.xml index 26aa47c5dda8..9154746e3a07 100644 --- a/webapps/docs/aio.xml +++ b/webapps/docs/aio.xml @@ -49,271 +49,6 @@ -
    - -

    - Comet support allows a servlet to process IO asynchronously, receiving - events when data is available for reading on the connection (rather than - always using a blocking read), and writing data back on connections - asynchronously (most likely responding to some event raised from some - other source). -

    - - - -

    - Servlets which implement the org.apache.catalina.comet.CometProcessor - interface will have their event method invoked rather than the usual service - method, according to the event which occurred. The event object gives - access to the usual request and response objects, which may be used in the - usual way. The main difference is that those objects remain valid and fully - functional at any time between processing of the BEGIN event until processing - an END or ERROR event. - The following event types exist: -

    - -
      -
    • EventType.BEGIN: will be called at the beginning - of the processing of the connection. It can be used to initialize any relevant - fields using the request and response objects. Between the end of the processing - of this event, and the beginning of the processing of the end or error events, - it is possible to use the response object to write data on the open connection. - Note that the response object and dependent OutputStream and Writer are still - not synchronized, so when they are accessed by multiple threads, - synchronization is mandatory. After processing the initial event, the request - is considered to be committed.
      • -
    • EventType.READ: This indicates that input data is available, and that one read can be made - without blocking. The available and ready methods of the InputStream or - Reader may be used to determine if there is a risk of blocking: the servlet - should read while data is reported available. When encountering a read error, - the servlet should report it by propagating the exception properly. Throwing - an exception will cause the error event to be invoked, and the connection - will be closed. - Alternately, it is also possible to catch any exception, perform clean up - on any data structure the servlet may be using, and using the close method - of the event. It is not allowed to attempt reading data from the request - object outside of the execution of this method.
      - On some platforms, like Windows, a client disconnect is indicated by a READ event. - Reading from the stream may result in -1, an IOException or an EOFException. - Make sure you properly handle all these three cases. - If you don't catch the IOException, Tomcat will instantly invoke your event chain with an ERROR as - it catches the error for you, and you will be notified of the error at that time. -
      • -
    • EventType.END: End may be called to end the processing of the request. Fields that have - been initialized in the begin method should be reset. After this event has - been processed, the request and response objects, as well as all their dependent - objects will be recycled and used to process other requests. End will also be - called when data is available and the end of file is reached on the request input - (this usually indicates the client has pipelined a request).
      • -
    • EventType.ERROR: Error will be called by the container in the case where an IO exception - or a similar unrecoverable error occurs on the connection. Fields that have - been initialized in the begin method should be reset. After this event has - been processed, the request and response objects, as well as all their dependent - objects will be recycled and used to process other requests.
      • -
    - -

    - There are some event subtypes which allow finer processing of events (note: some of these - events require usage of the org.apache.catalina.valves.CometConnectionManagerValve valve): -

    - -
      -
    • EventSubType.TIMEOUT: The connection timed out (sub type of ERROR); note that this ERROR - type is not fatal, and the connection will not be closed unless the servlet uses the close - method of the event. -
      • -
    • EventSubType.CLIENT_DISCONNECT: The client connection was closed (sub type of ERROR). -
      • -
    • EventSubType.IOEXCEPTION: An IO exception occurred, such as invalid content, for example, - an invalid chunk block (sub type of ERROR). -
      • -
    • EventSubType.WEBAPP_RELOAD: The web application is being reloaded (sub type of END). -
      • -
    • EventSubType.SESSION_END: The servlet ended the session (sub type of END). -
      • -
    - -

    - As described above, the typical lifecycle of a Comet request will consist in a series of - events such as: BEGIN -> READ -> READ -> READ -> ERROR/TIMEOUT. At any time, the servlet - may end processing of the request by using the close method of the event object. -

    - -     - - - -

    - Similar to regular filters, a filter chain is invoked when comet events are processed. - These filters should implement the CometFilter interface (which works in the same way as - the regular Filter interface), and should be declared and mapped in the deployment - descriptor in the same way as a regular filter. The filter chain when processing an event - will only include filters which match all the usual mapping rules, and also implement - the CometFiler interface. -

    - -     - - - -

    - The following pseudo code servlet implements asynchronous chat functionality using the API - described above: -

    - - connections = - new ArrayList(); - protected MessageSender messageSender = null; - - public void init() throws ServletException { - messageSender = new MessageSender(); - Thread messageSenderThread = - new Thread(messageSender, "MessageSender[" + getServletContext().getContextPath() + "]"); - messageSenderThread.setDaemon(true); - messageSenderThread.start(); - } - - public void destroy() { - connections.clear(); - messageSender.stop(); - messageSender = null; - } - - /** - * Process the given Comet event. - * - * @param event The Comet event that will be processed - * @throws IOException - * @throws ServletException - */ - public void event(CometEvent event) - throws IOException, ServletException { - HttpServletRequest request = event.getHttpServletRequest(); - HttpServletResponse response = event.getHttpServletResponse(); - if (event.getEventType() == CometEvent.EventType.BEGIN) { - log("Begin for session: " + request.getSession(true).getId()); - PrintWriter writer = response.getWriter(); - writer.println(""); - writer.println("JSP Chat"); - writer.flush(); - synchronized(connections) { - connections.add(response); - } - } else if (event.getEventType() == CometEvent.EventType.ERROR) { - log("Error for session: " + request.getSession(true).getId()); - synchronized(connections) { - connections.remove(response); - } - event.close(); - } else if (event.getEventType() == CometEvent.EventType.END) { - log("End for session: " + request.getSession(true).getId()); - synchronized(connections) { - connections.remove(response); - } - PrintWriter writer = response.getWriter(); - writer.println(""); - event.close(); - } else if (event.getEventType() == CometEvent.EventType.READ) { - InputStream is = request.getInputStream(); - byte[] buf = new byte[512]; - do { - int n = is.read(buf); //can throw an IOException - if (n > 0) { - log("Read " + n + " bytes: " + new String(buf, 0, n) - + " for session: " + request.getSession(true).getId()); - } else if (n < 0) { - error(event, request, response); - return; - } - } while (is.available() > 0); - } - } - - public class MessageSender implements Runnable { - - protected boolean running = true; - protected ArrayList messages = new ArrayList(); - - public MessageSender() { - } - - public void stop() { - running = false; - } - - /** - * Add message for sending. - */ - public void send(String user, String message) { - synchronized (messages) { - messages.add("[" + user + "]: " + message); - messages.notify(); - } - } - - public void run() { - - while (running) { - - if (messages.size() == 0) { - try { - synchronized (messages) { - messages.wait(); - } - } catch (InterruptedException e) { - // Ignore - } - } - - synchronized (connections) { - String[] pendingMessages = null; - synchronized (messages) { - pendingMessages = messages.toArray(new String[0]); - messages.clear(); - } - // Send any pending message on all the open connections - for (int i = 0; i < connections.size(); i++) { - try { - PrintWriter writer = connections.get(i).getWriter(); - for (int j = 0; j < pendingMessages.length; j++) { - writer.println(pendingMessages[j] + "
    "); - } - writer.flush(); - } catch (IOException e) { - log("IOExeption sending message", e); - } - } - } - - } - - } - - } - -}]]> - -     - -

    If you are using the NIO connector, you can set individual timeouts for your different comet connections. - To set a timeout, simply set a request attribute like the following code shows:

    - CometEvent event.... event.setTimeout(30*1000); -

    or

    - event.getHttpServletRequest().setAttribute("org.apache.tomcat.comet.timeout", new Integer(30 * 1000)); -

    - This sets the timeout to 30 seconds. - Important note: in order to set this timeout, it has to be done on the BEGIN event. - The default value is soTimeout -

    -

    If you are using the APR connector, all Comet connections will have the same timeout value. It is soTimeout*50 -

    -     - -
    -

    diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index d0202758791a..74cee4910af2 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -54,6 +54,9 @@ Make Java 8 the minimum required version to build and run Tomcat 9. (markt) + + Remove support for Comet. (markt) +

    diff --git a/webapps/docs/config/http.xml b/webapps/docs/config/http.xml index 36c1dcf7fa8c..1c409f846ebb 100644 --- a/webapps/docs/config/http.xml +++ b/webapps/docs/config/http.xml @@ -677,11 +677,6 @@ default value is 1000 milliseconds.

    - -

    (bool)Whether to allow comet servlets or not. Default value is - true.

    -     -

    (bool)Use this attribute to enable or disable sendfile capability. The default value is true. Note that the use of sendfile @@ -812,11 +807,6 @@ The default value is false.

     - -

    (bool)Whether to allow comet servlets or not. Default value is - true.

    -     -

    (bool)Use this attribute to enable or disable sendfile capability. The default value is true. Note that the use of sendfile @@ -964,11 +954,6 @@ this priority means.

     - -

    (bool)Whether to allow comet servlets or not. Default value is - true.

    -     -

    (bool)Use this attribute to enable or disable sendfile capability. The default value is true. Note that the use of sendfile diff --git a/webapps/examples/WEB-INF/classes/chat/ChatServlet.java b/webapps/examples/WEB-INF/classes/chat/ChatServlet.java deleted file mode 100644 index 7bec393cbc30..000000000000 --- a/webapps/examples/WEB-INF/classes/chat/ChatServlet.java +++ /dev/null @@ -1,292 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - - -package chat; - - -import java.io.IOException; -import java.io.InputStream; -import java.io.PrintWriter; -import java.util.ArrayList; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.catalina.comet.CometEvent; -import org.apache.catalina.comet.CometProcessor; - - -/** - * Helper class to implement Comet functionality. - */ -public class ChatServlet - extends HttpServlet implements CometProcessor { - - private static final long serialVersionUID = 1L; - - private static final String CHARSET = "UTF-8"; - - protected final ArrayList connections = - new ArrayList<>(); - protected transient MessageSender messageSender = null; - - @Override - public void init() throws ServletException { - messageSender = new MessageSender(); - Thread messageSenderThread = - new Thread(messageSender, "MessageSender[" + getServletContext().getContextPath() + "]"); - messageSenderThread.setDaemon(true); - messageSenderThread.start(); - } - - @Override - public void destroy() { - connections.clear(); - messageSender.stop(); - messageSender = null; - } - - /** - * Process the given Comet event. - * - * @param event The Comet event that will be processed - * @throws IOException - * @throws ServletException - */ - @Override - public void event(CometEvent event) - throws IOException, ServletException { - - // Note: There should really be two servlets in this example, to avoid - // mixing Comet stuff with regular connection processing - HttpServletRequest request = event.getHttpServletRequest(); - HttpServletResponse response = event.getHttpServletResponse(); - - if (event.getEventType() == CometEvent.EventType.BEGIN) { - String action = request.getParameter("action"); - if (action != null) { - if ("login".equals(action)) { - String nickname = request.getParameter("nickname"); - request.getSession(true).setAttribute("nickname", nickname); - response.sendRedirect("index.jsp"); - event.close(); - return; - } - String nickname = (String) request.getSession(true).getAttribute("nickname"); - String message = request.getParameter("message"); - messageSender.send(nickname, message); - response.sendRedirect("post.jsp"); - event.close(); - return; - } - if (request.getSession(true).getAttribute("nickname") == null) { - // Redirect to "login" - log("Redirect to login for session: " + request.getSession(true).getId()); - response.sendRedirect("login.jsp"); - event.close(); - return; - } - begin(event, request, response); - } else if (event.getEventType() == CometEvent.EventType.ERROR) { - error(event, request, response); - } else if (event.getEventType() == CometEvent.EventType.END) { - end(event, request, response); - } else if (event.getEventType() == CometEvent.EventType.READ) { - read(event, request, response); - } - } - - protected void begin(@SuppressWarnings("unused") CometEvent event, - HttpServletRequest request, HttpServletResponse response) - throws IOException { - log("Begin for session: " + request.getSession(true).getId()); - - response.setContentType("text/html; charset=" + CHARSET); - - PrintWriter writer = response.getWriter(); - writer.println(""); - writer.println("JSP Chat"); - writer.println("

    "); - writer.flush(); - - synchronized(connections) { - connections.add(response); - } - - messageSender.send("Tomcat", request.getSession(true).getAttribute("nickname") + " joined the chat."); - } - - protected void end(CometEvent event, HttpServletRequest request, HttpServletResponse response) - throws IOException { - log("End for session: " + request.getSession(true).getId()); - synchronized(connections) { - connections.remove(response); - } - - PrintWriter writer = response.getWriter(); - writer.println(""); - - event.close(); - } - - protected void error(CometEvent event, HttpServletRequest request, HttpServletResponse response) - throws IOException { - log("Error for session: " + request.getSession(true).getId()); - synchronized(connections) { - connections.remove(response); - } - event.close(); - } - - protected void read(CometEvent event, HttpServletRequest request, HttpServletResponse response) - throws IOException { - InputStream is = request.getInputStream(); - byte[] buf = new byte[512]; - while (is.available() > 0) { - log("Available: " + is.available()); - int n = is.read(buf); - if (n > 0) { - log("Read " + n + " bytes: " + new String(buf, 0, n) - + " for session: " + request.getSession(true).getId()); - } else if (n < 0) { - log("End of file: " + n); - end(event, request, response); - return; - } - } - } - - @Override - protected void service(HttpServletRequest request, HttpServletResponse response) - throws IOException, ServletException { - // Compatibility method: equivalent method using the regular connection model - response.setContentType("text/html; charset=" + CHARSET); - PrintWriter writer = response.getWriter(); - writer.println(""); - writer.println("JSP Chat"); - writer.println("Chat example only supports Comet processing. "); - writer.println("Configure a connector that supports Comet and try again."); - writer.println(""); - } - - - /** - * Poller class. - */ - public class MessageSender implements Runnable { - - protected boolean running = true; - protected final ArrayList messages = new ArrayList<>(); - - public MessageSender() { - // Default contructor - } - - public void stop() { - running = false; - synchronized (messages) { - messages.notify(); - } - } - - public void send(String user, String message) { - synchronized (messages) { - messages.add("[" + user + "]: " + message); - messages.notify(); - } - } - - /** - * The background thread that listens for incoming TCP/IP connections and - * hands them off to an appropriate processor. - */ - @Override - public void run() { - - // Loop until we receive a shutdown command - while (running) { - String[] pendingMessages; - synchronized (messages) { - try { - if (messages.size() == 0) { - messages.wait(); - } - } catch (InterruptedException e) { - // Ignore - } - pendingMessages = messages.toArray(new String[0]); - messages.clear(); - } - - synchronized (connections) { - for (int i = 0; i < connections.size(); i++) { - try { - PrintWriter writer = connections.get(i).getWriter(); - for (int j = 0; j < pendingMessages.length; j++) { - writer.println("
    "+filter(pendingMessages[j]) + "
    "); - } - writer.flush(); - } catch (IOException e) { - log("IOException sending message", e); - } - } - } - - } - - } - - } - - /** - * Filter the specified message string for characters that are sensitive - * in HTML. - * - * @param message The message string to be filtered - * @author Copied from org.apache.catalina.util.RequestUtil#filter(String) - */ - protected static String filter(String message) { - if (message == null) - return (null); - - char content[] = new char[message.length()]; - message.getChars(0, message.length(), content, 0); - StringBuilder result = new StringBuilder(content.length + 50); - for (int i = 0; i < content.length; i++) { - switch (content[i]) { - case '<': - result.append("<"); - break; - case '>': - result.append(">"); - break; - case '&': - result.append("&"); - break; - case '"': - result.append("""); - break; - default: - result.append(content[i]); - } - } - return (result.toString()); - } -} diff --git a/webapps/examples/WEB-INF/web.xml b/webapps/examples/WEB-INF/web.xml index 5ce3afac0494..fac15bfb2883 100644 --- a/webapps/examples/WEB-INF/web.xml +++ b/webapps/examples/WEB-INF/web.xml @@ -121,10 +121,6 @@ ServletToJsp ServletToJsp - - ChatServlet - chat.ChatServlet - CompressionFilterTestServlet compressionFilters.CompressionFilterTestServlet @@ -154,10 +150,6 @@ SessionExample - - ChatServlet - /servlets/chat/chat - CompressionFilterTestServlet /CompressionTest diff --git a/webapps/examples/servlets/chat/index.jsp b/webapps/examples/servlets/chat/index.jsp deleted file mode 100644 index a867e3767bfa..000000000000 --- a/webapps/examples/servlets/chat/index.jsp +++ /dev/null @@ -1,32 +0,0 @@ -<%-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---%> -<%@page contentType="text/html; charset=UTF-8" %> -<% if (session.getAttribute("nickname") == null) { - response.sendRedirect("login.jsp"); - return; -} -%> - - - - JSP Chat - - - - - - diff --git a/webapps/examples/servlets/chat/login.jsp b/webapps/examples/servlets/chat/login.jsp deleted file mode 100644 index beb3b3805d51..000000000000 --- a/webapps/examples/servlets/chat/login.jsp +++ /dev/null @@ -1,33 +0,0 @@ -<%-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---%> - -<%@page contentType="text/html; charset=UTF-8" %> - - - JSP Chat - - - - -
    - -Nickname: - -
    - - - diff --git a/webapps/examples/servlets/chat/post.jsp b/webapps/examples/servlets/chat/post.jsp deleted file mode 100644 index f6b38e52f0cf..000000000000 --- a/webapps/examples/servlets/chat/post.jsp +++ /dev/null @@ -1,55 +0,0 @@ -<%-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---%> - -<%@page contentType="text/html; charset=UTF-8" %> - - - JSP Chat - - - - -
    - -Message: - -
    - -
    -<% - String serverName = request.getServerName(); - if ("localhost".equals(serverName)) { - serverName = "127.0.0.1"; - } else if ("127.0.0.1".equals(serverName)) { - serverName = "localhost"; - } - - String chatUrl = request.getScheme() + "://" + serverName + ":" - + request.getServerPort() + request.getContextPath() - + request.getServletPath(); - - // strip "post.jsp" from the address - chatUrl = chatUrl.substring(0, chatUrl.lastIndexOf("/") + 1); -%> -Click to open a new chat window -Note: To avoid hitting the limit on the count of simultaneous -connections to the same host, imposed by the -HTTP specification, -the second chat window should be opened using a different URL, e.g. with -an IP address instead of the host name. - - diff --git a/webapps/examples/servlets/index.html b/webapps/examples/servlets/index.html index 625ffa28b30c..7299d2c42a9d 100644 --- a/webapps/examples/servlets/index.html +++ b/webapps/examples/servlets/index.html @@ -148,20 +148,6 @@

    Other Examples

    - - Comet processing example:
    - See the "Advanced IO" chapter in the User Guide for - details. This example only works with the HTTP NIO or HTTP APR/native - connectors as these are the only connectors that support Comet. - - - Comet Chat - - Execute - - - - Servlet 3.1 Non-blocking IO examples