norman
|
2304913341
|
Merge branch 'master' of github.com:netty/netty
|
2012-02-21 08:28:01 +01:00 |
|
norman
|
2e36932097
|
Merge branch 'master' into remove_duplication
Conflicts:
transport/src/main/java/io/netty/channel/socket/nio/NioDatagramWorker.java
transport/src/main/java/io/netty/channel/socket/nio/NioWorker.java
|
2012-02-21 08:25:59 +01:00 |
|
Norman Maurer
|
aa3b3d4a5b
|
Merge pull request #198 from boldt/code-cleaning
Organized imports.
|
2012-02-20 23:05:34 -08:00 |
|
Dennis Boldt
|
b3cc305578
|
Organized imports.
|
2012-02-21 03:06:26 +01:00 |
|
Trustin Lee
|
a715220556
|
Fix a compilation error with the SCTP module in Mac
|
2012-02-20 16:04:46 -08:00 |
|
Trustin Lee
|
97b4876c08
|
Fix build errors with m2e
|
2012-02-20 16:01:28 -08:00 |
|
Norman Maurer
|
7bf049b1d4
|
Merge pull request #197 from echarles/master
Fix compilation issue due to jdk bug in older jdk versions
|
2012-02-20 02:56:00 -08:00 |
|
Eric Charles
|
bb6d140220
|
Fix compilation issue due to jdk bug Inference fails for type variable return constraint, see http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6302954
|
2012-02-20 10:28:40 +01:00 |
|
Norman Maurer
|
eafd8343eb
|
Remove some casting. See #186
|
2012-02-19 13:59:09 +01:00 |
|
Norman Maurer
|
c5582a14b8
|
Merge pull request #194 from jabley/patch-2
Fix checkstyle warning
|
2012-02-19 00:24:37 -08:00 |
|
Norman Maurer
|
ebc7ae8090
|
Merge pull request #193 from jabley/patch-1
Fix checkstyle warning
|
2012-02-19 00:23:29 -08:00 |
|
Jestan Nirojan
|
fe1d51f1d5
|
Merge pull request #185 from jestan/master
Merge SCTP Transport Testsuite with netty/master.
|
2012-02-19 00:03:41 -08:00 |
|
Jestan Nirojan
|
0bb1fe2656
|
Skipped SCTP Transport tests in the build (Java SCTP is only available for Linux and Solaris)
|
2012-02-19 13:30:24 +05:30 |
|
Jestan Nirojan
|
0148658bcc
|
Merge branch 'master' of github.com:jestan/netty
|
2012-02-19 12:40:30 +05:30 |
|
Jestan Nirojan
|
7dbb8d2b8f
|
fixed checkstyle build failures
|
2012-02-19 12:38:39 +05:30 |
|
Jestan Nirojan
|
20d7379c53
|
merge upstream master
|
2012-02-19 12:37:50 +05:30 |
|
James Abley
|
f3c1e143c1
|
Fix checkstyle warning
|
2012-02-18 23:22:52 +00:00 |
|
James Abley
|
6d8daabefe
|
Fix checkstyle warning
|
2012-02-18 23:19:45 +00:00 |
|
Norman Maurer
|
5557137dc0
|
Fix checkstyle
|
2012-02-18 23:03:13 +01:00 |
|
Norman Maurer
|
812a9026b8
|
Start to refactor nio transport to share more code. See #186
|
2012-02-18 23:02:56 +01:00 |
|
Norman Maurer
|
65be9ebd44
|
Start to refactor oio transport to share more code. See #186
|
2012-02-17 20:33:18 +01:00 |
|
norman
|
479def20bd
|
Check if logging level is enabled before log. See #192
|
2012-02-17 10:37:41 +01:00 |
|
Jestan Nirojan
|
6d7ab72479
|
Corrected protocol identifier in SCTP test cases
|
2012-02-17 02:00:38 +05:30 |
|
Jestan Nirojan
|
4b99c4f4f7
|
1)set the selector select timout values equals to tcp nio transport
2)removed unsupported sctp socket options from SctpChannelConfig classes
3)added testcases for sctp multi homing and multi streaming
|
2012-02-17 01:52:24 +05:30 |
|
Jestan Nirojan
|
97a38872f5
|
added separate bind method in client bootstrap, to support multi homing in sctp
|
2012-02-17 01:47:24 +05:30 |
|
norman
|
1b099acde0
|
Introduce a new interface that specify methods for ChannelConfig that
are used in the scope of NIO. This allows to share some code and make it
easier later to cast. See #186
|
2012-02-16 15:40:32 +01:00 |
|
norman
|
c46b083c1f
|
Correctly decode URI in QueryStringDecoder. See #189
|
2012-02-15 08:30:22 +01:00 |
|
Norman Maurer
|
4636309597
|
Fix HttpSnoopClient. See #183
|
2012-02-12 12:36:04 +01:00 |
|
Jestan Nirojan
|
22a37e548e
|
1)implemented defragmenting sctp frame decoder 2)implemented sctp netty testsuite
|
2012-02-12 11:42:14 +05:30 |
|
Jestan Nirojan
|
a298398630
|
added test timeout for SPDY echo test
|
2012-02-11 23:04:25 +05:30 |
|
Jestan Nirojan
|
fe3a480fb9
|
1)renamed sctp payload to sctp frame 2)added sctp codec, handler classes
|
2012-02-11 19:16:55 +05:30 |
|
Jestan Nirojan
|
a29d887c34
|
corrected sctp channel exception messages
|
2012-02-11 19:16:21 +05:30 |
|
Norman Maurer
|
9b563c8a28
|
SPDY Protocol HTTP Layer. See #184
|
2012-02-11 12:52:56 +01:00 |
|
Jestan Nirojan
|
71fd0231da
|
cleanedup the sctp notification handler
|
2012-02-10 23:45:04 +05:30 |
|
Jestan Nirojan
|
af943b7502
|
fixed sctp write buffer watermark count
|
2012-02-10 23:33:59 +05:30 |
|
Jestan Nirojan
|
a07a7e6e72
|
1)merge with upstream master multi module build 2)deleted outdated src dir
|
2012-02-08 00:15:02 +05:30 |
|
Jestan Nirojan
|
fd610f2f28
|
Merge remote branch 'upstream/master'
|
2012-02-08 00:04:03 +05:30 |
|
Trustin Lee
|
dd27cd510a
|
Use getHeader() instead of getHeaders()
|
2012-02-07 18:13:13 +09:00 |
|
Trustin Lee
|
29cafcf842
|
Upgrade to netty-build v6
|
2012-02-07 17:41:12 +09:00 |
|
Trustin Lee
|
3b31daf8a3
|
Fix missing copyright headers
|
2012-02-07 17:26:55 +09:00 |
|
Trustin Lee
|
ae3e3e5abe
|
Fix a problem with M2E plugin
|
2012-02-07 15:30:41 +09:00 |
|
Norman Maurer
|
bad9e83121
|
Merge pull request #177 from cgbystrom/websocketx-chunkaggregator-fix
Don't require HttpChunkAggregator to be present in pipeline for WS. See #177
|
2012-02-04 08:37:29 -08:00 |
|
Norman Maurer
|
58e6bec3b1
|
Merge SPDY support from 3.2 branch. See #176
|
2012-02-04 17:31:53 +01:00 |
|
Carl Byström
|
f7a4a646f8
|
Don't require HttpChunkAggregator to be present in pipeline for Web Sockets.
|
2012-02-04 16:59:04 +01:00 |
|
Norman Maurer
|
549546f944
|
Remove the child Executor with the right method so it will also work
when the channel is not the key.See #175
|
2012-02-03 15:50:36 +01:00 |
|
Norman Maurer
|
6689063eef
|
HttpMessageEncoder should add Header "Transfer-Encoding: chunked"
if HttpMessage.isChunked(). See #171
|
2012-02-02 15:24:30 +01:00 |
|
Trustin Lee
|
1f6e96ed15
|
Forward-port the pull request #172 to fix #164
|
2012-02-02 16:10:28 +09:00 |
|
Trustin Lee
|
cd69bd4e2c
|
Backport the pull request #174 to fix #163
|
2012-02-02 15:52:06 +09:00 |
|
Norman Maurer
|
9c0aa0cf13
|
FixedLengthFrameDecoder should used a optimizated initialSize when
creating the cumulative ChannelBuffer. See #170
|
2012-01-31 20:53:46 +01:00 |
|
Norman Maurer
|
02f49af3a1
|
Allow to @override the cumulative ChannelBuffer creation. See #169
|
2012-01-31 20:17:09 +01:00 |
|