You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by tr...@apache.org on 2007/12/07 05:58:02 UTC
svn commit: r601994 - in /mina/trunk:
core/src/main/java/org/apache/mina/filter/codec/statemachine/
example/src/main/java/org/apache/mina/example/httpclient/
filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/
protocol-http-client/src/ma...
Author: trustin
Date: Thu Dec 6 20:58:00 2007
New Revision: 601994
URL: http://svn.apache.org/viewvc?rev=601994&view=rev
Log:
* Replaced URL with URI
* Fixed issue: DIRMINA-487 (Fix HTTP response with no content-length header)
** All DecodingState now has finishDecode(ProtocolDecoderOutput) which is invoked when a session is closed.
** Added ConsumeToDisconnectionDecodingState
Added:
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ConsumeToDisconnectionDecodingState.java (with props)
Modified:
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ConsumeToCrLfDecodingState.java
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ConsumeToDynamicTerminatorDecodingState.java
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ConsumeToTerminatorDecodingState.java
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/CrLfDecodingState.java
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/DecodingState.java
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/DecodingStateMachine.java
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/FixedLengthDecodingState.java
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/IntegerDecodingState.java
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ShortIntegerDecodingState.java
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/SingleByteDecodingState.java
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/SkippingState.java
mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/StateMachineProtocolDecoder.java
mina/trunk/example/src/main/java/org/apache/mina/example/httpclient/Wget.java
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpRequestDecoder.java
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpResponseDecoder.java
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpResponseDecodingState.java
mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpVersionDecodingState.java
mina/trunk/protocol-http-client/src/main/java/org/apache/mina/protocol/http/client/AsyncHttpClient.java
mina/trunk/protocol-http-client/src/test/java/org/apache/mina/protocol/http/client/AsyncHttpClientTest.java
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ConsumeToCrLfDecodingState.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ConsumeToCrLfDecodingState.java?rev=601994&r1=601993&r2=601994&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ConsumeToCrLfDecodingState.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ConsumeToCrLfDecodingState.java Thu Dec 6 20:58:00 2007
@@ -90,8 +90,7 @@
} else {
// When input contained only CR or LF rather than actual data...
if (buffer == null) {
- product = IoBuffer.allocate(1);
- product.limit(0);
+ product = IoBuffer.allocate(0);
} else {
product = buffer.flip();
buffer = null;
@@ -112,6 +111,18 @@
}
return this;
}
+ }
+
+ public DecodingState finishDecode(ProtocolDecoderOutput out) throws Exception {
+ IoBuffer product;
+ // When input contained only CR or LF rather than actual data...
+ if (buffer == null) {
+ product = IoBuffer.allocate(0);
+ } else {
+ product = buffer.flip();
+ buffer = null;
+ }
+ return finishDecode(product, out);
}
protected abstract DecodingState finishDecode(IoBuffer product,
Added: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ConsumeToDisconnectionDecodingState.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ConsumeToDisconnectionDecodingState.java?rev=601994&view=auto
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ConsumeToDisconnectionDecodingState.java (added)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ConsumeToDisconnectionDecodingState.java Thu Dec 6 20:58:00 2007
@@ -0,0 +1,69 @@
+/*
+ * 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.mina.filter.codec.statemachine;
+
+import org.apache.mina.common.IoBuffer;
+import org.apache.mina.filter.codec.ProtocolDecoderException;
+import org.apache.mina.filter.codec.ProtocolDecoderOutput;
+
+/**
+ * A {@link DecodingState} which consumes all received bytes until a configured
+ * number of read bytes has been reached. Please note that this state can
+ * produce the buffer with less data if the associated session has been
+ * closed unexpectedly.
+ *
+ * @author The Apache MINA Project (dev@mina.apache.org)
+ * @version $Rev$, $Date$
+ */
+public abstract class ConsumeToDisconnectionDecodingState implements DecodingState {
+
+ private IoBuffer buffer;
+ private final int maxLength;
+
+ public ConsumeToDisconnectionDecodingState(int maxLength) {
+ this.maxLength = maxLength;
+ }
+
+ public DecodingState decode(IoBuffer in, ProtocolDecoderOutput out)
+ throws Exception {
+ if (buffer == null) {
+ buffer = IoBuffer.allocate(256).setAutoExpand(true);
+ }
+
+ if (buffer.position() + in.remaining() > maxLength) {
+ throw new ProtocolDecoderException("Received data exceeds " + maxLength + " byte(s).");
+ }
+ buffer.put(in);
+ return this;
+ }
+
+ public DecodingState finishDecode(ProtocolDecoderOutput out)
+ throws Exception {
+ try {
+ buffer.flip();
+ return finishDecode(buffer, out);
+ } finally {
+ buffer = null;
+ }
+ }
+
+ protected abstract DecodingState finishDecode(IoBuffer readData,
+ ProtocolDecoderOutput out) throws Exception;
+}
Propchange: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ConsumeToDisconnectionDecodingState.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ConsumeToDisconnectionDecodingState.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ConsumeToDynamicTerminatorDecodingState.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ConsumeToDynamicTerminatorDecodingState.java?rev=601994&r1=601993&r2=601994&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ConsumeToDynamicTerminatorDecodingState.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ConsumeToDynamicTerminatorDecodingState.java Thu Dec 6 20:58:00 2007
@@ -72,8 +72,7 @@
} else {
// When input contained only terminator rather than actual data...
if (buffer == null) {
- product = IoBuffer.allocate(1);
- product.limit(0);
+ product = IoBuffer.allocate(0);
} else {
product = buffer.flip();
buffer = null;
@@ -89,6 +88,19 @@
buffer.put(in);
return this;
}
+ }
+
+ public DecodingState finishDecode(ProtocolDecoderOutput out)
+ throws Exception {
+ IoBuffer product;
+ // When input contained only terminator rather than actual data...
+ if (buffer == null) {
+ product = IoBuffer.allocate(0);
+ } else {
+ product = buffer.flip();
+ buffer = null;
+ }
+ return finishDecode(product, out);
}
protected abstract boolean isTerminator(byte b);
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ConsumeToTerminatorDecodingState.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ConsumeToTerminatorDecodingState.java?rev=601994&r1=601993&r2=601994&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ConsumeToTerminatorDecodingState.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ConsumeToTerminatorDecodingState.java Thu Dec 6 20:58:00 2007
@@ -65,8 +65,7 @@
} else {
// When input contained only terminator rather than actual data...
if (buffer == null) {
- product = IoBuffer.allocate(1);
- product.limit(0);
+ product = IoBuffer.allocate(0);
} else {
product = buffer.flip();
buffer = null;
@@ -82,6 +81,19 @@
buffer.put(in);
return this;
}
+ }
+
+ public DecodingState finishDecode(ProtocolDecoderOutput out)
+ throws Exception {
+ IoBuffer product;
+ // When input contained only terminator rather than actual data...
+ if (buffer == null) {
+ product = IoBuffer.allocate(0);
+ } else {
+ product = buffer.flip();
+ buffer = null;
+ }
+ return finishDecode(product, out);
}
protected abstract DecodingState finishDecode(IoBuffer product,
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/CrLfDecodingState.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/CrLfDecodingState.java?rev=601994&r1=601993&r2=601994&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/CrLfDecodingState.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/CrLfDecodingState.java Thu Dec 6 20:58:00 2007
@@ -87,6 +87,11 @@
}
}
+ public DecodingState finishDecode(ProtocolDecoderOutput out)
+ throws Exception {
+ return finishDecode(false, out);
+ }
+
protected abstract DecodingState finishDecode(boolean foundCRLF,
ProtocolDecoderOutput out) throws Exception;
}
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/DecodingState.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/DecodingState.java?rev=601994&r1=601993&r2=601994&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/DecodingState.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/DecodingState.java Thu Dec 6 20:58:00 2007
@@ -20,6 +20,7 @@
package org.apache.mina.filter.codec.statemachine;
import org.apache.mina.common.IoBuffer;
+import org.apache.mina.common.IoSession;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
/**
@@ -28,7 +29,14 @@
* @version $Rev$, $Date$
*/
public interface DecodingState {
- // TODO Find out the best way to provide init/destroy.
+ /**
+ * Invoked when data is available for this state.
+ */
DecodingState decode(IoBuffer in, ProtocolDecoderOutput out)
throws Exception;
+
+ /**
+ * Invoked when the associated {@link IoSession} is closed.
+ */
+ DecodingState finishDecode(ProtocolDecoderOutput out) throws Exception;
}
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/DecodingStateMachine.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/DecodingStateMachine.java?rev=601994&r1=601993&r2=601994&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/DecodingStateMachine.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/DecodingStateMachine.java Thu Dec 6 20:58:00 2007
@@ -48,6 +48,7 @@
};
private DecodingState currentState;
+ private boolean initialized;
protected abstract DecodingState init() throws Exception;
@@ -58,10 +59,7 @@
public DecodingState decode(IoBuffer in, ProtocolDecoderOutput out)
throws Exception {
- DecodingState state = this.currentState;
- if (state == null) {
- state = init();
- }
+ DecodingState state = getCurrentState();
final int limit = in.limit();
int pos = in.position();
@@ -99,13 +97,64 @@
// Destroy if decoding is finished or failed.
if (state == null) {
- childProducts.clear();
- try {
- destroy();
- } catch (Exception e2) {
- log.warn("Failed to destroy a decoding state machine.", e2);
+ cleanup();
+ }
+ }
+ }
+
+ public DecodingState finishDecode(ProtocolDecoderOutput out)
+ throws Exception {
+ DecodingState nextState;
+ DecodingState state = getCurrentState();
+ try {
+ for (;;) {
+ DecodingState oldState = state;
+ state = state.finishDecode(childOutput);
+ if (state == null) {
+ // Finished
+ break;
+ }
+
+ // Exit if state didn't change.
+ if (oldState == state) {
+ break;
}
}
+ } catch (Exception e) {
+ state = null;
+ log.debug(
+ "Ignoring the exception caused by a closed session.", e);
+ } finally {
+ this.currentState = state;
+ nextState = finishDecode(childProducts, out);
+ if (state == null) {
+ cleanup();
+
+ }
+ }
+ return nextState;
+ }
+
+ private void cleanup() {
+ if (!initialized) {
+ throw new IllegalStateException();
+ }
+
+ initialized = false;
+ childProducts.clear();
+ try {
+ destroy();
+ } catch (Exception e2) {
+ log.warn("Failed to destroy a decoding state machine.", e2);
+ }
+ }
+
+ private DecodingState getCurrentState() throws Exception {
+ DecodingState state = this.currentState;
+ if (state == null) {
+ state = init();
+ initialized = true;
}
+ return state;
}
}
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/FixedLengthDecodingState.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/FixedLengthDecodingState.java?rev=601994&r1=601993&r2=601994&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/FixedLengthDecodingState.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/FixedLengthDecodingState.java Thu Dec 6 20:58:00 2007
@@ -24,7 +24,9 @@
/**
* A {@link DecodingState} which consumes all received bytes until a configured
- * number of read bytes has been reached.
+ * number of read bytes has been reached. Please note that this state can
+ * produce the buffer with less data if the associated session has been
+ * closed unexpectedly.
*
* @author The Apache MINA Project (dev@mina.apache.org)
* @version $Rev$, $Date$
@@ -73,6 +75,18 @@
return this;
}
}
+ }
+
+ public DecodingState finishDecode(ProtocolDecoderOutput out)
+ throws Exception {
+ IoBuffer readData;
+ if (buffer == null) {
+ readData = IoBuffer.allocate(0);
+ } else {
+ readData = buffer.flip();
+ buffer = null;
+ }
+ return finishDecode(readData ,out);
}
protected abstract DecodingState finishDecode(IoBuffer readData,
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/IntegerDecodingState.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/IntegerDecodingState.java?rev=601994&r1=601993&r2=601994&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/IntegerDecodingState.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/IntegerDecodingState.java Thu Dec 6 20:58:00 2007
@@ -20,6 +20,7 @@
package org.apache.mina.filter.codec.statemachine;
import org.apache.mina.common.IoBuffer;
+import org.apache.mina.filter.codec.ProtocolDecoderException;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
/**
@@ -61,6 +62,12 @@
}
return this;
+ }
+
+ public DecodingState finishDecode(ProtocolDecoderOutput out)
+ throws Exception {
+ throw new ProtocolDecoderException(
+ "Unexpected end of session while waiting for an integer.");
}
protected abstract DecodingState finishDecode(int value,
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ShortIntegerDecodingState.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ShortIntegerDecodingState.java?rev=601994&r1=601993&r2=601994&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ShortIntegerDecodingState.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/ShortIntegerDecodingState.java Thu Dec 6 20:58:00 2007
@@ -20,6 +20,7 @@
package org.apache.mina.filter.codec.statemachine;
import org.apache.mina.common.IoBuffer;
+import org.apache.mina.filter.codec.ProtocolDecoderException;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
/**
@@ -52,6 +53,12 @@
counter ++;
}
return this;
+ }
+
+ public DecodingState finishDecode(ProtocolDecoderOutput out)
+ throws Exception {
+ throw new ProtocolDecoderException(
+ "Unexpected end of session while waiting for a short integer.");
}
protected abstract DecodingState finishDecode(short value,
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/SingleByteDecodingState.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/SingleByteDecodingState.java?rev=601994&r1=601993&r2=601994&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/SingleByteDecodingState.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/SingleByteDecodingState.java Thu Dec 6 20:58:00 2007
@@ -20,6 +20,7 @@
package org.apache.mina.filter.codec.statemachine;
import org.apache.mina.common.IoBuffer;
+import org.apache.mina.filter.codec.ProtocolDecoderException;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
/**
@@ -38,6 +39,12 @@
} else {
return this;
}
+ }
+
+ public DecodingState finishDecode(ProtocolDecoderOutput out)
+ throws Exception {
+ throw new ProtocolDecoderException(
+ "Unexpected end of session while waiting for a single byte.");
}
protected abstract DecodingState finishDecode(byte b,
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/SkippingState.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/SkippingState.java?rev=601994&r1=601993&r2=601994&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/SkippingState.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/SkippingState.java Thu Dec 6 20:58:00 2007
@@ -58,6 +58,11 @@
return this;
}
+ public DecodingState finishDecode(ProtocolDecoderOutput out)
+ throws Exception {
+ return finishDecode(skippedBytes);
+ }
+
protected abstract boolean canSkip(byte b);
protected abstract DecodingState finishDecode(int skippedBytes)
Modified: mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/StateMachineProtocolDecoder.java
URL: http://svn.apache.org/viewvc/mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/StateMachineProtocolDecoder.java?rev=601994&r1=601993&r2=601994&view=diff
==============================================================================
--- mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/StateMachineProtocolDecoder.java (original)
+++ mina/trunk/core/src/main/java/org/apache/mina/filter/codec/statemachine/StateMachineProtocolDecoder.java Thu Dec 6 20:58:00 2007
@@ -30,59 +30,31 @@
* @version $Rev$, $Date$
*/
public class StateMachineProtocolDecoder implements ProtocolDecoder {
-
private final DecodingStateMachine stateMachine;
- private DecodingState currentState;
-
public StateMachineProtocolDecoder(DecodingStateMachine stateMachine) {
if (stateMachine == null) {
throw new NullPointerException("stateMachine");
}
this.stateMachine = stateMachine;
}
+
+ /**
+ * Returns the {@link DecodingStateMachine} employed by this decoder.
+ */
+ protected DecodingStateMachine getStateMachine() {
+ return stateMachine;
+ }
public void decode(IoSession session, IoBuffer in, ProtocolDecoderOutput out)
throws Exception {
- DecodingState state = this.currentState;
- if (state == null) {
- state = stateMachine.init();
- }
-
- try {
- for (;;) {
- int remaining = in.remaining();
-
- // Wait for more data if all data is consumed.
- if (remaining == 0) {
- break;
- }
-
- DecodingState oldState = state;
- state = state.decode(in, out);
-
- if (state == null) {
- // Finished
- break;
- }
-
- // Wait for more data if nothing is consumed and state didn't change.
- if (in.remaining() == remaining && oldState == state) {
- break;
- }
- }
- } catch (Exception e) {
- state = null;
- throw e;
- } finally {
- this.currentState = state;
- }
- }
-
- public void dispose(IoSession session) throws Exception {
+ stateMachine.decode(in, out);
}
public void finishDecode(IoSession session, ProtocolDecoderOutput out)
throws Exception {
+ stateMachine.finishDecode(out);
}
+
+ public void dispose(IoSession session) throws Exception {}
}
Modified: mina/trunk/example/src/main/java/org/apache/mina/example/httpclient/Wget.java
URL: http://svn.apache.org/viewvc/mina/trunk/example/src/main/java/org/apache/mina/example/httpclient/Wget.java?rev=601994&r1=601993&r2=601994&view=diff
==============================================================================
--- mina/trunk/example/src/main/java/org/apache/mina/example/httpclient/Wget.java (original)
+++ mina/trunk/example/src/main/java/org/apache/mina/example/httpclient/Wget.java Thu Dec 6 20:58:00 2007
@@ -21,7 +21,8 @@
package org.apache.mina.example.httpclient;
import java.net.URI;
-import java.net.URL;
+import java.nio.charset.Charset;
+import java.nio.charset.CharsetDecoder;
import org.apache.mina.filter.codec.http.DefaultHttpRequest;
import org.apache.mina.filter.codec.http.HttpResponse;
@@ -46,29 +47,26 @@
* Creates a new instance of HttpClient. Constructor that does all
* the work for this example.
*
- * @param url
+ * @param uri
* Example: http://www.google.com
* @throws Exception
* thrown if something goes wrong.
*/
- public Wget(URL url) throws Exception {
- WgetCallback callback = new WgetCallback();
-
- String path;
- if (url.getPath() == null || url.getPath().length() == 0) {
- path = "/index.html";
- } else {
- path = url.getPath();
+ public Wget(URI uri) throws Exception {
+ if (uri.getPath() == null || uri.getPath().length() == 0) {
+ uri = new URI(uri.toString() + "/index.html");
}
+ WgetCallback callback = new WgetCallback();
MutableHttpRequest request = new DefaultHttpRequest();
- request.setRequestUri(new URI(path));
- AsyncHttpClient ahc = new AsyncHttpClient(url, callback);
+ request.setRequestUri(uri);
+
+ AsyncHttpClient ahc = new AsyncHttpClient(uri, callback);
ahc.connect();
ahc.sendRequest(request);
synchronized (semaphore) {
- //5 second timeout due to no response
- semaphore.wait(5000);
+ // 10 second timeout due to no response.
+ semaphore.wait(1000 * 10);
}
if (callback.isException()) {
@@ -76,7 +74,14 @@
}
HttpResponse msg = callback.getMessage();
- System.out.println(msg.getContent());
+ String charset = msg.getContentType().replaceAll(".*charset\\s*=\\s*", "");
+ CharsetDecoder decoder;
+ try {
+ decoder = Charset.forName(charset).newDecoder();
+ } catch (Exception e) {
+ decoder = Charset.forName("ISO-8859-1").newDecoder();
+ }
+ System.out.println(msg.getContent().getString(decoder));
}
class WgetCallback implements AsyncHttpClientCallback {
@@ -187,7 +192,7 @@
* Thrown if something goes wrong.
*/
public static void main(String[] args) throws Exception {
- URL theUrlRequest = new URL(args[0]);
+ URI theUrlRequest = new URI(args[0]);
new Wget(theUrlRequest);
System.exit(0);
Modified: mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpRequestDecoder.java
URL: http://svn.apache.org/viewvc/mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpRequestDecoder.java?rev=601994&r1=601993&r2=601994&view=diff
==============================================================================
--- mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpRequestDecoder.java (original)
+++ mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpRequestDecoder.java Thu Dec 6 20:58:00 2007
@@ -35,7 +35,9 @@
@Override
protected DecodingState finishDecode(List<Object> childProducts,
ProtocolDecoderOutput out) throws Exception {
- // Never be executed.
+ for (Object m: childProducts) {
+ out.write(m);
+ }
return null;
}
});
Modified: mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpResponseDecoder.java
URL: http://svn.apache.org/viewvc/mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpResponseDecoder.java?rev=601994&r1=601993&r2=601994&view=diff
==============================================================================
--- mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpResponseDecoder.java (original)
+++ mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpResponseDecoder.java Thu Dec 6 20:58:00 2007
@@ -35,7 +35,9 @@
@Override
protected DecodingState finishDecode(List<Object> childProducts,
ProtocolDecoderOutput out) throws Exception {
- // Never be executed.
+ for (Object m: childProducts) {
+ out.write(m);
+ }
return null;
}
});
Modified: mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpResponseDecodingState.java
URL: http://svn.apache.org/viewvc/mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpResponseDecodingState.java?rev=601994&r1=601993&r2=601994&view=diff
==============================================================================
--- mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpResponseDecodingState.java (original)
+++ mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpResponseDecodingState.java Thu Dec 6 20:58:00 2007
@@ -25,6 +25,7 @@
import org.apache.mina.common.IoBuffer;
import org.apache.mina.filter.codec.ProtocolDecoderException;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
+import org.apache.mina.filter.codec.statemachine.ConsumeToDisconnectionDecodingState;
import org.apache.mina.filter.codec.statemachine.CrLfDecodingState;
import org.apache.mina.filter.codec.statemachine.DecodingState;
import org.apache.mina.filter.codec.statemachine.DecodingStateMachine;
@@ -195,10 +196,12 @@
int length = getContentLength(response);
if (length > 0) {
if (LOG.isDebugEnabled()) {
- LOG
- .debug("Using fixed length decoder for request with length "
- + length);
+ LOG.debug(
+ "Using fixed length decoder for request with " +
+ "length " + length);
}
+
+ // TODO max length limitation.
nextState = new FixedLengthDecodingState(length) {
@Override
protected DecodingState finishDecode(IoBuffer readData,
@@ -208,6 +211,22 @@
return null;
}
};
+ } else if (length < 0) {
+ if (LOG.isDebugEnabled()) {
+ LOG.debug(
+ "Using consume-to-disconnection decoder for " +
+ "request with unspecified length.");
+ }
+ // FIXME hard-coded max length.
+ nextState = new ConsumeToDisconnectionDecodingState(1048576) {
+ @Override
+ protected DecodingState finishDecode(IoBuffer readData,
+ ProtocolDecoderOutput out) throws Exception {
+ response.setContent(readData);
+ out.write(response);
+ return null;
+ }
+ };
} else {
LOG.debug("No entity body for this request");
out.write(response);
@@ -221,12 +240,12 @@
* Obtains the content length from the specified request
*
* @param response The request
- * @return The content length, or 0 if not specified
+ * @return The content length, or -1 if not specified
* @throws HttpDecoderException If an invalid content length is specified
*/
private int getContentLength(HttpResponse response)
throws ProtocolDecoderException {
- int length = 0;
+ int length = -1;
String lengthValue = response.getHeader(CONTENT_LENGTH);
if (lengthValue != null) {
try {
Modified: mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpVersionDecodingState.java
URL: http://svn.apache.org/viewvc/mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpVersionDecodingState.java?rev=601994&r1=601993&r2=601994&view=diff
==============================================================================
--- mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpVersionDecodingState.java (original)
+++ mina/trunk/filter-codec-http/src/main/java/org/apache/mina/filter/codec/http/HttpVersionDecodingState.java Thu Dec 6 20:58:00 2007
@@ -22,6 +22,7 @@
import java.nio.charset.CharsetDecoder;
import org.apache.mina.common.IoBuffer;
+import org.apache.mina.filter.codec.ProtocolDecoderException;
import org.apache.mina.filter.codec.ProtocolDecoderOutput;
import org.apache.mina.filter.codec.statemachine.ConsumeToDynamicTerminatorDecodingState;
import org.apache.mina.filter.codec.statemachine.DecodingState;
@@ -62,6 +63,11 @@
return READ_PROTOCOL_VERSION.decode(in, out);
}
+ public DecodingState finishDecode(ProtocolDecoderOutput out)
+ throws Exception {
+ throw new ProtocolDecoderException(
+ "Unexpected end of session while waiting for a HTTP version field.");
+ }
protected abstract DecodingState finishDecode(
HttpVersion version, ProtocolDecoderOutput out) throws Exception;
Modified: mina/trunk/protocol-http-client/src/main/java/org/apache/mina/protocol/http/client/AsyncHttpClient.java
URL: http://svn.apache.org/viewvc/mina/trunk/protocol-http-client/src/main/java/org/apache/mina/protocol/http/client/AsyncHttpClient.java?rev=601994&r1=601993&r2=601994&view=diff
==============================================================================
--- mina/trunk/protocol-http-client/src/main/java/org/apache/mina/protocol/http/client/AsyncHttpClient.java (original)
+++ mina/trunk/protocol-http-client/src/main/java/org/apache/mina/protocol/http/client/AsyncHttpClient.java Thu Dec 6 20:58:00 2007
@@ -21,7 +21,7 @@
import java.io.IOException;
import java.net.InetSocketAddress;
-import java.net.URL;
+import java.net.URI;
import java.security.GeneralSecurityException;
import javax.net.ssl.SSLContext;
@@ -41,7 +41,7 @@
public static String DEFAULT_SSL_PROTOCOL = "TLS";
- private URL url;
+ private URI uri;
private boolean followRedirects = true;
@@ -53,8 +53,8 @@
private AsyncHttpClientCallback callback;
- public AsyncHttpClient(URL url, AsyncHttpClientCallback callback) {
- this.url = url;
+ public AsyncHttpClient(URI url, AsyncHttpClientCallback callback) {
+ this.uri = url;
this.callback = callback;
}
@@ -63,8 +63,8 @@
connector.setConnectTimeout(connectionTimeout);
- String scheme = url.getProtocol();
- int port = url.getPort();
+ String scheme = uri.getScheme();
+ int port = uri.getPort();
if (scheme.toLowerCase().equals("https")) {
SslFilter filter = new SslFilter(createClientSSLContext());
filter.setUseClientMode(true);
@@ -80,11 +80,11 @@
connector.getFilterChain().addLast("protocolFilter",
new ProtocolCodecFilter(new HttpCodecFactory()));
connector.setHandler(new HttpIoHandler(callback));
- ConnectFuture future = connector.connect(new InetSocketAddress(url
+ ConnectFuture future = connector.connect(new InetSocketAddress(uri
.getHost(), port));
future.awaitUninterruptibly();
if (!future.isConnected()) {
- throw new IOException("Cannot connect to " + url.toString());
+ throw new IOException("Cannot connect to " + uri.toString());
}
session = future.getSession();
}
Modified: mina/trunk/protocol-http-client/src/test/java/org/apache/mina/protocol/http/client/AsyncHttpClientTest.java
URL: http://svn.apache.org/viewvc/mina/trunk/protocol-http-client/src/test/java/org/apache/mina/protocol/http/client/AsyncHttpClientTest.java?rev=601994&r1=601993&r2=601994&view=diff
==============================================================================
--- mina/trunk/protocol-http-client/src/test/java/org/apache/mina/protocol/http/client/AsyncHttpClientTest.java (original)
+++ mina/trunk/protocol-http-client/src/test/java/org/apache/mina/protocol/http/client/AsyncHttpClientTest.java Thu Dec 6 20:58:00 2007
@@ -22,7 +22,6 @@
import java.io.File;
import java.io.FileInputStream;
import java.net.URI;
-import java.net.URL;
import java.nio.charset.Charset;
import org.apache.mina.common.IoBuffer;
@@ -125,7 +124,7 @@
private void doConnection(TestCallback callback, String url,
HttpRequest request, boolean testForException)
throws Exception {
- URL url_connect = new URL(url);
+ URI url_connect = new URI(url);
AsyncHttpClient ahc = new AsyncHttpClient(url_connect, callback);
ahc.connect();