Simone Bordet
9ee302be68
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2019-09-12 12:14:46 +02:00
Simone Bordet
8c1e0b0714
Fixes #4082 - Debug logging causes NullPointerException in client.
...
Using BufferUtil to guard against NPEs.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-09-12 12:14:15 +02:00
Greg Wilkins
d48c258deb
Issue #97 ServletHolder unavailable handling
...
Took the opportunity to do a major cleanup of the Holders.
ServletHolder now uses wrapping to achieve optional behaviour rather than lots of if statements.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-09-12 17:56:09 +10:00
Lachlan Roberts
82a00524d1
remove unnecessary connection upgrade check
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-09-12 10:52:06 +10:00
Lachlan Roberts
eb1c77daf4
remove empty lines
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-09-12 10:22:15 +10:00
Greg Wilkins
905bf82f80
reformatting
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-09-12 10:14:58 +10:00
Greg Wilkins
05c7aaab6f
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-2815-hpackOpaqueBytes
2019-09-12 10:10:20 +10:00
Simone Bordet
d91ee54627
Merge pull request #4068 from eclipse/jetty-10.0.x-4058-autolock
...
Fixes #4058 - Review Locker.
2019-09-11 23:56:52 +02:00
Simone Bordet
63798f6664
Fixes #3956 - Remove and warn illegal HTTP/2 response headers.
...
Updates after review.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-09-11 23:55:25 +02:00
Simone Bordet
f942cd4687
Merged branch 'jetty-10.0.x' into 'jetty-10.0.x-4058-autolock'.
2019-09-11 22:41:11 +02:00
Joakim Erdfelt
2a754edeb4
Removing bad reference to jetty-http:tests
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-09-11 15:05:56 -05:00
Joakim Erdfelt
6ae7427d55
Merge branch 'jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# examples/embedded/pom.xml
# examples/embedded/src/main/java/org/eclipse/jetty/embedded/FileServer.java
# examples/embedded/src/main/java/org/eclipse/jetty/embedded/Http2Server.java
# examples/embedded/src/main/java/org/eclipse/jetty/embedded/JarServer.java
# examples/embedded/src/main/java/org/eclipse/jetty/embedded/LikeJettyXml.java
# examples/embedded/src/main/java/org/eclipse/jetty/embedded/ManyConnectors.java
# examples/embedded/src/main/java/org/eclipse/jetty/embedded/ManyContexts.java
# examples/embedded/src/main/java/org/eclipse/jetty/embedded/ManyHandlers.java
# examples/embedded/src/main/java/org/eclipse/jetty/embedded/OneWebAppWithJsp.java
# examples/embedded/src/main/java/org/eclipse/jetty/embedded/ServerWithAnnotations.java
# examples/embedded/src/main/java/org/eclipse/jetty/embedded/ServerWithJNDI.java
# examples/embedded/src/main/java/org/eclipse/jetty/embedded/WebSocketJsrServer.java
2019-09-11 09:42:56 -05:00
Joakim Erdfelt
43e10f8a5e
Merge pull request #4056 from eclipse/jetty-9.4.x-testing-embedded-examples
...
Unit Testing the Embedded Examples
2019-09-11 09:20:10 -05:00
Lachlan Roberts
387faa7e33
clean up websocket jetty-logging.properties files
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-09-11 18:02:18 +10:00
Jan Bartel
62118cacb1
Issue #1743 WIP
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-09-11 17:47:34 +10:00
olivier lamy
3de6d6f6e7
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-09-11 17:23:38 +10:00
Olivier Lamy
37f96bdf2b
Issue #4075 Accept pattern such /On* and do exact path match ( #4080 )
...
* Issue #4075 accept url-pattern such /On* as exact match
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* changes after review from Greg
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-09-11 17:22:14 +10:00
Jan Bartel
2cffd48ab6
Issue #1743 WIP
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-09-11 15:35:00 +10:00
Lachlan Roberts
fbd1ba0c09
add missing licence header
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-09-11 13:00:22 +10:00
Lachlan Roberts
85cdc0d6c4
Reworked OpenId demo into test using a local test OpenIdProvider
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-09-11 12:14:47 +10:00
Greg Wilkins
90cf7c80bd
avoid exceptions for non iso characters
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-09-11 10:50:42 +10:00
Jan Bartel
89ee733f21
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-1743-refactor-maven-plugin-redux
2019-09-11 10:23:26 +10:00
Greg Wilkins
bc96561865
fixed bad merge
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-09-11 10:18:17 +10:00
Greg Wilkins
bd220400a1
Merge branch 'jetty-9.4.x' into jetty-9.4.x-2815-hpackOpaqueBytes
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-09-11 10:17:33 +10:00
Jan Bartel
5a5320c551
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2019-09-11 10:07:42 +10:00
Jan Bartel
03629b4616
Add missing issue 2140 to VERSION.txt
2019-09-11 10:05:24 +10:00
Jan Bartel
ac15b1a093
Issue #4076 Fix restart of quickstarted webapp ( #4078 )
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-09-11 09:38:13 +10:00
Jan Bartel
1722acafa8
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2019-09-11 09:36:59 +10:00
Jan Bartel
a563cdca76
Issue #4025 Add flushOnResponseCommit mode to sessions. ( #4049 )
...
* Issue #4025 Add flushOnCommit mode to sessions.
Added flushOnCommit mode to write a session to the backing store as the
response commits, before any bytes are returned to the client.
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-09-11 09:10:35 +10:00
Joakim Erdfelt
627ca1bb70
More tweaks for testing
...
+ Moved realm.properties to src/main/resources/etc/
+ Ensured that surefire's useManifestOnlyJar=false
to enable taglibs to be found, and jstl to work.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-09-10 10:36:08 -05:00
Joakim Erdfelt
e69ee7b147
Ensuring jetty-distribution builds before eexample-embedded
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-09-10 09:02:07 -05:00
Joakim Erdfelt
b2dc5830ed
Adding configurable ports (per PR review)
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-09-10 08:53:21 -05:00
Joakim Erdfelt
6e740060f7
Merge branch 'jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# jetty-io/src/main/java/org/eclipse/jetty/io/ManagedSelector.java
2019-09-10 08:22:00 -05:00
Joakim Erdfelt
115ccf11ce
Merge pull request #4054 from eclipse/jetty-9.4.x-3989-selector-failure
...
Issue #3989 - add new onSelectFailure method overridable
2019-09-10 08:02:46 -05:00
Joakim Erdfelt
253aa8a650
Fixing typo in email address
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-09-10 03:57:58 -05:00
Joakim Erdfelt
68382b9549
Issue #3989 - Cleaning up ManagedSelector.onSelectFailed
...
+ Based on PR review
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-09-10 03:46:26 -05:00
Joakim Erdfelt
8dfa4c941a
Server.stop() is now optional because of assumption on start
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-09-10 03:40:30 -05:00
Jan Bartel
6f0f9d5dcd
Issue #1743 WIP
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-09-10 18:14:00 +10:00
Jan Bartel
aec8f0a32d
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-1743-refactor-maven-plugin-redux
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-09-10 16:35:04 +10:00
Jan Bartel
85719e2287
Issue #1743 WIP
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-09-10 16:14:06 +10:00
Jan Bartel
b851af0a5b
Issue #4003 Fix quickstart ( #4008 )
...
* Issue #4003 Fix quickstart.
Modes:
AUTO: use quickstart xml if present, start normally otherwise
GENERATE: re/generate quickstart xml
QUICKSTART: use a pregenerated quickstart xml, fail otherwise
Signed-off-by: Jan Bartel <janb@webtide.com>
* Issue #4003 Cleanup quickstart
Removed TerminateException in favour of Server.setDryRun(boolean)
and AbstractLifeCycle.StopException
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-09-10 16:04:01 +10:00
Jan Bartel
b272b36908
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2019-09-10 14:49:10 +10:00
Jan Bartel
10de54fa07
Issue #4072 Add test for SessionAuthentication serialization ( #4074 )
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-09-10 14:48:20 +10:00
Joakim Erdfelt
bec14ff870
More testing of embedded examples
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-09-09 20:47:16 -05:00
Joakim Erdfelt
f6aea22979
Issue #3989 - Cleaning up FailedSelectorTest
...
+ Based on PR review
+ Squelching logging output
+ Removing stacks from ManagedSelector logging
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-09-09 20:35:02 -05:00
Joakim Erdfelt
4f87da5f25
Attempting to understand why jetty-distribution is not found on CI
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-09-09 20:25:49 -05:00
Jan Bartel
6554e9e4e9
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2019-09-10 10:27:13 +10:00
Jan Bartel
f90a07371c
Issue #4022 Add extra ServletRegistration tests & checkstyle fixes
2019-09-10 10:24:58 +10:00
Lachlan Roberts
c67ac736df
implement serializable for auth in cluster
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-09-10 10:21:38 +10:00
Joakim Erdfelt
9ef9b63071
More testing of embedded examples
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-09-09 19:06:13 -05:00