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

19450 Commits

Author SHA1 Message Date
Joakim Erdfelt 50b524bb6b Merge branch `release-9.4.20` into `jetty-9.4.x` 2019-08-15 07:27:25 -05:00
Jan Bartel c9c59e71b6 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2019-08-15 13:47:58 +10:00
Jan Bartel af6c675023
Issue #3913 Fix races in session request reference counting (#3947) 
* Issue #3913 Fix races in session request reference counting

Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-08-15 12:27:18 +10:00
Lachlan Roberts 7d7d932288 Issue #3968 - remove public from methods in ReadState 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-08-15 09:16:05 +10:00
Greg Wilkins 9ba9df1495 fixed merge for CDITests 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-08-15 08:13:02 +10:00
Lachlan Roberts 11d1ad6504 disable flaky test WebSocketConnectionStatsTest 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-08-15 08:04:57 +10:00
olivier lamy 7e961b2c99 javadoc:aggregate-jar cannot run on jetty-10 because of bug in javadoc plugin or javadoc in jdk still need to figure out.. 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-08-15 07:12:30 +10:00
Joakim Erdfelt a11f6a0304 Merging build-resources from `jetty-9.4.x` to `jetty-10.0.x` 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-08-14 09:40:46 -05:00
Joakim Erdfelt 3544283865 Merge branch `jetty-9.4.x` into `jetty-10.0.x` 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

# Conflicts:
#	Jenkinsfile
#	jetty-server/src/test/java/org/eclipse/jetty/server/ForwardedRequestCustomizerTest.java
#	jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/AbstractWebSocketConnection.java
#	jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/ReadState.java
#	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/io/ReadStateTest.java
#	tests/test-distribution/src/test/java/org/eclipse/jetty/tests/distribution/CDITests.java
 2019-08-14 09:39:06 -05:00
Chris Walker 47759b3f9b
Updated security documentation with latest CVEs. Resolves #3980 2019-08-14 10:23:22 -04:00
Lachlan 2a109dccbc
Issue #3968 - prevent ReadPending and ISE from AbstractWebSocketConnection (#3979) 
* Issue #3968 - websocket suspend fix and cleanups

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

* Issue #3968 - fixed race conditions when using websocket ReadState

combine the previous ReadMode into ReadState by using ReadState.Action
which is returned from ReadState.getAction(ByteBuffer) where an atomic
decision is made of what action to do

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-08-14 21:28:35 +10:00
olivier lamy bf5f4c860c do not try to deploy this one 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-08-14 20:43:28 +10:00
Olivier Lamy 8761b345b5
Jetty 9.4.x timeout to build only do not include time to get node (#3975) 
* fix timeout to apply on build time not on getting node time

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* fix typo

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-08-14 20:30:54 +10:00
Joakim Erdfelt f1efc99918 Updating to version 9.4.21-SNAPSHOT 2019-08-13 17:34:20 -05:00
Joakim Erdfelt 84700530e6 Updating to version 9.4.20.v20190813 2019-08-13 16:13:21 -05:00
Joakim Erdfelt cbe34d9bc2 Revert "Jetty 9.4.x release faster (no need of triggering plugins already triggered) (#3944)" 
+ Breaks the release build.
  javadoc and source artifacts lack gpg signatures

This reverts commit 50aa1cf786.
 2019-08-13 16:05:35 -05:00
Joakim Erdfelt 982717cc77
Merge pull request #3972 from eclipse/jetty-9.4.x-3969-forwarded-headers-testing 
Fixes #3969 - Fixing X-Forwarded-Port header setter
 2019-08-13 16:01:32 -05:00
Joakim Erdfelt fec01a4628 Fixes #3969 - Changing TYPE to class from PR review 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-08-13 16:00:18 -05:00
Joakim Erdfelt 3940baea9c Fixes #3969 - Adding comments from PR review 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-08-13 15:56:11 -05:00
Joakim Erdfelt 72c05bc8ba Fixes #3969 - Fixing X-Forwarded-Port header setter 
+ Fixing ForwardedRequestCustomizer.getForwardedPortHeader()
+ Fixing ForwardedRequestCustomizer.setForwardedPortHeader(String)
+ Refactoring unit tests:
  + Tests default ForwardedRequestCustomizer behavior
    on one Connector
  + Tests header configured ForwardedRequestCustomizer behavior
    on different Connector

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-08-13 12:39:30 -05:00
Simone Bordet a700907522
Issue #250 - Implement HTTP CONNECT for HTTP/2. (#3539) 
Fixes #250 - Implement HTTP CONNECT for HTTP/2.

Modified HTTP/2 implementation to support the CONNECT method.
Implemented semantic defined by RFC 8441.
Implemented section 8.3 of RFC 7540.
Introduced HTTP2Client.streamIdleTimeout.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-08-13 19:07:04 +03:00
Joakim Erdfelt d10fea9b7e
Merge pull request #3970 from eclipse/jetty-9.4.x-3969-xforwarded-host 
Issue #3969 - adding testcase to verify Host & X-Forwarded behavior
 2019-08-13 09:16:08 -05:00
Joakim Erdfelt e4b4a30c4c
Merge pull request #3961 from eclipse/jetty-9.4.x-3804-Decoration-Fixes 
Fixed decoration changes for #3804
 2019-08-13 09:15:31 -05:00
Joakim Erdfelt 4b17d28cb0 Issue #3969 - adding testcase to verify behavior 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-08-13 07:30:14 -05:00
olivier lamy 518906f464 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-08-13 16:36:52 +10:00
olivier lamy cfd01d6bbc remove non needed file 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-08-13 16:36:24 +10:00
Lachlan Roberts ee40006a5e remove NullMessage from websocket jetty-9.4.x merge 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-08-13 15:28:20 +10:00
Lachlan Roberts 279c382a1f Merge remote-tracking branch 'eclipse/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-08-13 15:00:38 +10:00
Lachlan d3bc0b931a
Issue #3957 - fix bad usage of MethodHandles.lookup() (#3962) 
* Issue #3957 - fix bad usage of MethodHandles.lookup()

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

* Issue #3957 CustomRequestLog remove unnecessary local string variables

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-08-13 14:47:39 +10:00
Greg Wilkins 8c4dd7ab05 Fixed decoration changes for #3804 
Fixed bad names in OWB webapp.
Don't have the owb jetty-web.xml on by default.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-08-13 11:14:44 +10:00
olivier lamy 072de1ba3c Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-08-13 10:22:25 +10:00
Olivier Lamy 02c247be5f
include test sources in checkstyle report (#3948) 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-08-13 10:20:55 +10:00
Simone Bordet 20bbeeebdf Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-08-12 17:47:02 +02:00
Simone Bordet 46e1896322 Fixes #3960 - Fix HttpConfiguration copy constructor. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-08-12 17:42:54 +02:00
Simone Bordet 76612ea7ca Updated dependency to h2spec to 0.6. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-08-12 17:38:34 +02:00
Greg Wilkins 5b1b7b0a57 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2019-08-12 17:22:15 +10:00
Greg Wilkins 699f832632 Fixed test for symlinked directory 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-08-12 17:21:49 +10:00
Greg Wilkins e08d421efc Fixed merge of PR #3946 from eclipse/jetty-9.4.x-3804-Decoration-rename 
Removed cdi2 module from #3946 for Issue #3804 in jetty-10

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-08-12 12:06:45 +10:00
olivier lamy b0da4468da fix pom 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-08-10 13:24:33 +10:00
olivier lamy 8d2b4dc6f0 remove duplicate dependency 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-08-10 13:22:04 +10:00
Simone Bordet 62758122c3 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-08-10 00:39:54 +02:00
Joakim Erdfelt e7a1978556
Merge pull request #3946 from eclipse/jetty-9.4.x-3804-Decoration-rename 
Issue #3804 CDI integration rename
 2019-08-09 08:43:07 -05:00
Simone Bordet 27c0ae605f Issue #3804 - CDI integration rename. 
Fixed javadocs.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-08-09 11:25:00 +02:00
Olivier Lamy 50aa1cf786
Jetty 9.4.x release faster (no need of triggering plugins already triggered) (#3944) 
* source:jar javadoc:jar are already triggered by eclipse-release profile so no need to call directly as it add more jars to deploy :)

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* no need of sources jar in release profile as it is already part of normal build, and use jar-no-fork in normal to avoid forking another lifecycle

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* no need of triggering gpg plugin again as it is part of the release-jetty.sh script

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-08-09 11:24:31 +10:00
Greg Wilkins 093b39be09 Issue #3804 
more review changes

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-08-09 09:23:17 +10:00
Greg Wilkins bf1ece938f Issue #3804 
more review changes

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-08-09 08:20:27 +10:00
Joakim Erdfelt bcb4c59ab2 Issue #3804 - cleanup of CDITest arguments 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-08-08 10:21:12 -05:00
Olivier Lamy 503a52273e
Jetty 9.4.x fix some part of the code assuming cast to HttpServletRequest is possible (#3945) 
* code assume request is HttpServletRequest whereas it can be ServletRequestWrapper, this fix some failing tck tests

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* return directly if the instance is already HttpServlet*Wrapper

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* checkstyle

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* changes after review

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* checkstyle

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* checkstyle and cleanup import

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-08-08 20:46:19 +10:00
Greg Wilkins eb4be618ee Issue #3804 
more review changes

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-08-08 19:03:59 +10:00
Lachlan 3f34301660
do not echo part content in MultiPartTest (#3942) 
* sanitize xml from multipart upload in MultiPartTest

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

* changes from review

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

* no longer echoing back part content

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-08-08 17:55:31 +10:00