Greg Wilkins
7df281bb16
jetty-9 renamed ReadInterest to fillInterest
2012-08-03 12:47:33 +10:00
Greg Wilkins
29833f000b
Merge branch 'jetty-9' into jetty-9-oneconnector
...
Conflicts:
jetty-io/src/main/java/org/eclipse/jetty/io/AsyncByteArrayEndPoint.java
jetty-io/src/main/java/org/eclipse/jetty/io/ChannelEndPoint.java
jetty-io/src/main/java/org/eclipse/jetty/io/WriteFlusher.java
jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java
jetty-io/src/test/java/org/eclipse/jetty/io/WriteFlusherTest.java
2012-08-03 12:39:21 +10:00
Thomas Becker
88cc3bfdc6
Merge branch 'writeFlusher_refactoring' into jetty-9
2012-08-03 01:07:20 +02:00
Thomas Becker
137ccca7c5
jetty9 - Make WriteFlusher.java threadsafe
2012-08-03 01:06:41 +02:00
Greg Wilkins
5e6cd1b27f
Merge branch 'jetty-9' into jetty-9-oneconnector
...
Conflicts:
jetty-jmx/src/main/java/org/eclipse/jetty/jmx/ObjectMBean.java
jetty-jmx/src/test/java/org/eclipse/jetty/jmx/ObjectMBeanTest.java
2012-08-03 08:48:34 +10:00
Greg Wilkins
962a0d0889
jetty-9 ensure injected threadpool is managed
2012-08-03 08:44:49 +10:00
Joakim Erdfelt
57f16d750d
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
2012-08-02 15:25:33 -07:00
Joakim Erdfelt
9b49e889dd
Fixing big buffer flush issue (thanks simone)
2012-08-02 15:25:18 -07:00
Jesse McConnell
8d0ad9f3b0
fix array conversion on mbean info
2012-08-02 16:57:02 -05:00
Greg Wilkins
8366ae08c9
Merge branch 'jetty-9' into jetty-9-oneconnector
...
Conflicts:
jetty-jmx/src/test/java/org/eclipse/jetty/jmx/ObjectMBeanTest.java
2012-08-03 07:49:24 +10:00
Jesse McConnell
a945a30a37
remove lazy list usage and remove mbean container in simple test
2012-08-02 16:47:56 -05:00
Jesse McConnell
373526f8ca
proxied and managed methods are working with annotations, converted impl and test to use the 3 annotations in place of @Managed
2012-08-02 16:34:00 -05:00
Greg Wilkins
f6d84d9f91
Merge branch 'jetty-9' into jetty-9-oneconnector
2012-08-03 06:33:26 +10:00
Joakim Erdfelt
000657ddb5
Fixing various Parser bugs identified by test cases
...
+ Mask bytes were read backwards during slow parse
+ Bad continuation frame detection added
+ Bad fragmented data frame detection added
+ Correcting WebSocketFrame copy constructor and FIN bit
2012-08-02 13:02:54 -07:00
Joakim Erdfelt
01c40b5290
Fixing Parsing of masking bytes on slow testcase (would read in reverse order under certain conditions)
2012-08-02 10:31:37 -07:00
Joakim Erdfelt
e2dd62a3af
Trying to work out masking issue with parser
2012-08-02 10:13:07 -07:00
Joakim Erdfelt
a638bbb850
Trying to work out why masking occasionally barfs
2012-08-02 09:53:13 -07:00
Thomas Becker
a4018d3484
merge with jetty-9
2012-08-02 15:00:43 +02:00
Thomas Becker
4e94601619
jetty-9: Make WriteFlusher threadsafe.
2012-08-02 14:38:54 +02:00
Greg Wilkins
53696692ec
jetty-9 fixed managed lifecycles
2012-08-02 18:17:06 +10:00
Greg Wilkins
0865a9cfb0
jetty-9 removed more AsyncConnection names
2012-08-02 18:10:29 +10:00
Greg Wilkins
b63e09df61
jetty-9 rudimentary connectionFactory impl
2012-08-02 17:44:29 +10:00
Greg Wilkins
b52930be14
jetty-9 merged Async and non-Async classes for EndPoint and Connection
2012-08-02 16:08:49 +10:00
Greg Wilkins
2da412009e
jetty-9 one connector passing more tests
2012-08-02 14:55:26 +10:00
Greg Wilkins
a4da8f2323
Merge branch 'jetty-9' into jetty-9-oneconnector
2012-08-02 14:18:38 +10:00
Greg Wilkins
7c4fd9326e
jetty-9 one connector passing more tests
2012-08-02 14:17:49 +10:00
Joakim Erdfelt
a8a3bade33
Setting @Ignore on tests with issues ATM
2012-08-01 19:45:14 -07:00
Greg Wilkins
96b5c05674
jetty-9 one connector passing most tests
2012-08-02 11:51:54 +10:00
Greg Wilkins
d6ef039f2c
Merge branch 'jetty-9' into jetty-9-oneconnector
2012-08-02 08:15:19 +10:00
Greg Wilkins
56a2cedaa5
jetty-9 further work on oneconnector... passing more tests
2012-08-02 08:14:02 +10:00
Greg Wilkins
2a470631bf
Merge branch 'jetty-9' into jetty-9-oneconnector
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/ssl/SslSelectChannelConnector.java
2012-08-02 08:11:12 +10:00
Joakim Erdfelt
9e332c9255
Fixing StdErrLogTest failures introduced by latest thread id addition
2012-08-01 15:10:32 -07:00
Joakim Erdfelt
3621bec43c
More AB tests, and updates to Fuzzer
2012-08-01 13:11:24 -07:00
Joakim Erdfelt
2f4c86be35
Making Utf8StringBuilder actually throw a NotUtf8Exception in the case of an incomplete UTF8 sequence
2012-08-01 12:58:32 -07:00
Joakim Erdfelt
4b59767bd2
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
2012-08-01 10:47:05 -07:00
Joakim Erdfelt
07929fee88
Fleshing out more fragment tests
2012-08-01 10:46:15 -07:00
Joakim Erdfelt
7c742ee4e8
More AB tests around bad/reserved opcodes
2012-08-01 09:59:50 -07:00
Greg Wilkins
b2a8fc02dc
jetty-9 renaming and javadoc to improve the understandability of SslConnection
2012-08-01 15:53:03 +10:00
Joakim Erdfelt
ab89924261
Fleshing out more AB case 4 tests
2012-07-31 15:24:33 -07:00
Joakim Erdfelt
a97fe106f9
Reworking OpCode from enum to static class
2012-07-31 15:15:21 -07:00
Joakim Erdfelt
9a568514a6
More AB testing, reworked for Fuzzer
2012-07-31 12:52:22 -07:00
Simone Bordet
9a34c08b8e
Jetty9 - Removed unused fields.
2012-07-31 16:23:43 +02:00
Simone Bordet
08a8260978
Jetty9 - Added the thread id to the log statement tag.
2012-07-31 16:18:42 +02:00
Simone Bordet
78802c35c2
Jetty9 - SPDY: computing return value for write() and small optimization in fill().
2012-07-31 16:18:42 +02:00
Thomas Becker
a480e2c94d
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into writeFlusher_refactoring
2012-07-31 13:55:13 +02:00
Thomas Becker
377065fae7
interims changes
2012-07-31 13:51:19 +02:00
Greg Wilkins
50ac775bf5
jetty-9 added WriteFlusherTest
2012-07-31 19:07:25 +10:00
Greg Wilkins
acdc1c1abd
jetty-9 explain the sslConnection flush contract
2012-07-31 18:12:40 +10:00
Greg Wilkins
01529ba128
jetty-9 ignore all selector exceptions if not running, since closed selector exception is not an IOException
2012-07-31 14:55:06 +10:00
Greg Wilkins
e772e26b5b
jetty-9 synchronized writeflusher until correct non blocking impl
2012-07-31 14:54:22 +10:00