Gerd Behrmann
a3f46b5359
Merge remote-tracking branch 'upstream/3' into feature/zerocopyframedecoder
2012-06-19 19:10:42 +02:00
Trustin Lee
7aceb7ae8e
Rename NativeZlibEncoder to JdkZlibEncoder
2012-06-19 09:55:41 +09:00
Trustin Lee
0bf9d24f65
Merge pull request #404 from jpinner/native_zlib_encoder
...
Use java.util.zip in HttpContentCompressor if possible
2012-06-18 15:59:12 -07:00
Jeff Pinner
db181f1120
Use java.util.zip in HttpContentCompressor if possible
2012-06-18 11:39:25 -07:00
Frédéric Brégier
e8595e9d87
Merge pull request #400 from fredericBregier/3
...
Damn ! Fix typo and type needed for fix #399 for issue #398
Sorry!
2012-06-15 10:42:56 -07:00
Frédéric Brégier
bab98ab969
Damn ! Fix typo and type needed for fix #399 for issue #398
2012-06-15 20:40:44 +03:00
Frédéric Brégier
6d29d2feb1
Merge pull request #399 from fredericBregier/3
...
Proposal to fix issue #398 by replacing transferTo by using loop on FileChannel
2012-06-15 03:04:34 -07:00
Frédéric Brégier
1f696fa2f1
Change back to FileChannel but by block
2012-06-15 11:04:22 +03:00
Frédéric Brégier
7c34781672
Proposal to fix issue #398 by replacing FileChannel.transferTo by manual loop to prevent usage of mmap unde the wood by the JVM, while the optimization will be less efficient.
2012-06-15 09:14:37 +03:00
norman
df11cfab25
Introduce a FrameDecoder.setMaxCumulationBufferCapacity(..) setter which allows to configure how bug the capacity of the cumulation buffer can be before the FrameDecoder tries to optimize memory usage with byte copies. Related to #390
...
This allows the users to set a threshold that matches best their needs. Use Integer.MAX_VALUE to disable copies at all at the cost of bigger memory usage.
2012-06-13 11:22:37 +02:00
norman
cb8fc7af4a
Use a different ThreadLocal for ChannelExecutionEvents to prevent false-positives on deadlock detection. See #387
2012-06-13 08:07:43 +02:00
Trustin Lee
fed2f640ee
serverID -> serverId ( #393 Ensure all fields follow naming convention)
2012-06-12 21:20:36 +09:00
Trustin Lee
c3e70186f8
StreamID -> StreamId ( #393 Ensure all fields follow naming convention)
2012-06-12 20:57:34 +09:00
Trustin Lee
95d8e782e3
ID -> Id ( #393 Ensure all fields follow our naming convention)
2012-06-12 20:31:45 +09:00
Trustin Lee
178d24a16d
Do not use the deprecated methods ( #393 )
2012-06-12 20:27:14 +09:00
Trustin Lee
9464396719
ID -> Id ( #393 Ensure all fields follow our naming convention)
2012-06-12 20:24:51 +09:00
Trustin Lee
d159a43a49
ID -> Id ( #393 Ensure all fields follow our naming convention)
2012-06-12 20:19:52 +09:00
Trustin Lee
a6f5af6116
Remove 'public' modifier which is unnecessary
2012-06-12 20:07:47 +09:00
Trustin Lee
65111fce1d
getPersist(ed) -> isPersist(ed) ( #393 )
2012-06-12 20:05:27 +09:00
Trustin Lee
b9906e94a3
Ensure all fields follow our naming convention ( #393 )
...
- Fix naming issues in SPDY
- For backward compatibility, the methods with bad names were deprecated
2012-06-12 18:05:50 +09:00
Gerd Behrmann
641e5368d0
Add ZeroCopyFrameDecoder
...
Copy of FrameDecoder that avoids copying partial frames to a cumulation
buffer. Instead buffers are kept on a list and composed to a
CompositeChannelBuffer when needed.
CompositeChannelBuffers's decomposite method conveniently allows buffers
from which all data was read to be discarded.
The documented interface stays compatible with FrameDecoder, however
undocumented behaviour used by ReplyDecoder and other subclasses has
changed. For this reason a new class was introduced rather than
modifying the existing FrameDecoder.
2012-06-11 17:11:59 +02:00
norman
c7a96c18d8
Remove unnecessary use of volatile in ChunkedInput implementations. See #389
2012-06-11 12:57:56 +02:00
norman
4776e6ae9f
Sorry.. bad revert "Revert "Merge branch '3' of ssh://github.com/netty/netty into 3""
...
This reverts commit 91accdc5e4
.
2012-06-11 12:49:32 +02:00
norman
91accdc5e4
Revert "Merge branch '3' of ssh://github.com/netty/netty into 3"
...
This reverts commit 7d8a6f9c8e
, reversing
changes made to 78da141c9d
.
2012-06-11 10:07:46 +02:00
norman
7d8a6f9c8e
Merge branch '3' of ssh://github.com/netty/netty into 3
2012-06-11 09:48:48 +02:00
Trustin Lee
51cca83d3e
Update the checkstyle rule
2012-06-09 04:19:46 +09:00
Norman Maurer
25109dd351
Exclude bin folder
2012-06-08 18:45:56 +02:00
Norman Maurer
3d3879d242
[maven-release-plugin] prepare for next development iteration
2012-06-08 18:18:23 +02:00
Norman Maurer
7fa8b8b3de
[maven-release-plugin] prepare release netty-3.5.0.Final
2012-06-08 18:18:16 +02:00
Norman Maurer
8f429cba47
@Ignore multicast tests
2012-06-08 18:08:16 +02:00
Trustin Lee
3fb5b9e105
Fit to 120 column (Done)
2012-06-08 21:02:11 +09:00
Trustin Lee
9479636bd6
Update Javadoc URLs
2012-06-08 20:22:42 +09:00
Trustin Lee
90a1bd6965
Fit to 120 columns (in progress)
2012-06-08 20:16:42 +09:00
Trustin Lee
255a0721bd
Upgrade to the latest checkstyle rules
2012-06-08 16:59:40 +09:00
Trustin Lee
6fce4539ad
CRLF -> LF / Remove trailing whitespace
2012-06-08 11:13:57 +09:00
Trustin Lee
6d647feb7e
Fix a problem where multicast test eats 100% CPU on test failure ( #373 )
...
- Proper resource cleanup fixed 100% CPU issue
- Using a loopback interface made the test pass
2012-06-08 08:59:28 +09:00
Norman Maurer
758b7dc793
Make sure calling ExecutionHandler.releaseExternalResource() does not lead to a dead-lock when calling from a ChannelEventRunnable. See #200
2012-06-07 15:40:00 +02:00
Norman Maurer
4e8c3638e1
Make sure multicast test use correct interface. This also fix #373
2012-06-07 15:27:43 +02:00
norman
78da141c9d
Add test for deadlock
2012-06-06 15:16:31 +02:00
norman
fc2049b5c7
Make sure we call super.
2012-06-06 11:47:44 +02:00
norman
4f81776e06
Notify ChannelFuture first on handshake() error. See #383
2012-06-06 08:47:31 +02:00
norman
784722eff4
Only parse the packet length one time per packet. See #382
2012-06-06 08:42:36 +02:00
Trustin Lee
977ce4e645
Update license headers
2012-06-04 13:35:22 -07:00
Norman Maurer
cec88160d4
Merge pull request #380 from jamestyrrell/3-new
...
Improve HTTP message streaming in decoder
2012-06-04 09:21:07 -07:00
norman
9b097ddea0
Skip test on windows as it may fail because of permission problems
2012-06-04 15:04:24 +02:00
norman
508edbfdcc
Add a testcase to prove that we have no bug in ChunkedWriteHandler when notify futures
2012-06-04 14:27:20 +02:00
norman
4a48419dc6
Merge branch '3' of ssh://github.com/netty/netty into 3
2012-06-04 13:45:48 +02:00
norman
a06b3a41e8
Move in correct package
2012-06-04 13:45:04 +02:00
James Tyrrell
78301f4ac6
Improved HTTP message streaming in HttpMessageDecoder
2012-06-03 21:29:43 +10:00
Trustin Lee
38314b5191
Fix #378 again
...
- @jroper's fix did not work, so I just fixed it again.
Conflicts:
src/main/java/org/jboss/netty/handler/codec/http/DefaultCookie.java
2012-06-02 23:08:43 -07:00