1
0
mirror of https://github.com/jetty/jetty.project.git synced 2025-03-02 20:09:21 +00:00

20335 Commits

Author SHA1 Message Date
Jan Bartel
2faec44dfb Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-02-26 16:40:35 +01:00
Hirotaka Ikoma
65a22e5e80
Fix NPE in HouseKeeper.stopScavenging ()
* Fix NPE in HouseKeeper.stopScavenging

Signed-off-by: Hirotaka Ikoma <hikoma@gmail.com>
2020-02-26 16:38:50 +01:00
Greg Wilkins
5ba9411e5c cleanup after merge
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-02-26 14:37:00 +01:00
Greg Wilkins
277ce5f3a5 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-02-26 14:36:22 +01:00
Joakim Erdfelt
18f8752ad0
Merge pull request from eclipse/jetty-9.4.x-4606-DateCache-formatNow
Issue  - fixing formatTick use of `now`
2020-02-26 07:23:34 -06:00
Joakim Erdfelt
d082e54301
Issue - fixing formatTick use of now
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-02-26 07:01:53 -06:00
Greg Wilkins
353dc9bf08
Issue XmlConfiguration argument matching ()
* Issue  XmlConfiguration argument matching

Improve argument matching by:
 + rejecting obviously non matches (with allowance for unboxing)
 + sorting methods so that derived arguments are tried before more generic (eg String before Object)

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue  XmlConfiguration argument matching

Improve argument matching by:
 + can unbox from any Number to any Number

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue 

Do not check the assignability of the arguments.  Instead rely on the order of the methods.

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue 

unbox test no longer required

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue 

Simplified test

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue 

Cleanup comparator

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue 

Cleanup comparator

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-02-25 16:19:37 +01:00
Greg Wilkins
9bb6840658
Fixes IPAccessHandler in context ()
* Fixes  IPAccessHandler in context

Fixes and tests  IPAccessHandler in context by using target instead of pathInfo for path matching.

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Tests  IPAccessHandler target

Updates from review.

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue  IpAccessHandler NPE

Match on full URI path rather than target.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-02-25 08:46:02 +01:00
Greg Wilkins
03359ec089
Tests ContextListener removed ()
Remove ContextListeners from the destroy list when removed.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-02-22 10:43:36 +01:00
Simone Bordet
7ce14a419f Merged branch 'm0mus-issue_4540' into 'jetty-10.0.x'. 2020-02-21 09:38:23 +01:00
Simone Bordet
b0975aaba0 Fixes - ProxyConnectionFactory should not ignore TLVs.
Generified the API to expose TLVs, so that they are all exposed,
not only the custom TLV types in the 0xE0-0xEF range.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-02-21 09:37:12 +01:00
Simone Bordet
411624c419 Merge branch 'issue_4540' of https://github.com/m0mus/jetty.project into m0mus-issue_4540 2020-02-21 08:45:21 +01:00
Joakim Erdfelt
75574f0b88
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-02-20 17:24:28 -06:00
Joakim Erdfelt
9325a5bc16
Merge pull request from eclipse/jetty-9.4.x-4567-log-throwable-lastarg
Issue  - Backport of StdErrLog 10.0.x for Throwable behavior change
2020-02-20 17:21:55 -06:00
Joakim Erdfelt
0e536407a9
Issue - Backport of StdErrLog 10.0.x for Throwable behavior change
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-02-20 13:45:40 -06:00
Joakim Erdfelt
e894da5b21
Fixing noinspection warning
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-02-20 13:42:53 -06:00
Joakim Erdfelt
8594fd371e
Removing @SuppressWarnings
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-02-20 13:39:01 -06:00
Joakim Erdfelt
d453333a48
Issue - Backport of StdErrLog 10.0.x for Throwable behavior change
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-02-20 12:57:49 -06:00
Joakim Erdfelt
e8d0be4073
Merge pull request from eclipse/jetty-10.0.x-4567-StdErrLog-throwable
Issue  - StdErrLog cleanup and final Arg Throwable support
2020-02-20 12:46:43 -06:00
Joakim Erdfelt
4ec8826873
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-4567-StdErrLog-throwable 2020-02-20 11:53:07 -06:00
Joakim Erdfelt
9683142c1e
Fixing merge issue
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-02-20 11:42:28 -06:00
Joakim Erdfelt
3c6c9112de
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-4567-StdErrLog-throwable 2020-02-20 11:16:19 -06:00
Joakim Erdfelt
16230e6e1c
Issue - Applying fixes from PR review
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-02-20 10:31:59 -06:00
Simone Bordet
d83e1c93ef Fixed copyright header after merge.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-02-20 12:23:18 +01:00
Simone Bordet
f5cfa2bf7d Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-02-20 12:05:27 +01:00
Simone Bordet
ea5b70ba37
Merge pull request from eclipse/jetty-9.4.x-4550-XmlConfiguration-named-args
Fixes  XmlConfiguration named parameters
2020-02-20 11:25:00 +01:00
Simone Bordet
0fc12b0681 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-02-20 11:23:49 +01:00
Simone Bordet
2958cb1d62
Merge pull request from eclipse/jetty-9.4.x-4541-OptimalLargeResponseHeader
Issue  Large response header
2020-02-20 11:17:39 +01:00
Greg Wilkins
8c7861d210 fixed spelling
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-02-20 10:34:07 +01:00
Greg Wilkins
a855744aeb release buffer in client as well
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-02-20 10:25:57 +01:00
olivier lamy
422b32be9e Revert "Issue remove deprecated jetty-runner ()"
This reverts commit ebed3e5b38309b90f86f03fa3ec6c2473e1087f0.
2020-02-20 10:33:50 +10:00
Greg Wilkins
b46b25b450 release buffer on overflow
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-02-19 22:38:58 +01:00
Joakim Erdfelt
5df8b05327
Issue - null arguments on StdErrLog result in no output (avoiding "null")
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-02-19 15:10:20 -06:00
Greg Wilkins
0c8860f131 Sort the executables so that non varargs variants are tried before empty var args.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-02-19 19:35:52 +01:00
Greg Wilkins
9dd8a53a6d Work in progress on review comments
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-02-19 19:20:04 +01:00
Dmitry Kornilov
ab94409574 ProxyConnectionFactory should not ignore TLVs
Signed-off-by: Dmitry Kornilov <dmitry.kornilov@oracle.com>
2020-02-19 15:07:49 +01:00
Joakim Erdfelt
c9134df60a
Issue - Applying changes from PR review
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-02-18 11:09:46 -06:00
Lachlan
5fe202f29f
Issue - clean up websocket removing duplicated and unused classes ()
Create new module websocket-util which contains implementation classes shared by websocket-jetty and websocket-javax. Many of these classes had to be changed as the javax and jetty versions of them differed slightly.

Also includes general cleanups, removed unused interfaces and classes, etc..
2020-02-18 21:43:54 +11:00
Lachlan
59ae7767a4
Merge pull request from eclipse/jetty-10.0.x-4581-Javadoc
Issue  - remove unnecessary javadoc on Override methods
2020-02-18 21:33:10 +11:00
Lachlan Roberts
f6195b39ea Issue - fix checkstyle errors
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-02-18 13:52:19 +11:00
olivier lamy
9d589f1b6e fix checkstyle issue
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-02-18 10:42:26 +10:00
Lachlan Roberts
55748f12c2 Issue - remove unnecessary javadoc on Override methods
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-02-18 11:33:56 +11:00
Simone Bordet
3129202e8a Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-02-17 17:40:06 +01:00
Simone Bordet
01438e6f91 Code cleanup.
Changed the way the test directory was created: it was based on a
millisecond timestamp, but the tests run fast and it was possible that
two tests were creating the directory within the same millisecond.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-02-17 17:32:51 +01:00
Simone Bordet
f2c977d619 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-02-17 00:54:22 +01:00
Simone Bordet
ed7f337856 Issue - Add a mechanism that allows running multiple protocols on the same port.
Made test methods public, so that they will work fine in JDK 11 and JPMS.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-02-17 00:53:44 +01:00
Simone Bordet
612a70b5be Issue - Add a mechanism that allows running multiple protocols on the same port.
Fixed tests after merge.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-02-16 22:17:13 +01:00
Simone Bordet
b73892ccfb Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-02-16 19:41:49 +01:00
Simone Bordet
9f7a82b128
Merge pull request from lorban/composable-conn-factories
Fixes  -  Add a mechanism that allows running multiple protocols on the same port.
2020-02-16 19:25:04 +01:00
Simone Bordet
6f211d7a34 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-02-16 17:29:10 +01:00