Commit Graph

5007 Commits

Author SHA1 Message Date
Jesse McConnell 6c0bb390ae adding in some more test cases which now include the MBeanContainer 2012-08-03 16:05:04 -05:00
Joakim Erdfelt 33270eced5 More valid UTF8 text payload edge cases 2012-08-03 12:49:03 -07:00
Joakim Erdfelt a18e28d767 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-08-03 12:35:33 -07:00
Joakim Erdfelt a6d88f0d0f Adding more Invalid UTF8 text payload tests 2012-08-03 12:35:16 -07:00
Joakim Erdfelt 951b669ba9 Adding more UTF8 text payload tests 2012-08-03 12:00:10 -07:00
Thomas Becker d4d41fb877 jetty9 - fix WriteFlusherTest.testConcurrentAccessToIncompleteWriteAndOnFail() 2012-08-03 19:56:00 +02:00
Thomas Becker 3187fe00fe Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-08-03 19:28:06 +02:00
Thomas Becker 5743483f9c jetty9 - WriteFlusher.PendingState._buffers is final now 2012-08-03 19:27:35 +02:00
Simone Bordet b1bb418fea Jetty9 - SPDY cleanups. 2012-08-03 19:17:11 +02:00
Thomas Becker 103dcd7131 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-08-03 19:12:27 +02:00
Thomas Becker 90112965b6 jetty9 - SelectChannelEndPoint.toString() fix 2012-08-03 19:10:21 +02:00
Simone Bordet 433839bd47 Jetty9 - Introduced ConnectionFactory for SelectChannelConnector.
This change abstracts out the connection creation from the connector itself,
so there can be only one connector managing all protocols, depending on
the configuration of the connection factories.
2012-08-03 19:10:21 +02:00
Thomas Becker 9f2d1586ca jetty9 - WriteFlusher minor changes. Some ConcurrentTests for WriteFlusher added. Cleanup. Javadoc. 2012-08-03 19:10:18 +02:00
Joakim Erdfelt 744bd20a44 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-08-03 09:37:58 -07:00
Simone Bordet e3132d41d8 Jetty9 - Introduced ConnectionFactory for SelectChannelConnector.
This change abstracts out the connection creation from the connector itself,
so there can be only one connector managing all protocols, depending on
the configuration of the connection factories.
2012-08-03 18:35:34 +02:00
Joakim Erdfelt 03521a9a99 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-08-03 08:49:53 -07:00
Joakim Erdfelt 65cb453080 Attempting to come to terms with EofException condition 2012-08-03 08:49:48 -07:00
Greg Wilkins 2d7b6c9c06 jetty-9 some post simone review changes to WriteFlusher 2012-08-03 19:41:56 +10:00
Jan Bartel 42583e2397 Merge remote-tracking branch 'origin/master' into jetty-8 2012-08-03 19:26:53 +10:00
Jan Bartel 7b61f5f04d JETTY-1501 Setting custom error response message changes page title 2012-08-03 19:22:58 +10:00
Jan Bartel c0dd05683b Merge remote-tracking branch 'origin/master' into jetty-8 2012-08-03 17:25:24 +10:00
Jan Bartel 3f07564274 379423 Jetty URL Decoding fails for certain international characters 2012-08-03 17:20:58 +10:00
Greg Wilkins 99a4b5955f jetty-9 more common code in AbstractEndPoint 2012-08-03 15:51:21 +10:00
Greg Wilkins 40d4e1070f jetty-9 renamed ReadInterest to fillInterest 2012-08-03 12:49:37 +10:00
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 c998abc8bc JETTY-1527 handle requests with URIs like http://host (ie no / ) 2012-08-02 19:03:40 +10: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