Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
18,367 Commits 67 Branches 465 Tags 359 MiB
Commit Graph

18367 Commits

Author SHA1 Message Date
Greg Wilkins 61b1a217de updated release script versions 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-04-03 12:34:46 +11:00
Greg Wilkins 1caa349a20 updated bom versions 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-04-03 12:34:20 +11:00
Lachlan Roberts 9cda1ce092 QueuedThreadPool bug - jobs disappearing on lifecycle stop 
as the QueuedThreadPool was being stopped, jobs could be taken out of
the QueuedThreadPool job queue but then not run

also cleaned up QueuedThreadPool _runnable code to simplify it

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-04-03 10:39:10 +11:00
Simone Bordet 9c13cf3a52 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-04-02 17:37:56 +02:00
Simone Bordet c4b2621f56
Merge pull request #3480 from eclipse/jetty-9.4.x-3464-split_sslcontextfactory 
Issue #3464 - Split SslContextFactory into Client and Server
 2019-04-02 12:39:37 +02:00
Simone Bordet eaada1aa38 Issue #3464 - Split SslContextFactory into Client and Server 
Updated documentation referencing the 2 new subclasses.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-04-02 12:38:34 +02:00
Greg Wilkins 879b9f5d6b Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-3361-thread-safe-setHandlers 2019-04-02 12:44:08 +11:00
Jesse McConnell 475331a547
really fix test on windows 2019-03-29 08:28:47 -05:00
Jesse McConnell 64f5718da3
fix test on windows 2019-03-29 08:08:29 -05:00
Jesse McConnell 3f81b46970
fix test on windows 2019-03-29 07:57:22 -05:00
lachan-roberts 8f29ea04cd Issue #3382 - implement Session.suspend() for jetty 10 websocket-api 
Signed-off-by: lachan-roberts <lachlan@webtide.com>
 2019-03-29 20:16:20 +11:00
Joakim Erdfelt d0a5ba8d5a
Merge pull request #3495 from eclipse/jetty-9.4.x-3489-extraclasspath-splat-windows 
Issue #3489 - Allowing JAR directory references on Windows
 2019-03-28 08:19:06 -07:00
Lachlan Roberts 717d7300ac adding missing file headers for JettyWebSocketServlets 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-03-28 16:22:10 +11:00
Lachlan Roberts 81960e3da8 Issue #3484 - make WebSocketServlet generic 
WebSocketServlet could only be used with the jetty-websocket-api
make this generic and add implementation in websocket-server

this prevents jetty-websocket-server from needing to use core classes
can cause class cast exceptions from a webapp due conflicts between the
clients version of core classes and those provided by the container

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-03-28 16:22:10 +11:00
Lachlan Roberts 3c61a92ac8 only protectAndExpose api and server for jetty-websockets 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-03-28 16:22:10 +11:00
Lachlan Roberts 97ff7ed9c0 Issue #3106 - changes from review, adding javadoc 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-03-28 14:30:11 +11:00
Lachlan Roberts 45b2c548b0 Issue #3106 - backport WebSocket connection stats from jetty-10 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-03-28 14:30:11 +11:00
Joakim Erdfelt 73f7975189 Issue #3489 - Allowing JAR directory references on Windows 
+ Moving Resource.newResource() to later point

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-03-27 14:14:41 -07:00
Greg Wilkins b759a50450 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-03-27 16:54:09 +11:00
Greg Wilkins 1e4be0a98e Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-03-27 15:07:39 +11:00
Greg Wilkins 3d16eba839
Merge pull request #3478 from lachlan-roberts/jetty-10.0.x-3465-extension-negotiation 
Issue #3465 - WebSocket Extension Negotiation
 2019-03-27 09:19:46 +11:00
Lachlan Roberts 46ef94c1b9 Issue #3465 - client/server error handling behavior for ExtensionStack 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-03-26 16:29:45 +11:00
Greg Wilkins 1c956dc470 Issue #3361 thread safe addHandler 
Updates from review:
 - undeploy destroys context
 - reinstated mapContexts

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-03-26 14:15:36 +11:00
Greg Wilkins ed03682071 Issue #3487 WebAppClassLoader does not definePackage 
Added a test to the test-server-spec to demonstrate the issue
 2019-03-26 13:56:00 +11:00
Joakim Erdfelt 65528f76c5
Merge pull request #3467 from eclipse/jetty-9.4.x-3422-wss-close-wait 
Issue #3422 - WebSocket wss CLOSE_WAIT on aborted client connection
 2019-03-22 11:36:40 -05:00
lachan-roberts 0d570dd6b6 Issue #3478 - changes from review 
ExtensionStack.negotiate now differentiates between incorrect
extension config offered or incorrect config from negotiation

adding more BadMessageException cases

Signed-off-by: lachan-roberts <lachlan@webtide.com>
 2019-03-22 15:42:39 +11:00
olivier lamy f8f6e21a2d fix jmh jar path which has changed in 10.0.x 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-03-22 12:13:56 +10:00
Joakim Erdfelt 4eb8cb1686 Issue #3422 - Using new Connection.Listener support in websocket server 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-03-21 14:40:49 -05:00
Joakim Erdfelt e56ef9d8f8 Backporting Connection.Listener support on WebSocket server connections from `jetty-10.0.x` 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-03-21 14:37:41 -05:00
Joakim Erdfelt aa667562c6
Merge pull request #3172 from eclipse/jetty-10.0.x-integration-testing-websockets 
Adding both WebSocket tests to /test-integration/ to verify behavior that is causing problems from within OSGi.
 2019-03-21 14:32:00 -05:00
Joakim Erdfelt b351631c0d Adding both WebSocket tests to /test-integration/ to verify behavior 
that is causing problems from within OSGi.

+ Renamed TestableJettyServer to XmlBasedJettyServer to avoid
  it being picked up as a Test class (due it starting with the
  name "Test")
+ Renamed .addConfiguration() to .addXmlConfiguration() to
  reflect true nature, and also to avoid naming confusion
  with new Configuration infrastructure in Jetty.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-03-21 14:31:23 -05:00
Joakim Erdfelt 10d3ea2548 Merge branch `jetty-9.4.x-3427-classpath-with-spaces` into `jetty-9.4.x` 2019-03-21 14:26:00 -05:00
Simone Bordet 6fb243ff6c Issue #3464 - Split SslContextFactory into Client and Server 
Introduced SslContextFactory subclasses Client and Server.
Replaced all usages of SslContextFactory with either Client or Server
as required.

Refactored configuration checking so that warnings are not emitted
when non necessary.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-03-21 14:42:42 +01:00
olivier lamy f51968b4ab Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-03-21 21:43:54 +10:00
olivier lamy 0bd7008fcf fix default jdk when no parameter are used 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-03-21 21:42:34 +10:00
olivier lamy 2fddd25f03 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-03-21 21:41:47 +10:00
olivier lamy 27d9999125 sync with script used by Jenkins 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-03-21 21:38:48 +10:00
Greg Wilkins f2e9f2f7b3 Issue #3361 thread safe addHandler 
Updates from review:
 - private fields
 - better blocker for deployment

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-03-21 17:11:47 +11:00
Lachlan Roberts eb4f7c000f Issue #3465 - internal WebSocket extensions 
do not allow internal extensions to be offered by the client
do not validate internal extensions

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-03-21 12:33:53 +11:00
Lachlan Roberts 26e7881dbd Issue #3465 - Negotiation of WebSocket extensions 
default behaviour of Negotiation no longer includes all of the
offered extensions as the negotiated extensions but it now takes
only the first extension if there are multiple of the same name,
this is now done when the negotiation is created and can be overwritten
by the negotiator

Throw exception on websocket errors so the proper status code can
be reported back to the client

fix to checking for multiple negotiated extensions of the same name

added tests for core and jetty websockets for the negotiation

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-03-21 11:41:01 +11:00
Greg Wilkins 849920ce87 Issue #3361 thread safe addHandler 
Updates from review:
 - private fields

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-03-21 10:32:43 +11:00
Greg Wilkins 944636176f Issue #3361 thread safe addHandler 
Updates from review:
 - no return from finally

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-03-21 10:31:08 +11:00
Greg Wilkins 265afacd3f Issue #3361 thread safe addHandler 
Updates from review:
 - private fields

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-03-21 10:27:09 +11:00
Greg Wilkins 790dbbfaaa Issue #3361 thread safe addHandler 
Updates from review:
 - private fields
 - callbacks on deploy/undeploy
 - more deprecated javadoc

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-03-21 10:24:14 +11:00
Greg Wilkins 2f2c9f2f3f Merge branch 'jetty-9.4.x-3361-thread-safe-setHandlers' of github.com:eclipse/jetty.project into jetty-9.4.x-3361-thread-safe-setHandlers 2019-03-21 10:05:45 +11:00
Greg Wilkins a2195e5fe3 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-3361-thread-safe-setHandlers 2019-03-21 10:05:24 +11:00
Simone Bordet 512886ae7f Issue #3361 thread safe addHandler 
Code cleanup.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-03-20 10:51:16 +01:00
Jan Bartel e01eefe40e Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2019-03-20 18:39:53 +11:00
Greg Wilkins 338f56ea93 Issue #3361 thread safe addHandler 
Improved names and javadoc.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-03-20 18:36:48 +11:00
Jan Bartel 432fc41a32
Jetty 9.4.x 3456 programmatic authentication (#3472) 
* Issue #3456 Allow multiple programmatic login/logout in same request.

Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-03-20 18:19:55 +11:00