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

19371 Commits

Author SHA1 Message Date
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 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
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 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
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 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
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 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 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
Greg Wilkins 02ec06ead9 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2019-09-06 14:45:55 +10:00
Greg Wilkins 894f31e612
Issue #4048 Multiple proxy ports (#4063) 
Support multiple proxy port values.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-09-06 14:45:00 +10:00
Lachlan Roberts ccf4166ead Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-09-06 14:24:00 +10:00
Lachlan 74e560fb7a
Issue #4031 - stop unopened WebSocketSessions gracefully (#4046) 
* Issue #4031 - stop unopened WebSocketSessions gracefully

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

* Issue #4031 - notify onError if shutdown before open

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-09-06 13:50:33 +10:00
olivier lamy 2ebec27da4 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-09-06 13:29:21 +10:00
Olivier Lamy 39a3cd6b3c
force mergeUserSettings to true (#4051) 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-09-06 13:28:32 +10:00
Joakim Erdfelt 3171ad5fe6 Issue #3989 - Updating testcase to restart server on select failure 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-09-05 20:23:59 -05:00
Simone Bordet 4e67e8594e Merged branch 'jetty-9.4.x' into 'jetty-9.4.x-3978-http2_vulnerabilities'. 2019-09-05 23:12:35 +02:00
Simone Bordet 508ad4aff9 Issue #3978 - HTTP/2 vulnerabilities. 
Code cleanups and reformatting.

Fixed logic for SETTINGS frame replies: they are not subject to rate control.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-09-05 23:11:53 +02:00
Joakim Erdfelt 1d57d5f089 Updating versions table 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-09-05 13:58:48 -05:00
Joakim Erdfelt 648b97b70b Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-09-05 13:08:14 -05:00
Joakim Erdfelt 4717a8e049
Merge pull request #4059 from eclipse/jetty-9.4.x-4057-response.containsHeader-npe 
Issue #4057 - NPE in HttpFields.containsKey
 2019-09-05 13:08:01 -05:00
Chris Walker f7a0156961
Merge 9.4.x 2019-09-05 13:20:19 -04:00
康智冬 3a6b26d292 fix typo (#4055) 
Signed-off-by: KangZhiDong <worldkzd@gmail.com>
 2019-09-05 13:17:30 -04:00
Joakim Erdfelt d8efb62d13 Issue #3989 - Select Failure does not attempt to restart selector 
+ Changes from PR review

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-09-05 12:12:49 -05:00