Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-02-22 23:25:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,343 Commits 55 Branches 466 Tags
Commit Graph

19343 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Simone Bordet
c288430f08 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-09-05 19:11:12 +02:00
Simone Bordet
638327d7e3 Updated JaCoCo to 0.8.4 to support (at least) Java 12. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-09-05 19:10:20 +02:00
Joakim Erdfelt
2b1fe8c38d Issue #4057 - Clean up identified by PR review 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-09-05 12:04:23 -05:00
Joakim Erdfelt
91d3ddced6 Issue #4057 - NPE in HttpFields.containsKey 
+ Preventing HttpField from having a null name.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-09-05 10:04:25 -05:00
Chris Walker
189ba7a671
Merge from 9.4.x 2019-09-02 14:49:33 -04:00
康智冬
49ba6d1acb fix typo and grammar (#4045) 
Signed-off-by: KangZhiDong <worldkzd@gmail.com>
 2019-09-02 14:29:50 -04:00
Joakim Erdfelt
bb7eb4bc86 Adding some comments to URIUtilTest 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-08-30 09:23:34 -05:00
Joakim Erdfelt
ebc6a8e143 Merge branch jetty-9.4.x into jetty-10.0.x 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

# Conflicts:
#	jetty-util/src/main/java/org/eclipse/jetty/util/URIUtil.java
 2019-08-29 07:24:16 -05:00
Joakim Erdfelt
25071c3e99
Merge pull request #4034 from eclipse/jetty-9.4.x-4033-uriutil-equalsignoreencodings 
Issue #4033 - Add Lenient percent decode in URIUtil
 2019-08-29 07:21:34 -05:00
Joakim Erdfelt
2fcb311c56 Issue #4033 - Addressing Lenient URIUtil decode behavior change in test 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-08-28 16:32:19 -05:00
Joakim Erdfelt
4e80748b3b Merge branch jetty-9.4.x into jetty-10.0.x 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

# Conflicts:
#	jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/ClientContainer.java
 2019-08-28 15:01:41 -05:00
Joakim Erdfelt
2b72f08f1b
Merge pull request #4019 from eclipse/jetty-9.4.x-155-jsr-websocket-client-ssl-init 
Issue #155 - Adding public ClientContainer(HttpClient) constructor
 2019-08-28 14:31:51 -05:00
Joakim Erdfelt
4829498eab Merge branch jetty-9.4.x into jetty-10.0.x 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

# Conflicts:
#	jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/extensions/ExtensionFactory.java
#	jetty-websocket/websocket-core/src/main/java/org/eclipse/jetty/websocket/core/WebSocketExtensionRegistry.java
#	jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java
#	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/browser/BrowserDebugTool.java
#	jetty-websocket/websocket-servlet/src/main/java/org/eclipse/jetty/websocket/servlet/WebSocketServletFactory.java
 2019-08-28 12:43:11 -05:00
Joakim Erdfelt
bf3638daa4
Merge pull request #4026 from eclipse/jetty-9.4.x-4020-websocket-incompatibleclasschange 
Fixes #4020 - Revert ExtensionFactory change to interface.
 2019-08-28 12:37:44 -05:00
Joakim Erdfelt
37e7884382 Issue #4020 - Applying change requested from PR review 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-08-28 12:36:07 -05:00
Joakim Erdfelt
e56d91196d Issue #4020 - Adding JMX to BrowserDebugTool to test dump 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-08-28 12:31:33 -05:00
Joakim Erdfelt
f47115c585 Issue #4033 - More tests for Lenient URIUtil behavior 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-08-28 12:20:52 -05:00
Joakim Erdfelt
7da57151ed Issue #4033 - lenient percent decode in URIUtil 
+ Allows for preserving decoded Strings like "X%YZ"

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-08-28 12:08:18 -05:00
Joakim Erdfelt
352dc10f1d Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2019-08-28 10:43:33 -05:00
Joakim Erdfelt
b2ea6a0861 Fixing Test Parameterization 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-08-28 10:43:15 -05:00
Jan Bartel
8e86eb480b Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-08-28 12:32:06 +10:00
Jan Bartel
4251a3e092
Issue #4022 Prevent Servlet adding another Servlet (#4024) 
* Issue #4022  Prevent Servlet adding Servlet and added unit tests.

Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-08-28 12:29:14 +10:00
Joakim Erdfelt
2979ed5046 Fixes #4020 - Satisfy Container LifeCycle dumpable behaviors 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-08-27 20:25:10 -05:00
Jan Bartel
728c96f547 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-08-28 11:22:59 +10:00
Jan Bartel
f4d95e0f2f Remove blank lines for NullSessionCacheTest 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-08-28 11:22:14 +10:00