18980 Commits

Author SHA1 Message Date
Lachlan
c94753ece3
Issue #3746 - fix WriteFlusher ClassCastException if Callback throws (#3778)
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-06-13 15:51:22 +10:00
Lachlan
6fcc3d1a77
Issue #3762 - use the default port of 0 for WebSocket tests (#3770)
* Issue #3762 - use the default port of 0 for WebSocket tests

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

* Issue #3762 - use system property to set custom port in xml

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-06-13 15:43:19 +10:00
Olivier Lamy
370a85b921
Jetty 9.4.x aggregate javadoc fix (#3780)
* fix javadoc plugin configuration fixing searchbox when navigating to class found, as jetty 10 has module defined we probably do not need to merge this to 10 except other parameters

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-06-13 11:28:22 +10:00
Joakim Erdfelt
070b8f9de1
Merge pull request #3775 from eclipse/jetty-9.4.x-3736-protect-from-bad-classloader
Issue #3736 - Give better exception when using bad classloader impl
2019-06-12 16:18:01 -05:00
Joakim Erdfelt
9e368726d7 Attempting to address stats difference 2019-06-12 15:10:22 -05:00
Joakim Erdfelt
db30cbd184 Issue #3700 - Adding felix webapp tests to discover OSGi issues earlier
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-12 14:37:13 -05:00
Joakim Erdfelt
dc23b8da6a Issue #3731 - Bumping up version now that 9.4.19 is released
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-12 13:58:36 -05:00
Joakim Erdfelt
ee4726985e Issue #3731 - removing remaining references to experimental CDI 1 libs 2019-06-12 13:49:57 -05:00
Joakim Erdfelt
5c74de8ab4 Issue #3731 - Removing old CDI1 libs/modules
+ Moved remaining CDI2 module to top level /jetty-cdi/ (no need for
  sub-modules anymore)
2019-06-12 13:49:39 -05:00
Joakim Erdfelt
0d4aa4ea49 Issue #3731 - updating cdi2 module expectations
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-12 13:49:14 -05:00
Joakim Erdfelt
4f82a23a7a Issue #3731 - fixing license headers 2019-06-12 13:49:14 -05:00
Joakim Erdfelt
c6e5371ea2 Issue #3731 - Cleaning up test-cdi2-webapp to be the minimal needed
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-12 13:49:14 -05:00
Joakim Erdfelt
715bbbb6a2 Issue #3731 - Adding CDI2 tests to test-distribution
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-12 13:49:14 -05:00
Joakim Erdfelt
85566d0377 Issue #3731 - adding cdi2 test webapp
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-12 13:49:14 -05:00
Joakim Erdfelt
e81fdbd7c7 Issue #3736 - Give better exception when using bad classloader impl
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-12 13:38:45 -05:00
Joakim Erdfelt
ab89d2dd9b Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2019-06-12 12:44:37 -05:00
Joakim Erdfelt
fab70bd13c Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x 2019-06-12 12:42:42 -05:00
Joakim Erdfelt
aa8c0bb879 Reworking testcase to be more resilient
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-12 12:42:28 -05:00
Simone Bordet
82f7647629 Issue #3758 - Avoid sending empty trailer frames for http/2 requests.
Added one more test case and comments about handling of
`content.isConsumed()` in HTTP/2.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-06-12 19:15:15 +02:00
Greg Wilkins
8a9314234a Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-12 17:44:56 +02:00
Joakim Erdfelt
adb6e7c8d2 Issue #3708 - Correcting for testcases
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-12 10:39:05 -05:00
Joakim Erdfelt
877815e195 Issue #3708 - Adding new methods and converting codebase to use them
+ StringUtil.replace(String, char, char)
+ StringUtil.strip(String, String)
+ URIUtil.encodeSpecific(String, String)
+ URIUtil.decodeSpecific(String, String)
+ TypeUtil.toClassReference(Class)
+ TypeUtil.toClassReference(String)

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-12 09:56:41 -05:00
Joakim Erdfelt
776c093b70 Merge branch 'release-9.4.19' into jetty-9.4.x 2019-06-12 06:44:27 -05:00
Simone Bordet
8f53d14e15 Issue #3758 - Avoid sending empty trailer frames for http/2 requests.
Modified the sender logic to allow specific subclasses to decide
when to send the trailers, if any.
This allows HTTP/2 to correctly compute the end_stream flag and avoid
sending empty trailers frames with end_stream=true.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-06-12 10:51:15 +02:00
Greg Wilkins
0fcf745d09 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-12 08:09:08 +02:00
Greg Wilkins
819c379975
Servlet Context/Handler/Holder cleanups (#3767)
Issue #3749 #3755 Servlet annotation cleanups
Cleanups when checking thread safety of lazy servlet/filter introspection.

 + Handle multiple holders for annotated servlets
 + Replaced duplicate code with common methods

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-06-12 08:00:01 +02:00
Lachlan Roberts
e8115268d4 Issue #300 - rework of inflater and deflater pools
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-06-12 14:21:40 +10:00
Joakim Erdfelt
2ea0bca333 Cleanup of testcase, unable to replicate failure.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-11 13:10:55 -05:00
Joakim Erdfelt
2453882103 Issue #3708 - Reverting change to RewriteRegexRule
+ Moving away from Regex / Pattern isn't appropriate here,
  as the entire class is dedicated to Regex behaviors.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-11 13:02:40 -05:00
Joakim Erdfelt
33fe55c339 Issue #3708 - use StringUtil alternatives for known slow JVM impls.
+ StringUtil.replace()
+ StringUtil.replaceFirst()
+ StringUtil.sanitizeFileSystemPath()

Change existing usages of String.replace() to either
use new StringUtil.replace() or other methods elsewhere
that better suit that specific need.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-11 11:25:50 -05:00
Lachlan
0d9de28226
Issue #3661 - move WebSocketSessionListener to WebSocket-API
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-06-11 21:08:52 +10:00
Lachlan
1ead2ee370
Issue #3616 - fix merge back of SessionTracker back to jetty10
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-06-11 21:07:15 +10:00
Lachlan Roberts
e007634e53 Issue #3170 - cleanups of WebSocketProxy and WebSocketProxyTest
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-06-11 17:12:02 +10:00
Lachlan Roberts
327783e1ce Merge remote-tracking branch 'eclipse/jetty-10.0.x' into jetty-10.0.x-3170-websocket-proxy
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-06-11 15:17:54 +10:00
Joakim Erdfelt
ae21126cad Updating to version 9.4.20-SNAPSHOT 2019-06-10 13:40:17 -05:00
Joakim Erdfelt
9e4332017f Merge branch 'jetty-10.0.x' of github.com:eclipse/jetty.project into jetty-10.0.x 2019-06-10 12:43:36 -05:00
Joakim Erdfelt
c73f849711 Fixing post-merge test errors
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-10 12:43:26 -05:00
Simone Bordet
81f22e3873 Issue #3748 - @Resource field not injected in Jetty Demo.
Adding Jetty 10 specific bits to make the test pass.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-06-10 19:23:04 +02:00
Joakim Erdfelt
68a9498092 Merge branch jetty-9.4.x into jetty-10.0.x
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-10 11:51:55 -05:00
Joakim Erdfelt
afcf563148 Updating to version 9.4.19.v20190610 jetty-9.4.19.v20190610 2019-06-10 11:17:56 -05:00
Joakim Erdfelt
da4f116c63 Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x 2019-06-10 11:10:08 -05:00
Joakim Erdfelt
8b2728e4d5 Fixing release-jetty.sh 2019-06-10 11:09:57 -05:00
Joakim Erdfelt
5dbc0bdaa5
Merge pull request #3745 from eclipse/jetty-9.4.x-3743-xmlconfig-locations
Issue #3743 - Using Location based XmlConfiguration where possible
2019-06-10 11:08:51 -05:00
Joakim Erdfelt
59ce0ea0e3 Issue #3743 - Cleanup requested from PR
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-10 10:12:39 -05:00
Joakim Erdfelt
1683df2da6 Putting new JMH test in correct place (fix from last merge) 2019-06-10 10:04:30 -05:00
Joakim Erdfelt
ff43fd3de4 Issue #3743 - More changes from review of PR
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-10 09:58:53 -05:00
Joakim Erdfelt
2e9aa24d02 Fixing Jenkinsfile 2019-06-10 09:28:28 -05:00
Simone Bordet
2523e828b3 Issue #3751 - Use Modern DTD/FPI consistently.
Fixed duplicate `redirectEntity()` after merge.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-06-10 16:09:49 +02:00
Joakim Erdfelt
a8d008b851 Issue #3743 - Making new ConfigurationProcessor interface default
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-10 08:19:59 -05:00
Joakim Erdfelt
bb0c87a42a Issue #3743 - Addressing PR review items
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-06-10 07:56:46 -05:00