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

18742 Commits

Author SHA1 Message Date
Simone Bordet 5346980dbb Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-06-10 11:29:25 +02:00
Simone Bordet 978656ebcd
Merge pull request #3754 from eclipse/jetty-9.4.x-3748-inject-asynclistener 
Issue #3748 Fix regression for injecting Resource on AsyncListeners
 2019-06-10 10:44:08 +02:00
Joakim Erdfelt 450d7f42b2 Issue #3748 - Adding distribution tests for AsyncListenerServlet 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-06-07 12:15:29 -05:00
Joakim Erdfelt 246e36289d Issue #3748 - Adding testcase for AsyncListener with @Resource 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-06-07 12:14:13 -05:00
Jan Bartel 41b2d64815 Issue #3748 Fix regression for injecting Resource on AsyncListeners 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-06-07 17:50:06 +02:00
Simone Bordet dd79b516f3 Fixes #3750 - NPE in WebSocketClient.toString(). 
Initializing field `sessionTracker` early to avoid NPE.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-06-07 11:36:42 +02:00
Simone Bordet a510ed31cb Issue #3713 - Emit warning when invoking deprecated method in Jetty XML. 
Fixed references to deprecated methods WebAppContext.prependServerClass(),
WebAppContext.addServerClass() and WebAppContext.addSystemClass().

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-06-07 09:22:31 +02:00
Simone Bordet 5b5848eb73
Merge pull request #3716 from eclipse/jetty-9.4.x-log-condense-improvement 
Issue #3715 - Improve Log condensePackageString() performance
 2019-06-06 22:48:25 +02:00
Simone Bordet bf53925cfb Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-06-06 17:58:49 +02:00
Simone Bordet 0bc88ec286 Fixes #3697 - Review JNDI logging. 
Deprecated NamingUtil.__log and replaced its
usages with the static logger-per-class idiom.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-06-06 15:36:37 +02:00
Simone Bordet 900a036664
Merge pull request #3739 from eclipse/jetty-9.4.x-3729-concurrent-naming-context 
Jetty 9.4.x 3729 concurrent naming context
 2019-06-06 13:37:57 +02:00
Olivier Lamy 8f4cdf1c83
upgrade log4j2 version and fix log4j2.xml provided sample (#3721) 
* upgrade log4j2 version and fix log4j2.xml provided sample, add disruptor if users wants to use async logging

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-06-06 20:44:41 +10:00
Olivier Lamy 03baa6bc9b
Issue #3733 do not destroyForcibly on close otherwise child processes are not killed via shutdownHook (#3742) 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-06-06 20:43:41 +10:00
Lachlan Roberts 3190672ffc fix bad merge of MultiPartServletTest 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-06-06 09:17:13 +10:00
Lachlan 62eedebd17
Issue #3705 - WebSocket upgrade failure and CompletableFuture refactor 
* Issue #3705 - notify WebSocket framehandler on client upgrade failure

getFrameHandler on the ClientUpgradeRequest no longer takes
the upgrade response, the response must be set later if it is
required by the framehandler implementation

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

* Issue #3705 - changes from review

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

* Issue #3705 - throw if FrameHandler could not be created

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

* wip

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

* Issue #3705 - count down the onOpen latch in NetworkFuzzer

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

* Issue #3705 - WebSocket Session CompletableFuture refactor

- sessionFutures for jetty and javax are now implemented using the
futureCoreSession which will occur after onOpen

- the request and response are set on the FrameHandler before the
upgrade

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-06-06 08:13:33 +10:00
Greg Wilkins 76051192a2 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-06-06 00:00:56 +02:00
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
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