Commit Graph

980 Commits

Author SHA1 Message Date
Joakim Erdfelt e46617ad8a Moving maskers from core to client, where it belongs 2012-09-17 14:38:27 -07:00
Joakim Erdfelt e0e8708932 Updating Fuzzer for ignoring broken pipe issues when appropriate 2012-09-17 14:04:33 -07:00
Simone Bordet 0a5d32eb2f jetty-9 - Removed unneeded 20 ms wait. 2012-09-17 21:49:19 +02:00
Simone Bordet 6e9567d410 jetty-9 - Using longer timeouts when expecting results. 2012-09-17 21:49:18 +02:00
Simone Bordet 92c95584fa jetty-9 - Set default timeout for expect() to be 5 s. 2012-09-17 21:49:18 +02:00
Joakim Erdfelt dc2a13602e Renaming DeflateFrameExtension in response to spec name change 2012-09-17 11:26:27 -07:00
Greg Wilkins 129583679a jetty-9 javadoc improvements and renamed SelectChannelConnector to ServerConnector 2012-09-17 17:37:56 +10:00
Joakim Erdfelt 515804a463 Fixing connection.onOpen() 2012-09-14 15:10:54 -07:00
Joakim Erdfelt 7ab495515a Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-09-14 14:41:09 -07:00
Joakim Erdfelt 5ebc784b45 cleaning up test logging output 2012-09-14 14:41:03 -07:00
Simone Bordet 88cbfed7e0 jetty-9 - Made SelectorManager.connection[Opened|Closed]() concrete, since they are overridden only by SelectChannelConnector. 2012-09-14 23:30:21 +02:00
Joakim Erdfelt 6ebd96e9bd Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-09-14 10:41:23 -07:00
Joakim Erdfelt c7404731c9 Starting removal of WebSocketPolicy.getBufferSize() 2012-09-14 10:41:11 -07:00
Greg Wilkins 22ba57b8d2 jetty-9 refactored onOpen and onClose 2012-09-14 17:38:47 +10:00
Jesse McConnell a8994178f5 [maven-release-plugin] prepare for next development iteration 2012-09-10 14:18:11 -05:00
Jesse McConnell 92180a9700 [maven-release-plugin] prepare release jetty-7.6.7.v20120910 2012-09-10 14:18:01 -05:00
Jesse McConnell 10e4027579 [maven-release-plugin] prepare for next development iteration 2012-09-10 13:59:34 -05:00
Jesse McConnell 57a6258f96 [maven-release-plugin] prepare release jetty-8.1.7.v20120910 2012-09-10 13:59:10 -05:00
Jesse McConnell 1ec8b2621b [maven-release-plugin] prepare release jetty-7.6.7.v20120910 2012-09-10 13:47:05 -05:00
Jesse McConnell 4180d7e1f5 prepare for release 2012-09-10 12:59:04 -05:00
Joakim Erdfelt 3ba074ecc8 Adding .STACKS=(boolean) support to StdErrLog configuration 2012-09-06 12:33:38 -07:00
Simone Bordet 7231c82b69 Merged branch 'jetty-9' into jetty-9-client. 2012-09-06 08:41:48 +02:00
Joakim Erdfelt 4f36513744 More work around close handshake testing 2012-09-04 14:53:34 -07:00
Jesse McConnell d37deeea74 [maven-release-plugin] prepare for next development iteration 2012-09-03 13:33:18 -05:00
Jesse McConnell b418b0dd57 [maven-release-plugin] prepare for next development iteration 2012-09-03 13:33:16 -05:00
Jesse McConnell 41e9b1f6e2 [maven-release-plugin] prepare release jetty-7.6.6.v20120903 2012-09-03 13:33:10 -05:00
Jesse McConnell 6c0b0af2fe [maven-release-plugin] prepare release jetty-8.1.6.v20120903 2012-09-03 13:33:08 -05:00
Greg Wilkins c3776764f4 jetty-9 ConcurrentScheduler refinements 2012-09-03 15:24:36 +10:00
Greg Wilkins 83dbca6553 jetty-9 reworked the schedulers 2012-08-31 13:22:58 +10:00
Simone Bordet 4de5b0ad63 Merged branch 'jetty-9' into jetty-9-client. 2012-08-30 17:24:49 +02:00
Greg Wilkins 353978726b jetty-9 reverted isHead change 2012-08-27 11:14:19 +10:00
Greg Wilkins cb5dd493fb jetty-9 merged jetty-9-aggregation 2012-08-27 10:24:34 +10:00
Greg Wilkins 726898ffd8 jetty-9 fixed after merged 2012-08-24 20:39:03 +10:00
Simone Bordet 171ad66962 Fixed compilation errors after merging branch 'jetty-9-aggregation' into jetty-9-spdy-http 2012-08-24 12:20:44 +02:00
Greg Wilkins 72bfacd5a4 Merge branch 'jetty-9' into jetty-9-aggregation 2012-08-24 20:17:08 +10:00
Simone Bordet 06b2de17d5 Merge branch 'jetty-9-aggregation' into jetty-9-spdy-http 2012-08-24 11:52:29 +02:00
Joakim Erdfelt afbaa78e66 Marking client tests appropriately 2012-08-23 16:12:17 -07:00
Joakim Erdfelt 28ae24fc35 Fixing testBlockReceiving 2012-08-22 11:06:57 -07:00
Simone Bordet dc140f85b7 Jetty9 - Refactored HttpChannel: moved connection logic back to HttpConnection. 2012-08-21 15:09:54 +02:00
Joakim Erdfelt 4ed72ad585 Fixing websocket-client issues around fillInterested on physical connection 2012-08-20 15:05:47 -07:00
Jesse McConnell 6ffaa478c4 standardize license headers 2012-08-17 16:09:49 -05:00
Joakim Erdfelt 6311976e86 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-08-17 13:48:22 -07:00
Joakim Erdfelt b36b41afd7 Fixing websocket-client upgrade connection -> websocket connection handling 2012-08-17 13:48:04 -07:00
Joakim Erdfelt 3d1d76d214 Merge from jetty-8 to jetty-9 (license header standarization) 2012-08-17 13:44:22 -07:00
Jesse McConnell 5de0cee1eb merge from master + license block standardization 2012-08-17 14:50:43 -05:00
Jesse McConnell 00ed549898 standardize license header blocks 2012-08-16 19:11:27 -05:00
Joakim Erdfelt 9c63ed975e Reworking client connection handling per discussion with simone 2012-08-14 09:44:21 -07:00
Joakim Erdfelt 1f78fc6250 Attempting to get client connection working 2012-08-13 13:59:46 -07:00
Simone Bordet 136f7924fd Jetty9 - Refactored usage of components that were using custom stop timeout to use the get/setStopTimeout() methods inherited from AbstractLifeCycle. 2012-08-10 19:02:16 +02:00
Joakim Erdfelt b37da5a5da Making payload fast-fail and demasking work together in peace and harmony 2012-08-09 13:17:07 -07:00
Greg Wilkins 03ebcc881c jetty-9 include more modules 2012-08-09 19:31:50 +10:00
Joakim Erdfelt 889d20ba55 Removing throws IOException on WSConnection.close() 2012-08-08 12:42:57 -07:00
Joakim Erdfelt 0abb7511ff Refactoring websocket.io.RawConnection to websocket.api.BaseConnection.
+ Introducing BaseConnection.SuspendToken and suspend/resume logic for
  working with buffer suspended read concerns.
2012-08-08 12:30:12 -07:00
Joakim Erdfelt 1a62c5ded6 Fixing websocket example to use creator 2012-08-08 08:31:44 -07:00
Greg Wilkins 9c9668b112 ported websocketchat to new API 2012-08-08 16:08:47 +10:00
Greg Wilkins 32c5f6c093 jetty-9 reduced LazyList usage 2012-08-08 11:58:50 +10:00
Joakim Erdfelt 7ebab746fe Reworking stream vs simple message appending into single concept.
+ Removing StreamAppender
+ Adding MessageAppender
+ Gain fast-fail on bad UTF8 in text message
2012-08-07 12:16:53 -07:00
Joakim Erdfelt d76a5ce80e Fixing testcase 7.5.1 (bad utf8 close reason) handling 2012-08-07 09:53:33 -07:00
Joakim Erdfelt 365f4d8448 Adding TestABCase9 with @Stress enabled 2012-08-06 13:55:55 -07:00
Joakim Erdfelt b8fc39a53e Adding the AB7 close test cases 2012-08-06 10:18:16 -07:00
Joakim Erdfelt e04bb3128c Refactoring out the basic good/bad UTF tests from TestABCase6 into separate parameterized test cases 2012-08-06 08:36:41 -07:00
Joakim Erdfelt 33270eced5 More valid UTF8 text payload edge cases 2012-08-03 12:49:03 -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
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 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 9b49e889dd Fixing big buffer flush issue (thanks simone) 2012-08-02 15:25:18 -07: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
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 a4da8f2323 Merge branch 'jetty-9' into jetty-9-oneconnector 2012-08-02 14:18:38 +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
Joakim Erdfelt 3621bec43c More AB tests, and updates to Fuzzer 2012-08-01 13:11:24 -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
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
Joakim Erdfelt 7d2d40dc2b Fixing PING vs CLOSE ordering issues with outgoing queue 2012-07-30 14:51:34 -07:00
Joakim Erdfelt 30ae8370bd Fixing BlockheadClient and reading of frames 2012-07-30 12:40:01 -07:00
Joakim Erdfelt f34d74ec84 Some logging rework/repair 2012-07-30 12:39:30 -07:00
Joakim Erdfelt 9999db9c94 Fixing WebSocketAsyncConnection close/read logic to prevent unstoppable QTP threads 2012-07-30 09:54:45 -07:00
Joakim Erdfelt da2b457eaa Fixing compile issue 2012-07-30 05:38:51 -07:00
Joakim Erdfelt c2aae7c517 Attempting to come to grips with proper close/disconnect/stop/cleanup 2012-07-27 13:48:34 -07:00
Joakim Erdfelt f2c86b2d00 Adding close validation to TestABCase1 2012-07-27 10:52:46 -07:00
Joakim Erdfelt 99afabdf92 Finished fleshing out TestABCase1 2012-07-27 10:24:35 -07:00
Joakim Erdfelt 47f882e6dc Fixing various things around generate/parse of windowed fragments.
+ @WebSocket annotation's policy configuraiton is now optional
+ WebSocketPolicy.clonePolicy() fixed for other fields
+ WebSocketEventDriver now has internal WebSocket POJO specific logger
  to allow for logging control of the WebSocket POJO itself in case of
  runtime exceptions.
+ WebSocketEventDriver now honors bufferSize correctly.
+ DataFrameBytes always requests windowSize from generator, allowing
  generator to determine ultimate byteBuffer utilization itself.
+ MessageInputStream / MessageReader now clears the starting buffer
+ Generator now honors windowSize correctly (even if buffer obtained
  from ByteBufferPool.acquire() is much larger
+ Parser now demasks the payload after a successful parse of the framing
+ Various testing cleanup to produce less noisy output during testing.
2012-07-27 09:41:26 -07:00
Joakim Erdfelt cbcb76eaea More spec tests from server point of view 2012-07-26 15:45:54 -07:00
Joakim Erdfelt db2570c2ee 380928 - Implement new websocket close code 2012-07-26 10:30:12 -07:00
Joakim Erdfelt b3db5ffc8d Fixing websocket-server tests 2012-07-25 11:49:04 -07:00