Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
19,390 Commits 67 Branches 465 Tags 359 MiB
Commit Graph

19390 Commits

Author SHA1 Message Date
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
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 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 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
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
Joakim Erdfelt 13413c8027 More testing of embedded examples 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-09-09 17:58:06 -05:00
Joakim Erdfelt 7f1396a766 Merge branch 'jetty-9.4.x' into jetty-9.4.x-3989-selector-failure 2019-09-09 09:57:42 -05:00
Joakim Erdfelt eb5d4ece39 Issue #3974 - disabling flaky AsyncMiddleManServletTest 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-09-09 09:56:16 -05:00
Simone Bordet 692c017500 Fixes #4058 - Review Locker. 
Removes the Locker class, replaced by AutoLock.
Removed usages of Locker.isLocked() from the session code
since it was not necessary.
Took the chance to do a little code cleanup.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-09-09 16:18:46 +02:00
Greg Wilkins 103a5065c9 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2019-09-09 15:14:39 +10:00
Greg Wilkins 17f4dd1a40
Merge pull request #4066 from dreis2211/tolerate-multiple-accept-encondings-gziphandler 
Tolerate multiple Accept-Encoding headers in GzipHandler
 2019-09-09 15:14:15 +10:00
dreis2211 82e8fc0b0e Simplify check for Accept-Encoding header 
Signed-off-by: dreis2211 <christoph.dreis@freenet.de>
 2019-09-09 07:06:40 +02:00
Jan Bartel ee13567c21 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2019-09-09 14:54:39 +10:00
tomoya yokota c904a14d6a fix Session#finishInvalidate throwsConcurrentModificationException (#4036) 
* fix Session#finishInvalidate throws java.util.ConcurrentModificationException
* Change constructor _attribute field must assigned to ConcurrentHashMap

Signed-off-by: tomoya-yokota <tomoya-yokota@cybozu.co.jp>
 2019-09-09 14:52:48 +10:00
dreis2211 597458df7c Tolerate multiple Accept-Encoding headers in GzipHandler 
Signed-off-by: dreis2211 <christoph.dreis@freenet.de>
 2019-09-08 01:44:05 +02:00
Joakim Erdfelt b7b744160f Issue #3989 - Tests for both Restart Server and Selector 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-09-06 16:10:30 -05:00
Joakim Erdfelt f8041b23bd Issue #3989 - Cleaning up ManagedSelector.doStop() for dead selector 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-09-06 14:54:01 -05:00
Joakim Erdfelt 0596d6c352 Merge branch 'jetty-9.4.x' into jetty-9.4.x-3989-selector-failure 2019-09-06 14:35:17 -05:00
Joakim Erdfelt fdaa67e7ec More testing of embedded examples 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-09-06 14:02:41 -05:00
Joakim Erdfelt 5f83f0a599
Merge pull request #4062 from eclipse/jetty-9.4.x-versions 
Updating versions table
 2019-09-06 10:39:08 -05:00
Joakim Erdfelt 7618eae915 Issue #4064 - MinimalServlets test and ServletHolder fix 
+ Also made ContextHandler warning message about features
  that are unimplemented (and you should use ServletContextHandler)
  more clear. (this helped with diagnosing where the bug was
  in ServletHolder)

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-09-06 09:26:06 -05:00
Joakim Erdfelt cf2074114d Jetty version change to Min JVM with footnotes 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-09-06 08:58:04 -05:00
Joakim Erdfelt 0fd989f0cd Issue #3989 - Restoring _selector to null on failure 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-09-06 08:24:51 -05:00
Simone Bordet a40b5ce4cb Added MathUtils.cappedAdd(long, long) to be used 
by the HTTP/2 and HttpClient demand mechanisms.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-09-06 10:12:03 +02:00
Simone Bordet 785ecd2165 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-09-06 10:00:13 +02:00
Simone Bordet 22f0cdde29
Merge pull request #3996 from eclipse/jetty-9.4.x-3978-http2_vulnerabilities 
Fixes #3978 - HTTP/2 vulnerabilities.
 2019-09-06 09:51:37 +02:00