Merge branch 'master' of git@github.com:netty/netty.git
This commit is contained in:
commit
be46c6b954
@ -19,8 +19,6 @@ import io.netty.buffer.ChannelBuffer;
|
|||||||
import io.netty.buffer.ChannelBuffers;
|
import io.netty.buffer.ChannelBuffers;
|
||||||
import io.netty.channel.Channel;
|
import io.netty.channel.Channel;
|
||||||
import io.netty.channel.ChannelHandlerContext;
|
import io.netty.channel.ChannelHandlerContext;
|
||||||
import io.netty.handler.codec.compression.ZlibDecoder;
|
|
||||||
import io.netty.handler.codec.embedder.DecoderEmbedder;
|
|
||||||
import io.netty.handler.codec.frame.FrameDecoder;
|
import io.netty.handler.codec.frame.FrameDecoder;
|
||||||
|
|
||||||
import static io.netty.handler.codec.spdy.SpdyCodecUtil.*;
|
import static io.netty.handler.codec.spdy.SpdyCodecUtil.*;
|
||||||
|
@ -13,21 +13,6 @@
|
|||||||
* License for the specific language governing permissions and limitations
|
* License for the specific language governing permissions and limitations
|
||||||
* under the License.
|
* under the License.
|
||||||
*/
|
*/
|
||||||
/*
|
|
||||||
* Copyright 2012 Twitter, Inc.
|
|
||||||
*
|
|
||||||
* Licensed 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 io.netty.handler.codec.spdy;
|
package io.netty.handler.codec.spdy;
|
||||||
|
|
||||||
import io.netty.buffer.ChannelBuffer;
|
import io.netty.buffer.ChannelBuffer;
|
||||||
|
@ -13,21 +13,6 @@
|
|||||||
* License for the specific language governing permissions and limitations
|
* License for the specific language governing permissions and limitations
|
||||||
* under the License.
|
* under the License.
|
||||||
*/
|
*/
|
||||||
/*
|
|
||||||
* Copyright 2012 Twitter, Inc.
|
|
||||||
*
|
|
||||||
* Licensed 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 io.netty.handler.codec.spdy;
|
package io.netty.handler.codec.spdy;
|
||||||
|
|
||||||
import static io.netty.handler.codec.spdy.SpdyCodecUtil.*;
|
import static io.netty.handler.codec.spdy.SpdyCodecUtil.*;
|
||||||
|
@ -1,80 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 2012 The Netty Project
|
|
||||||
*
|
|
||||||
* The Netty Project 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.
|
|
||||||
*/
|
|
||||||
/*
|
|
||||||
* Copyright 2012 Twitter, Inc.
|
|
||||||
*
|
|
||||||
* Licensed 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 io.netty.handler.codec.spdy;
|
|
||||||
|
|
||||||
import static io.netty.handler.codec.spdy.SpdyCodecUtil.*;
|
|
||||||
|
|
||||||
import io.netty.buffer.ChannelBuffer;
|
|
||||||
import io.netty.handler.codec.compression.CompressionException;
|
|
||||||
import io.netty.util.internal.jzlib.JZlib;
|
|
||||||
import io.netty.util.internal.jzlib.ZStream;
|
|
||||||
|
|
||||||
class SpdyZlibDecoder {
|
|
||||||
|
|
||||||
private final byte[] out = new byte[8192];
|
|
||||||
private final ZStream z = new ZStream();
|
|
||||||
|
|
||||||
public SpdyZlibDecoder() {
|
|
||||||
int resultCode;
|
|
||||||
resultCode = z.inflateInit(JZlib.W_ZLIB);
|
|
||||||
if (resultCode != JZlib.Z_OK) {
|
|
||||||
throw new CompressionException("ZStream initialization failure");
|
|
||||||
}
|
|
||||||
z.next_out = out;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setInput(ChannelBuffer compressed) {
|
|
||||||
byte[] in = new byte[compressed.readableBytes()];
|
|
||||||
compressed.readBytes(in);
|
|
||||||
z.next_in = in;
|
|
||||||
z.next_in_index = 0;
|
|
||||||
z.avail_in = in.length;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void decode(ChannelBuffer decompressed) {
|
|
||||||
z.next_out_index = 0;
|
|
||||||
z.avail_out = out.length;
|
|
||||||
|
|
||||||
int resultCode = z.inflate(JZlib.Z_SYNC_FLUSH);
|
|
||||||
|
|
||||||
if (resultCode == JZlib.Z_NEED_DICT) {
|
|
||||||
resultCode = z.inflateSetDictionary(SPDY_DICT, SPDY_DICT.length);
|
|
||||||
if (resultCode != JZlib.Z_OK) {
|
|
||||||
throw new CompressionException("ZStream dictionary failure");
|
|
||||||
}
|
|
||||||
z.inflate(JZlib.Z_SYNC_FLUSH);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (z.next_out_index > 0) {
|
|
||||||
decompressed.writeBytes(out, 0, z.next_out_index);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -13,21 +13,6 @@
|
|||||||
* License for the specific language governing permissions and limitations
|
* License for the specific language governing permissions and limitations
|
||||||
* under the License.
|
* under the License.
|
||||||
*/
|
*/
|
||||||
/*
|
|
||||||
* Copyright 2012 Twitter, Inc.
|
|
||||||
*
|
|
||||||
* Licensed 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 io.netty.handler.codec.spdy;
|
package io.netty.handler.codec.spdy;
|
||||||
|
|
||||||
import java.util.zip.Deflater;
|
import java.util.zip.Deflater;
|
||||||
|
@ -110,25 +110,40 @@ public class ExecutionHandler implements ChannelUpstreamHandler, ChannelDownstre
|
|||||||
|
|
||||||
private final Executor executor;
|
private final Executor executor;
|
||||||
private final boolean handleDownstream;
|
private final boolean handleDownstream;
|
||||||
|
private final boolean handleUpstream;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Creates a new instance with the specified {@link Executor} which only handles upstream events.
|
||||||
|
* Specify an {@link OrderedMemoryAwareThreadPoolExecutor} if unsure.
|
||||||
|
*/
|
||||||
|
public ExecutionHandler(Executor executor) {
|
||||||
|
this(executor, false, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Use {@link #ExecutionHandler(Executor, boolean, boolean)}
|
||||||
|
*
|
||||||
|
* {@link Deprecated}
|
||||||
|
*/
|
||||||
|
@Deprecated
|
||||||
|
public ExecutionHandler(Executor executor, boolean handleDownstream) {
|
||||||
|
this(executor, handleDownstream, true);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates a new instance with the specified {@link Executor}.
|
* Creates a new instance with the specified {@link Executor}.
|
||||||
* Specify an {@link OrderedMemoryAwareThreadPoolExecutor} if unsure.
|
* Specify an {@link OrderedMemoryAwareThreadPoolExecutor} if unsure.
|
||||||
*/
|
*/
|
||||||
public ExecutionHandler(Executor executor) {
|
public ExecutionHandler(Executor executor, boolean handleDownstream, boolean handleUpstream) {
|
||||||
this(executor, false);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Creates a new instance with the specified {@link Executor}.
|
|
||||||
* Specify an {@link OrderedMemoryAwareThreadPoolExecutor} if unsure.
|
|
||||||
*/
|
|
||||||
public ExecutionHandler(Executor executor, boolean handleDownstream) {
|
|
||||||
if (executor == null) {
|
if (executor == null) {
|
||||||
throw new NullPointerException("executor");
|
throw new NullPointerException("executor");
|
||||||
}
|
}
|
||||||
|
if (!handleDownstream && !handleUpstream) {
|
||||||
|
throw new IllegalArgumentException("You must handle at least handle one event type");
|
||||||
|
}
|
||||||
this.executor = executor;
|
this.executor = executor;
|
||||||
this.handleDownstream = handleDownstream;
|
this.handleDownstream = handleDownstream;
|
||||||
|
this.handleUpstream = handleUpstream;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -154,7 +169,11 @@ public class ExecutionHandler implements ChannelUpstreamHandler, ChannelDownstre
|
|||||||
@Override
|
@Override
|
||||||
public void handleUpstream(
|
public void handleUpstream(
|
||||||
ChannelHandlerContext context, ChannelEvent e) throws Exception {
|
ChannelHandlerContext context, ChannelEvent e) throws Exception {
|
||||||
executor.execute(new ChannelUpstreamEventRunnable(context, e));
|
if (handleUpstream) {
|
||||||
|
executor.execute(new ChannelUpstreamEventRunnable(context, e));
|
||||||
|
} else {
|
||||||
|
context.sendUpstream(e);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
Loading…
Reference in New Issue
Block a user