Commit Graph

2457 Commits

Author SHA1 Message Date
Joakim Erdfelt 31705767f0 Enabling more websocket tests 2017-06-21 07:56:48 -07:00
Joakim Erdfelt 4f2c31867e Turning down logging level 2017-06-20 13:43:21 -07:00
Joakim Erdfelt d7483934a0 Correcting dumps to only occur during DEBUG 2017-06-20 13:42:53 -07:00
Joakim Erdfelt 157fc4140b Fixing WebSocket MessageReceivingTest 2017-06-20 13:40:30 -07:00
Joakim Erdfelt d0513ecbe6 Restoring JSR356 Session.setMax*MessageBufferSize() spec behavior 2017-06-20 13:40:05 -07:00
Joakim Erdfelt b7959456fb Removing bad log silencing technique 2017-06-20 13:39:27 -07:00
Joakim Erdfelt 03afcc8487 Hightlighting double-close issue better in logs 2017-06-20 09:55:48 -07:00
Joakim Erdfelt 8d18118688 Reader-Self not relevant, removing 2017-06-20 09:55:21 -07:00
Joakim Erdfelt 5638f7b25b Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-06-16 14:33:01 -07:00
Joakim Erdfelt 9e0fd7faa0 Issue #1625 - Support new IANA declared websocket close status codes 2017-06-16 14:23:29 -07:00
Joakim Erdfelt d8775c77d9 Issue #1616 - Making test more reliable 2017-06-15 13:36:03 -07:00
Joakim Erdfelt c496dd7961 Testing / UntrustedWSServer improvements 2017-06-15 13:35:40 -07:00
Joakim Erdfelt e1ebcdaf18 Correcting error message 2017-06-15 13:34:17 -07:00
Joakim Erdfelt fc15da79d4 Issue #1616 enabling debug output for CI testing 2017-06-14 16:19:44 -07:00
Joakim Erdfelt 08962366ee Disabling test in master 2017-06-14 16:18:18 -07:00
Joakim Erdfelt d02a14eeed WebSocket SuspendResume updated tests and notes from review 2017-06-14 11:14:59 -07:00
Joakim Erdfelt 7786d0fc2b WebSocket Client sending Close/ProtocolError should also see onError 2017-06-14 10:01:01 -07:00
Joakim Erdfelt b31de636b4 Squelching Stacktraces 2017-06-14 08:43:10 -07:00
Joakim Erdfelt 272679b39c Reviewing more @Ignore'd WebSocket tests 2017-06-13 14:23:09 -07:00
Joakim Erdfelt 00beb607fc Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-06-13 10:40:02 -07:00
Joakim Erdfelt bd751b6ce2 Issue #1599 - WebSocketClient early close scenarios
+ Connection timeout results in:
  endpoint.onError(WebSocketTimeoutException)
  localSession.close(SHUTDOWN)
2017-06-13 09:47:44 -07:00
Joakim Erdfelt 67022482e5 Issue #1605 - common executor and bufferpool for jsr356 client 2017-06-12 09:23:23 -07:00
Joakim Erdfelt 76ace004b6 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-06-09 09:17:43 -07:00
Joakim Erdfelt caff2b932d Issue #1605 - restoring default behavior of ContainerProvider.getWebSocketContainer()
+ Allowing users to reconfigure JettyClientContainerProvider to restore
  the Jetty 9.4.x behavior for singletons and ServerContainer behaviors
2017-06-07 14:16:16 -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 064c1bc39a Issue #1604 - WebSocketContainer stop is now smarter 2017-06-07 11:48:36 -07:00
Joakim Erdfelt c1143fcc90 Issue #1603 - fixing NPE in WebSocketServerFactory init 2017-06-07 09:56:58 -07:00
Joakim Erdfelt 0e5af3cc28 Reduce testing noise 2017-06-06 14:48:38 -07:00
Joakim Erdfelt ccea772fc3 Disabling problematic test temporarily 2017-06-06 08:42:44 -07:00
Greg Wilkins ad76aa6c65 Issue #1503 Optionally strip IPv6. Default true 2017-06-06 17:07:14 +02:00
Joakim Erdfelt 059aa3cbe0 Adding more leniency on connection fault tests 2017-06-05 16:24:53 -07:00
Joakim Erdfelt 88106fd355 WebSocket test fix 2017-06-05 14:26:53 -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 f98b4bd087 Fixing javadoc error 2017-06-05 11:16:45 -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
Joakim Erdfelt 99fbc30f92 Issue #207 - Close Handshake Test refactor 2017-06-05 09:48:07 -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
Joakim Erdfelt 8ca70c691c Issue #1569 - relaxing WebSocketPolicy.setMax*MessageSize checks
+ Allow setting of the max (binary|text) message size to -1 to
  have unconstrained message sizes.
+ Disconnect message size from buffer size in JSR356 Session calls
2017-05-31 13:06:36 -07:00
Joakim Erdfelt 79b822339c Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-05-31 06:18:40 -07:00
Greg Wilkins 32bc9292a2 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-05-31 11:56:47 +02:00
Joakim Erdfelt 355f4ed7f3 Removing redundant new URI 2017-05-30 12:16:10 -07:00
Joakim Erdfelt ae496051de Fixing confusing wss -> https case 2017-05-30 12:15:01 -07:00
Greg Wilkins ab4d300ae7 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-05-30 17:43:19 +02:00
Greg Wilkins 50500ac99d Issue #1568 handle query strings with encoded characters 2017-05-24 23:03:22 +02:00
Greg Wilkins 78280d0595 Issue #1568 handle query strings with encoded characters 2017-05-24 09:22:16 +02:00
Joakim Erdfelt 4731470188 Issue #1568 - fixing accidental NPE with no query 2017-05-23 11:59:39 -07:00
Joakim Erdfelt 296050dfc4 Issue #1568 - Fixing improper query encoding in WebSocket ServletUpgradeRequest 2017-05-23 10:32:22 -07:00
Greg Wilkins d3e50f8f80 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-05-22 23:37:51 +02:00
Joakim Erdfelt e3bab3df22 Issue #1528 - Use WebSocketContainer out of current context
+ Interrogate ServletContext, ContextHandler, and Context
  for an active ServerContainer before returning a new ClientContainer
2017-05-19 13:50:40 -07:00
Joakim Erdfelt e001fe0355 Issue #1528 - pull preconfigured HttpClient from attributes
+ Search ServletContext attributes first
+ Search Server attributes next
2017-05-19 08:27:53 -07:00
Joakim Erdfelt 7b2a0e380d Using ThreadClassLoaderScope 2017-05-18 16:13:16 -07:00
Joakim Erdfelt 75101dfa0c Issue #1528 - WebSocketClient can use jetty-websocket-httpclient.xml
+ Will use XML resource (if jetty-xml is present, and resource found)
  to load the HttpClient configuration that should be used by the
  new WebSocketClient() instance.
2017-05-18 15:06:22 -07:00
Joakim Erdfelt 9b4bfbc680 Issue #1544 - Identifying context that JSR-356 was disabled for in configuration 2017-05-18 14:03:16 -07:00
Joakim Erdfelt 1ba61e8e0c Issue #207 - removing scheduler 2017-05-15 13:38:45 -07:00
Joakim Erdfelt 4e2f6265eb Issue #207 - stabilizing testcase 2017-05-15 13:16:54 -07:00
Joakim Erdfelt 77252270ff Post-merge cleanup 2017-05-15 10:06:47 -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 873c3554e7 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-05-12 14:06:21 -07:00
Joakim Erdfelt 016cbfa5f4 Issue #207 - UntrustedWSServlet should have a slightly higher then default max message size 2017-05-11 13:26:03 -07:00
Joakim Erdfelt 2ed56d4142 Issue #207 - Improved testing reliability 2017-05-11 13:20:31 -07:00
Joakim Erdfelt 5701de4fd8 Issue #207 - Improved Close notification and testing 2017-05-11 11:07:41 -07:00
Joakim Erdfelt 92741b2116 Issue #207 - Adding toString() 2017-05-11 10:59:32 -07:00
Joakim Erdfelt 6cfcbeffad Issue #207 - Identify non-echo client endpoint options for testing 2017-05-11 10:59:16 -07:00
Joakim Erdfelt e84e875e14 Issue #207 - Change in test expectation 2017-05-11 10:57:31 -07:00
Joakim Erdfelt c75e3c19d9 Issue #1516 - making WebSocket started thread pools have identifying names 2017-05-11 09:52:02 -07:00
Joakim Erdfelt b1f8f492b9 Issue #207 - better client connect/upgrade error handling 2017-05-11 07:06:18 -07:00
Joakim Erdfelt 500ae69409 Issue #207 - stabilizing testing of Dispatched MessageSinks 2017-05-11 06:05:37 -07:00
Greg Wilkins cbe857de01 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-05-11 10:08:36 +02:00
Joakim Erdfelt 27f03dbc25 Issue #207 - test compilation fix 2017-05-10 18:12:31 -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 2679715a30 Silencing bogus JSR356 IdleTimeoutTest warning 2017-05-10 12:13:24 -07:00
Joakim Erdfelt 427408c251 JSR356 ClientContainer testing fix 2017-05-10 09:48:51 -07:00
Joakim Erdfelt a7b164e6b9 Fixing JSR356 Client tests 2017-05-10 07:46:56 -07:00
Joakim Erdfelt f1a89ce3b2 Issue #207 - MessageOutputStream fix 2017-05-09 17:17:07 -07:00
Joakim Erdfelt 869ccf4421 Issue #207 - javadoc fix 2017-05-09 15:27:15 -07:00
Joakim Erdfelt 753ed9e603 Issue #1516 - Delay starting of WebSocketClient 2017-05-09 12:58:22 -07:00
Joakim Erdfelt 4bae04b623 Issue #207 - cleaning up dispatched MessageSink threading 2017-05-09 12:20:46 -07:00
Joakim Erdfelt d0c7f822f7 Issue #207 - CommonEndpointFunctionsTest needs started WebSocketContainerScope 2017-05-08 07:18:58 -07:00
Joakim Erdfelt 546ccf5814 Issue #207 - testing JsrSessionTest needs started ClientContainer 2017-05-08 07:16:36 -07:00
Joakim Erdfelt d1281565ff Issue #207 - testing JsrEndpointFunctions need started ClientContainer 2017-05-08 07:15:03 -07:00
Joakim Erdfelt b73b531d62 Issue #207 - Restoring fillAndParse callback 2017-05-08 05:19:11 -07:00
Joakim Erdfelt 55e435c741 Issue #207 - more test fixes 2017-05-05 12:37:44 -07:00
Joakim Erdfelt 3b31ecc2b1 Issue #207 - more test induced fixes 2017-05-04 13:37:29 -07:00
Joakim Erdfelt c2626cf1f2 Issue #207 - More test fixes 2017-05-03 16:59:54 -07:00
Joakim Erdfelt e36ffe1f86 Issue #207 - more testing updates and mainline code fixes 2017-05-02 17:06:53 -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 89f76e0037 Issue #207 - simplifying OnUpgradeTo prefill + parse, with test 2017-04-28 17:11:56 -07:00
Joakim Erdfelt e200f66ded Issue #207 - removing ignoreBrokenPipe 2017-04-28 13:18:13 -07:00
Joakim Erdfelt a2a2aac6ad Issue #207 - websocket-client test cleanup 2017-04-28 13:17:04 -07:00
Joakim Erdfelt 94182b7134 Issue #207 - common test cleanup 2017-04-28 13:16:43 -07:00
Joakim Erdfelt 081663e522 Issue #207 - more test fixes 2017-04-28 09:41:58 -07: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 56fac5fdb1 Issue #207 - more test failure fixes 2017-04-27 16:26:32 -07:00
Joakim Erdfelt d216206fcd Issue #207 - Adding missing JSR356 Server @PathParam ArgIdentifier 2017-04-27 13:18:14 -07:00
Joakim Erdfelt ae51344582 Issue #207 - Final removal of BlockheadClient 2017-04-27 11:21:04 -07:00
Joakim Erdfelt 7f345fc2d4 Issue #207 - Removing BlockheadServer 2017-04-26 18:25:06 -07:00
Joakim Erdfelt 641d051e97 Issue #207 - moved some JSR356 tests to websocket-tests 2017-04-26 18:13:56 -07:00
Joakim Erdfelt e276705948 Issue #207 - moved client tests to websocket-tests 2017-04-26 16:01:07 -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 ee6d495af4 Issue #207 - fixing javadoc 2017-04-25 12:41:16 -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 38e0976513 Issue #207 - allowing untrusted sessions to have non-validating generators 2017-04-21 17:21:47 -07:00
Joakim Erdfelt 6e797f5e7d Issue #207 - websocket-common test fixes 2017-04-21 16:39:27 -07:00
Joakim Erdfelt 683509be60 Issue #207 - more review rework 2017-04-21 16:21:07 -07:00
Joakim Erdfelt f9e2f5f96e Merge remote-tracking branch 'origin/jetty-9.4.x-websocket-review' into issue-207
Conflicts:
	jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/FrameFlusher.java
2017-04-21 09:04:56 -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
Greg Wilkins ca2423985c tidy up close 2017-04-21 17:14:26 +10: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 d2d5c0e4a4 Issue #207 - improve port handling in URI conversions 2017-04-11 09:11:53 -07:00
Joakim Erdfelt 9620d5c5e8 Issue #207 - ongoing testing improvements 2017-04-07 16:24:12 -07:00
Joakim Erdfelt 2d01d1431a Issue #207 - fixing compilation error 2017-04-07 14:34:35 -07:00
Joakim Erdfelt 9199ec8843 Issue #207 - Improved Error Handling 2017-04-07 14:30:15 -07:00
Joakim Erdfelt c59afd70f0 Issue #207 - remove IncomingFrames#incomingError(throwable) 2017-04-07 13:20:50 -07:00
Joakim Erdfelt 9adbf2b361 Issue #207 - more work on policy / buffer behaviors 2017-04-07 12:03:05 -07:00
Joakim Erdfelt 73ca336014 Issue #207 - reworking I/O to allow streaming backpressure 2017-04-06 15:58:35 -07:00
Joakim Erdfelt f2c09d5388 Issue #207 - removing unused section 2017-04-06 12:23:59 -07:00
Joakim Erdfelt 893b153cb3 Issue #207 - initial pass through for Stream backpressure 2017-04-05 17:30:51 -07:00
Greg Wilkins dd084b4e74 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-03-30 17:20:22 +11:00
Joakim Erdfelt b8ddef08d6 Merge remote-tracking branch 'origin/release-9.4.3' into jetty-9.4.x 2017-03-22 09:31:44 -07:00
dreis2211 83fbd5bf0d Issue #1411 - Use short-circuit operator in websocket Frame
Signed-off-by: dreis2211 <christoph.dreis@freenet.de>
2017-03-19 19:31:36 +01: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
Stefan Schmidt ab5e94f86b Fixing system locale dependent test
Signed-off-by: Stefan Schmidt <stefanschmidt@web.de>
2017-03-11 12:22:02 +01:00
Joakim Erdfelt 01d539e2be Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-03-09 14:20:19 -07:00
Joakim Erdfelt 1eeac2af6b Fixing test 2017-03-09 14:17:05 -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 f6b4b7b3e3 Issue #207 - Cleaning up Args vs Signature classes 2017-03-07 14:33:12 -07:00
Joakim Erdfelt daf79bf4a9 Issue #207 - adding addMessageHandler(<lambda>) tests 2017-03-07 12:45:41 -07:00
Greg Wilkins 05f05520eb Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-03-07 07:55:36 +11:00
Greg Wilkins 64c2529fb9 fixed merge 2017-03-06 15:00:14 +11:00
Greg Wilkins 0a2da4822d Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-03-06 14:20:23 +11:00
Joakim Erdfelt 261f83f8cd Issue #329 - Removing unused WS classes 2017-03-01 10:40:45 -07:00
Joakim Erdfelt 11b6e8ab49 Issue #609 - fixing testcase 2017-03-01 09:57:23 -07:00
Joakim Erdfelt d34f126ecb Issue #207 - Cannot catch PING in JSR356 2017-02-28 15:44:08 -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 0316e18f91 Issue #207 - working @PathParam support 2017-02-23 15:38:57 -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
Joakim Erdfelt c5c7be2bc5 Merge branch 'jetty-9.4.x' 2017-02-02 16:23:13 -07:00
Joakim Erdfelt 5e57b9562f Merge branch 'jetty-9.3.x' into jetty-9.4.x 2017-02-02 16:14:10 -07:00
Joakim Erdfelt 9a8f22d5dd Testing Updates
+ Upgrading to jetty-test-helper 4.0
+ Removing use of org.eclipse.jetty.toolchain.test.SimpleRequest
+ Removing use of org.eclipse.jetty.toolchain.test.http.SimpleHttpParser
+ Removing use of org.eclipse.jetty.toolchain.test.http.SimpleHttpResponse
+ Updating long since deprecated (and now removed) known quirky methods
  in jetty-test-helper and the test classes.
2017-02-02 15:51:38 -07:00
Jesse McConnell d0c33ebe8b Updating to version 9.4.2-SNAPSHOT 2017-01-20 10:49:06 -06:00
Jesse McConnell 556ecbcdcf Updating to version 9.4.1.v20170120 2017-01-20 09:47:53 -06:00
Jesse McConnell 66b43ecda8 Updating to version 9.3.17-SNAPSHOT 2017-01-20 09:33:43 -06:00
Jesse McConnell df03355d00 Updating to version 9.3.16.v20170120 2017-01-20 09:06:48 -06:00
Simone Bordet 84b57c5f07 Merged branch 'jetty-9.4.x' into 'master'. 2017-01-20 12:32:18 +01:00
Simone Bordet ee17396cee Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2017-01-20 12:27:29 +01:00
Simone Bordet 9ae93c19ca Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2017-01-20 12:20:21 +01:00
Simone Bordet 51f68dc57e Issue #1229 - ClassLoader constraint issue when using NativeWebSocketConfiguration with WEB-INF/lib/jetty-http.jar present.
Introduced String-based APIs to specify mappings, to avoid the
classloader issue.
2017-01-20 11:34:29 +01:00
Simone Bordet a205fb3aae Fixes #1276 - Remove org.eclipse.jetty.websocket.server.WebSocketServerFactory from SPI. 2017-01-20 09:55:01 +01:00
Simone Bordet cef2ff9522 Happy New Year 2017. 2017-01-19 19:31:53 +01:00
Simone Bordet 0c8273f2ca Happy New Year 2017. 2017-01-19 19:26:41 +01:00
Simone Bordet 07838b057f Happy New Year 2017. 2017-01-19 18:54:03 +01:00
Simone Bordet 347c48d657 Revert "resolve merge and update license headers"
This reverts commit 53b31b03dd, reversing
changes made to 4565c186d7.
2017-01-19 18:26:43 +01:00
Jesse McConnell 53b31b03dd resolve merge and update license headers 2017-01-19 09:33:16 -06:00
Jesse McConnell ce3e6dafec update license headers to 2017 2017-01-19 09:30:00 -06:00
Simone Bordet b7b3dfdc77 Merged branch 'jetty-9.4.x' into 'master'. 2017-01-12 17:53:09 +01:00
Simone Bordet 11d669092a Issue #1073 - JDK9 support in Jetty 9.3.x.
* Updated Maven plugins to versions that support JDK 9.
* Added jdk9 profiles to the build files.
* Introduced modules jetty-alpn-java-client and jetty-alpn-java-server
containing a pure JDK 9 implementation of ALPN.
* Wired ALPN connection factories (client and server) to use the proper
ALPN implementation based on the JDK platform version (8 or 9).
2017-01-12 15:41:02 +01:00
Greg Wilkins 611e79945c Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-01-11 18:10:50 +11:00
Joakim Erdfelt 7e3d3604ac Merge pull request #1219 from violetagg/ws-suspend-resume
Issue #1218 - When resuming a suspended connection do not register a …
2017-01-10 17:24:12 -04:00
Joakim Erdfelt 487748cd8f Issue #1207 - Making EventDriver use WebSocketContainerScope instead 2017-01-10 16:27:49 +01:00
Joakim Erdfelt 25a1864de7 Issue #1229 - Adding testcase for WAR (expanded) with WEB-INF/lib/jetty-http.jar 2017-01-10 11:12:14 -04:00
Simone Bordet a51f800054 Merged branch 'jetty-9.4.x' into 'master'. 2017-01-10 15:07:26 +01:00
Violeta Georgieva eaa51be083 Issue #1218 - When resuming a suspended connection do not register a read interest if currently in filling mode.
Signed-off-by: Violeta Georgieva <vgeorgieva@pivotal.io>
2017-01-05 14:58:06 +02:00
Joakim Erdfelt 0fc897233a Fixes #1216 to prevent duplicate SCI initialization of WSUF 2017-01-04 11:30:19 -04:00
Joakim Erdfelt 9324971d20 Issue #1216 improving init/destroy in WSUF 2017-01-04 10:42:51 -04:00
Joakim Erdfelt ecc3c57dd1 Issue #1214 - Ensure all response headers are present 2017-01-04 10:10:23 -04:00
Simone Bordet 755de58ab6 Merged branch 'jetty-9.4.x' into 'master'. 2017-01-03 11:01:05 +01:00
Joakim Erdfelt cb7ef89619 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-12-27 14:07:29 -07:00
Joakim Erdfelt bf80d822c0 Issue #1202 - Adding testcase and fix for NPE in Sec-WebSocket-Extensions use 2016-12-27 14:06:33 -07:00
Joakim Erdfelt f3c4424722 Fixes #1197 - Copying headers into upgrade facade more consistently 2016-12-27 13:41:45 -07:00
Joakim Erdfelt bfc21f23e0 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-12-27 13:33:41 -07:00
Joakim Erdfelt 03a283235c Issue #1197 - adding testcase for Authorization use in WSClient 2016-12-27 13:32:21 -07:00
Joakim Erdfelt 77c63a1648 Merge branch 'release-9.3.15' into jetty-9.3.x 2016-12-21 14:56:08 -07:00
Joakim Erdfelt 243c24338f Merge branch 'jetty-9.4.x' 2016-12-20 15:38:51 -07:00
Joakim Erdfelt 64f714689e Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-12-20 15:38:36 -07:00
Joakim Erdfelt b9fd70f5ad Bumping up test timeouts 2016-12-20 14:31:56 -07:00
Joakim Erdfelt 7494914ff6 Updating to version 9.3.16-SNAPSHOT 2016-12-20 13:09:32 -07:00
Joakim Erdfelt 680ecd646b Updating to version 9.3.15.v20161220 2016-12-20 12:31:58 -07:00
Simone Bordet d3ce624d9a Merged branch 'jetty-9.4.x' into 'master'. 2016-12-17 18:38:52 +01:00
Joakim Erdfelt 6b3b59df43 Updating to version 9.2.21-SNAPSHOT 2016-12-16 16:23:06 -07:00