804 Commits

Author SHA1 Message Date
Joakim Erdfelt
fb3124359b Correcting error message 2017-06-15 13:45:44 -07:00
Joakim Erdfelt
76ace004b6 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-06-09 09:17:43 -07:00
Joakim Erdfelt
c85e50a83c Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x 2017-06-07 11:48:56 -07:00
Joakim Erdfelt
c1143fcc90 Issue #1603 - fixing NPE in WebSocketServerFactory init 2017-06-07 09:56:58 -07:00
Joakim Erdfelt
bc0fd4e1ef No more websocket test errors (need to work on issues) 2017-06-05 14:16:48 -07:00
Joakim Erdfelt
0ac5e569d4 Fixing merge problems with issue-207 -> master 2017-06-05 10:37:41 -07:00
Joakim Erdfelt
5d7e97993c Merge remote-tracking branch 'origin/master' into issue-207-master 2017-06-05 10:05:05 -07:00
Joakim Erdfelt
3e83908c58 Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-207 2017-06-05 10:02:01 -07:00
Simone Bordet
b953f8d2d0 Merged branch 'jetty-9.4.x' into 'master'. 2017-06-05 18:07:51 +02:00
Joakim Erdfelt
6a3c40e935 Updating to version 9.4.7-SNAPSHOT 2017-05-31 17:26:34 -07:00
Joakim Erdfelt
8ba0f2d95d Updating to version 9.4.6.v20170531 2017-05-31 16:22:52 -07:00
Joakim Erdfelt
0f98e607e8 Issue #1514 - fixing bad websocket dump output 2017-05-31 13:36:27 -07:00
Greg Wilkins
ab4d300ae7 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-05-30 17:43:19 +02:00
Greg Wilkins
78280d0595 Issue #1568 handle query strings with encoded characters 2017-05-24 09:22:16 +02:00
Joakim Erdfelt
296050dfc4 Issue #1568 - Fixing improper query encoding in WebSocket ServletUpgradeRequest 2017-05-23 10:32:22 -07:00
Joakim Erdfelt
1ba61e8e0c Issue #207 - removing scheduler 2017-05-15 13:38:45 -07:00
Joakim Erdfelt
04b6afe879 Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-207 2017-05-15 09:48:41 -07:00
Joakim Erdfelt
2043a923cf Issue #207 - All websocket tests moved to /websocket-tests/ module 2017-05-10 16:56:03 -07:00
Joakim Erdfelt
c2626cf1f2 Issue #207 - More test fixes 2017-05-03 16:59:54 -07:00
Joakim Erdfelt
782f36f157 Updating to version 9.4.6-SNAPSHOT 2017-05-02 14:29:09 -07:00
Joakim Erdfelt
9d8ad7489c Updating to version 9.4.5.v20170502 2017-05-02 13:22:18 -07:00
Greg Wilkins
68caf72835 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-05-01 13:30:41 +02:00
Joakim Erdfelt
002ba9cf00 Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-207
Conflicts:
	jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/AltFilterTest.java
	jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/LargeAnnotatedTest.java
	jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/LargeContainerTest.java
	jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/DecoratorsTest.java
	jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/TestABCase3.java
	jetty-websocket/websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/server/WebSocketCloseTest.java
2017-04-28 06:01:06 -07:00
Joakim Erdfelt
ae51344582 Issue #207 - Final removal of BlockheadClient 2017-04-27 11:21:04 -07:00
Joakim Erdfelt
0195812f18 Disabling more flaky tests that are fixed in issue-207 branch 2017-04-26 11:34:57 -07:00
Joakim Erdfelt
240b82be70 Disabling currently flaky tests that are fixed in issue-207 branch 2017-04-26 08:45:59 -07:00
Joakim Erdfelt
4c5dd93b30 Issue #1502 - Changing WSUF target creation used by PathMappings match 2017-04-24 16:08:37 -07:00
Joakim Erdfelt
849ad7c917 Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-207 2017-04-21 09:00:54 -07:00
Joakim Erdfelt
ce9cd8d168 Issue #207 - more testing updates 2017-04-21 09:00:30 -07:00
Joakim Erdfelt
a8d4c68bdc Issue #207 - Simplifying Connection and Close states
+ Removing IOState
+ Adding AtomicConnectionState
+ Adding AtomicClose
+ Reworking AbstractWebSocketConnection to be focused solely on
  low level Connection handling, with little to none websocket
  specifics.
+ WebSocketSession simplified
2017-04-14 16:19:05 -07:00
Joakim Erdfelt
92ea5bda21 Updating to version 9.4.5-SNAPSHOT 2017-04-14 14:43:36 -07:00
Joakim Erdfelt
3dc8f557c6 Updating to version 9.4.4.v20170414 2017-04-14 13:20:17 -07:00
Joakim Erdfelt
7e2e64e856 Issue #207 - testcase rework due to new async behaviors 2017-04-11 15:46:47 -07:00
Joakim Erdfelt
9620d5c5e8 Issue #207 - ongoing testing improvements 2017-04-07 16:24:12 -07:00
Joakim Erdfelt
9199ec8843 Issue #207 - Improved Error Handling 2017-04-07 14:30:15 -07:00
Joakim Erdfelt
9adbf2b361 Issue #207 - more work on policy / buffer behaviors 2017-04-07 12:03:05 -07:00
Joakim Erdfelt
893b153cb3 Issue #207 - initial pass through for Stream backpressure 2017-04-05 17:30:51 -07:00
Joakim Erdfelt
1360b863dc Updating to version 9.4.4-SNAPSHOT 2017-03-17 10:53:54 -07:00
Joakim Erdfelt
95e94b49d8 Updating to version 9.4.3.v20170317 2017-03-17 09:54:58 -07:00
Joakim Erdfelt
9273d99a99 Merge remote-tracking branch 'origin/jetty-9.4.x' into issue-207 2017-03-15 15:07:17 -07:00
Greg Wilkins
9ea4f128d4 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-03-09 15:59:58 +11:00
Joakim Erdfelt
6cf0663fe8 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2017-03-08 17:47:27 -07:00
Joakim Erdfelt
298de714f6 More windows build fixes 2017-03-08 15:29:54 -07:00
Joakim Erdfelt
acf743fa6b Issue #207 - Careful distinction between container policy, vs session policy 2017-02-28 13:05:29 -07:00
Joakim Erdfelt
523fab30bd Updating to version 9.4.3-SNAPSHOT 2017-02-20 08:13:31 -07:00
Joakim Erdfelt
4a674b9cc9 Updating to version 9.4.2.v20170220 2017-02-20 06:22:45 -07:00
Joakim Erdfelt
6adfa3c0a2 Fixing master tests (no longer need to specify Configuration) 2017-02-07 16:21:36 -07:00
Joakim Erdfelt
1338de9cfa Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-02-02 16:27:22 -07:00
Joakim Erdfelt
7f3ddf4edb Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-02-02 16:26:43 -07:00
Joakim Erdfelt
35b94fffd3 Improving touchy timeouts on slow machines 2017-02-02 16:25:42 -07:00