Commit Graph

18950 Commits

Author SHA1 Message Date
Lachlan Roberts ab8f37e12b Merge remote-tracking branch 'eclipse/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-06-06 07:58:24 +10:00
Jan Bartel 2c634e9125
Remove jetty-util transitive OSGi dependency on servlet-api #3726 (#3741)
Issue #3726 Remove osgi uses clause for deprecated MultiPartInputStreamParser.

Signed-off-by: Jan Bartel <janb@webtide.com>
2019-06-05 23:51:03 +02:00
Lachlan 3651acc5c9
Merge pull request #3707 from lachlan-roberts/jetty-9.4.x-3683-multipart
Issue #3683 - ensure multipart files are still cleaned up if error occurs
2019-06-06 07:38:32 +10:00
Jan Bartel bc3c650822 Issue #3729 Ensure java:comp/env creation threadsafe.
Also fixed and added some tests for locking of java:comp/env

Signed-off-by: Jan Bartel <janb@webtide.com>
2019-06-05 12:19:33 +02:00
Greg Wilkins 4db934a809 Issue #3729 concurrent JNDI access
+ made locking deep

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-05 12:00:32 +02:00
Greg Wilkins 043521ce26
Cleanup webappconfiguration (#3703)
* Cleanup webappconfiguration
* formatting fix
* cleanup examples and OSGi
* disable classloader test until 9.4.19 is released with #3726 is fixed
* cleanup from review

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-05 11:53:56 +02:00
Lachlan 885dfed0b7
Merge pull request #3732 from eclipse/jetty-10.0.x-3712-maxIdleTime-idleTimeout
Issue #3712 - rename maxIdleTime usage to idleTimeout for WebSockets
2019-06-05 17:59:29 +10:00
Lachlan Roberts 85aa3424b6 Issue #3712 - rename maxIdleTime usage to idleTimeout for WebSockets
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-06-05 14:18:47 +10:00
Lachlan Roberts 90e849af76 disable failing testSuspendAfterClose for further review
the WebSocket suspend after close different behaviour from 9 to 10
in jetty-10 an ISE is thrown
in jetty-9 it is a no-op

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-06-05 13:30:21 +10:00
Greg Wilkins 7484651941 Issue #3729 concurrent JNDI access
+ concurrent map for the NamingContext bindings
+ refactored duplicate code into common methods
+ simplified deepBindSupport

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-04 19:32:53 +02:00
Lachlan Roberts edcaa4eda7 rename writeIdleTimeout to writeTimeout for javax websockets
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-06-05 01:48:26 +10:00
Lachlan Roberts bb65167549 Merge remote-tracking branch 'eclipse/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-06-05 01:34:53 +10:00
Simone Bordet b96b4bfffe
Merge pull request #3714 from eclipse/jetty-9.4.x-3713-warn_deprecations_in_xml
#3713 - Emit warning when invoking deprecated method in Jetty XML.
2019-06-04 15:42:22 +02:00
Simone Bordet 2688ed55e5 Issue #3713 - Emit warning when invoking deprecated method in Jetty XML.
Added warnings for deprecated field get/set.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-06-04 10:24:13 +02:00
Lachlan f282ba4758
Merge pull request #3686 from lachlan-roberts/jetty-10.0.x-3666-errorClose
Issue #3666 - error CloseFrames skip frames in the FrameFlusher queue
2019-06-04 13:43:54 +10:00
Lachlan ac8303c45e
Merge pull request #3637 from lachlan-roberts/jetty-9.4.x-3498-websocket-suspend
Issue #3498 - jetty 9.4 websocket suspend for incoming frames
2019-06-04 13:42:24 +10:00
Lachlan Roberts e75ca325fd Issue #3683 - close part if failure occurs in MultiPartFormInputStream
parameterize MultiPartServletTest over compliance modes

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-06-04 12:03:24 +10:00
Lachlan Roberts 17b8eb8401 Issue #3683 - ensure multipart files are still cleaned up after errors
- do not parse MultiParts in constructor so the attribute can be set
- deleteParts in MultiPartFormInputStream from _parts MultiMap
- only add the MultiPartCleanerListener once per context

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-06-04 11:19:42 +10:00
Lachlan Roberts 970b030c4a Issue #3683 - test multipart tmp files are deleted if error occurs
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-06-04 11:09:55 +10:00
Joakim Erdfelt a6b2bd86ef Issue #3698 - Changes based on review from @sbordet
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-03 15:52:41 -05:00
Joakim Erdfelt 54888d2541 Issue #3698 - Reworking WebSocket SCI's to be more flexible in embedded
+ Added new SCIOnStartupListener that allows for manual wiring up
  of ServletContainerInitializers (with no bytecode scanning)
  in embedded jetty usages
+ Introduced .initialized(context) and .configure(context) to both of
  the websocket SCIs
+ Moved ClientConnectTest to jetty-websocket-tests
+ Moved WebSocketClientTest to jetty-websocket-tests
+ Made moved tests not use BlockheadServer
+ Made moved tests use new .configure(context, lambda) methods
+ Also allowing javax.websocket.server SCI implementation to
  add ContextDestroyListener during the execution of another
  ServletContextListener.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-03 13:31:06 -05:00
Simone Bordet 2ba4cb2924 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-06-03 17:31:50 +02:00
Simone Bordet 5ebd6d4ad2
Merge pull request #3682 from eclipse/jetty-9.4.x-3681-HttpFieldsOptimize
Jetty 9.4.x 3681 http fields optimize
2019-06-03 16:51:58 +02:00
Simone Bordet 4058abd7c7 Issue #3713 - Emit warning when invoking deprecated method in Jetty XML.
Improved test case to test for log lines with deprecation warnings.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-06-03 16:08:33 +02:00
Simone Bordet 8dc9f745ff Issue #3713 - Emit warning when invoking deprecated method in Jetty XML.
Fixed return value from varargs methods.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-06-03 16:07:45 +02:00
Greg Wilkins 301934cc68
Issue #3719 clean up modules (#3720)
* Issue #3719 clean up modules

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-03 11:11:18 +02:00
Jan Bartel 3208af6c1c Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2019-06-03 10:29:36 +02:00
Jan Bartel dec10044e0
Jetty 9.4.x 3722 session destroy listeners (#3723)
* Issue #3722 Use webapp classloader for HttpSessionListener.sessionDestroyed calls
2019-06-03 10:27:38 +02:00
Lachlan Roberts 6681da7e74 Issue #3666 - changes from review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-06-03 11:18:41 +10:00
Joakim Erdfelt 4e00f88946 Issue #3715 - Improve Log condensePackageString() performance
+ Removed regex usage
+ More unit tests
+ Adding jmh test for improvements (see PR #3716 for published results
  of old vs new implementation)

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-05-31 10:57:38 -05:00
Joakim Erdfelt ad3be199e8 Disabling broken slack notifications 2019-05-31 10:43:56 -05:00
Joakim Erdfelt 7aa2307bb7 slack notifications are broken atm - disabling 2019-05-31 10:41:57 -05:00
Greg Wilkins 39be07871b Issue #3681
updates from review

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-05-31 13:17:25 +02:00
olivier lamy 97b7be113c fix maven it
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-05-31 21:16:28 +10:00
Greg Wilkins 4d60260cd3 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-3681-HttpFieldsOptimize 2019-05-31 13:04:12 +02:00
olivier lamy bad09ac560 fix typo
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-05-31 20:27:02 +10:00
olivier lamy cba9a5fa93 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-05-31 19:48:25 +10:00
olivier lamy bea7806c77 single line notification
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-05-31 19:47:56 +10:00
olivier lamy 9802e7dca5 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-05-31 19:45:15 +10:00
Olivier Lamy 62fed86430
slack notification only for main branches (#3717)
* slack notification only for main branches

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-05-31 14:24:13 +10:00
Simone Bordet fe94da9e46 Issue #3713 - Emit warning when invoking deprecated method in Jetty XML.
Added warnings for invocation of deprecated constructors and methods.
Moved methods exclusively used by XmlConfiguration from TypeUtil.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-05-30 22:27:27 +02:00
Simone Bordet 4bc4a60e8d Code cleanup and reformatting.
Javadocs.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-05-30 19:22:37 +02:00
Simone Bordet a3e28578f1 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-05-30 14:43:52 +02:00
Simone Bordet eb837293ad Replaced usage of deprecated "replacement" with "location".
Code cleanup & formatting.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-05-30 14:39:28 +02:00
olivier lamy d6dbf7cae0 this when is not working
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-05-30 21:34:10 +10:00
olivier lamy d466da2c95 this when is not working
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-05-30 21:33:08 +10:00
olivier lamy 117bf3834b slack notif only for main branches
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-05-30 20:54:14 +10:00
Simone Bordet 567c5a4f55 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-05-30 12:49:47 +02:00
olivier lamy 5def2dff97 slack notif only for main branches
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-05-30 20:34:42 +10:00
Olivier Lamy 4184e15121
add slack notif when failure or unstable (#3693)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-05-30 20:15:29 +10:00