Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
21,915 Commits 70 Branches 462 Tags 370 MiB
Commit Graph

2272 Commits

Author SHA1 Message Date
Greg Wilkins d1f6cbb9da added jndi and jaas dependencies 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2020-09-22 13:28:10 +02:00
Greg Wilkins 3768b09d6f added jstl 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2020-09-22 13:07:14 +02:00
Joakim Erdfelt 770f251cbb
Issue #5264 - Fixing demo-jndi deps for javax.mail 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-21 16:48:50 -05:00
Joakim Erdfelt c002305cb2
Issue #5264 - Fixing demo-jndi config 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-21 15:53:45 -05:00
Joakim Erdfelt 533d64cda1
Issue #5264 - Fixing deploy status on demo webapps 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-21 14:47:31 -05:00
Joakim Erdfelt 8a64309cdf
Issue #5264 - Reworking demo/tests into modules based on config classifiers 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-21 13:57:23 -05:00
Joakim Erdfelt 4ecff26022
Issue #5264 - Reworking test-distribution to use jetty-home 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-21 13:56:34 -05:00
dependabot[bot] 3dae15dc5a
Bump mariadb-java-client from 2.6.0 to 2.6.2 (#5302) 
Bumps [mariadb-java-client](https://github.com/mariadb-corporation/mariadb-connector-j) from 2.6.0 to 2.6.2.
- [Release notes](https://github.com/mariadb-corporation/mariadb-connector-j/releases)
- [Changelog](https://github.com/mariadb-corporation/mariadb-connector-j/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mariadb-corporation/mariadb-connector-j/compare/2.6.0...2.6.2)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-09-21 13:23:20 +02:00
Olivier Lamy eaf07dd4cc
fix get sessionId from fileName (#5288) 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-09-17 18:03:52 +10:00
gregw afe5044d8c Fixes #5281 
Added work module to create work directory
reviewed by janbartel
 2020-09-16 16:20:16 +02:00
gregw 3bb419842d Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: gregw <gregw@webtide.com>
 2020-09-15 12:04:02 +02:00
Jan Bartel e23eaa26b9 Fix FileSessionDataStoreTest.testCleanOrphans 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2020-09-15 11:02:01 +02:00
Lachlan f6336887b9
Merge pull request #5265 from eclipse/jetty-10.0.x-JDK-8244090 
JDK-8244090 MethodHandles bug fixed in JDK16
 2020-09-15 10:26:11 +10:00
Greg Wilkins 780e1207c7
Issue #5254 List/Show modules (#5257) 
* Issue #5254 List/Show modules

 * simplified --list-modules output
 * added --show-module

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* improve module descriptions

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2020-09-14 18:07:16 +02:00
Lachlan Roberts 14e6bd196e update javadoc for JDK MethodHandles bug tests, stop stacktrace in DistributionTests 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-09-14 17:28:57 +10:00
Simone Bordet 1fa2b091a2 Merge branch 'jetty-9.4.x' into 'jetty-10.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-09-09 15:39:36 +02:00
Simone Bordet 01135e1515
Fixes #5217 - Review RoundRobinConnectionPool (#5219) 
* Fixes #5217 - Review RoundRobinConnectionPool

Introduced IndexedConnectionPool and RandomConnectionPool.
Clarified semantic of RoundRobinConnectionPool.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-09-09 15:31:28 +02:00
gregw d7b3d62982 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: gregw <gregw@webtide.com>
 2020-09-07 15:59:27 +02:00
Greg Wilkins 7ecf42e3f8
Issue #5162 CDI embedded integration improvements (#5177) 
* Issue #5162 CDI embedded integration improvements

Clean up CDI integration and documentation to better support embedded usage.
 + made listener public
 + added utility class for SCIs

* Issue #5162 CDI embedded integration improvements

Clean up CDI integration and documentation to better support embedded usage.
 + moved EmbeddedWeldTest to jetty-embedded

* fix javadoc

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Issue #5162 CDI embedded integration improvements

ventilated text

* fix test pom

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Fixed javadoc

* Fixed javadoc

* Issue #5162 CDI embedded integration improvements

Moved tests to jetty-cdi to avoid consequences to other tests in embedded

* trailing new line

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* updates from review

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Feedback from review
 2020-09-07 14:00:20 +02:00
Joakim Erdfelt a54ed928ab
Issue #5174 - Reorganized jetty-distribution 
+ Updating license / notice files for EPLv2

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-09-03 07:13:58 -05:00
Simone Bordet 466ec0c2d5 Disabled tests broken in Java 15 due to a JVM bug. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-09-02 18:52:10 +02:00
Jan Bartel 7d0e344083 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-09-02 12:22:18 +02:00
Jan Bartel e2d0e1fa34 Remove println 2020-09-02 12:21:30 +02:00
Jan Bartel 9ab95ed824 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-09-02 12:09:23 +02:00
Jan Bartel ef0c752476
Issue #4888 Ensure HttpSessionListener can access session via (#5220) 
Issue #4888 Ensure HttpSessionListener can call Request.getSession

Signed-off-by: Jan Bartel <janb@webtide.com>
 2020-09-02 11:53:23 +02:00
Jan Bartel ad9d702adb
Issue #2609 - Uniform Find Expired Sessions (#5097) 
* Issue #2609 Make all session stores use same algorithm to find expired sessions

Signed-off-by: Jan Bartel <janb@webtide.com>
 2020-08-31 12:39:30 +02:00
Simone Bordet 30303c7979 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-08-25 16:15:33 +02:00
Jan Bartel 77779ed6d8
Issue #4996 - Regularlize logging (#5167) 
* Issue #4996 Regularize logging

Signed-off-by: Jan Bartel <janb@webtide.com>

Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-08-24 17:15:13 +02:00
Simone Bordet 0af5f676cd Issue #5147 - HTTP2 RoundRobinConnectionPool with maxUsage 
Reworked HTTP/2 release after an exchange is terminated.

Previously, the release was bound to 2 events: onStreamClosed(),
introduced for #2796, and exchangeTerminated().
Unfortunately, if the former happens before the latter and
closes the connection, the latter will see the exchange as
aborted, while in fact it was successful, causing what
reported in #5147, an AsynchronousCloseException.

Now, the release is always performed by the exchangeTerminated()
event. With respect to #2796, the stream is always already
closed by the time the exchangeTerminated() event fires (it
was not before).

Reworked the implementation of RoundRobinConnectionPool using
a lock and aggressively trying to open new connections.

A second fix is related to HttpDestination.release(Connection).
If the connection is closed for e.g. overuse, we need to trigger
the processing of queued requests via send(create: true).

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-08-22 22:10:08 +02:00
Simone Bordet 823e713ee4 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-08-22 17:35:25 +02:00
Simone Bordet 2d3f0e0c10 Improved logging and toString() implementations, 
small refactorings in code and tests.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-08-22 17:31:12 +02:00
Joakim Erdfelt 47229e0190
Addressing checkstyle error 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-08-20 13:31:17 -05:00
Joakim Erdfelt 5a0f18513b
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-4572-message-indent 2020-08-20 13:29:50 -05:00
Simone Bordet ac4ea4550e Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-08-13 16:52:35 +02:00
Joakim Erdfelt e7a07074f5
Setting DemoBaseTest.testAsyncRest() as @Tag("external") 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-08-13 08:42:44 -05:00
Joakim Erdfelt 00f4859e33
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-08-12 16:04:06 -05:00
Joakim Erdfelt 9b5b43a2fd
Fixing KeyStoreScannerTest 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-08-12 15:50:11 -05:00
olivier lamy f2d9d2f46f increase stop timeout 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-08-12 15:01:39 +08:00
olivier lamy 495a1cb109 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-08-12 09:49:06 +08:00
Olivier Lamy 12667497e1
Jetty 9.4.x surefire 3.0.0 m5 (#5136) 
* test surefire 3.0.0-M5

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

* simplify code to avoid some timeout

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-08-12 10:27:12 +10:00
Simone Bordet 16cd552995 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-08-11 21:00:43 +02:00
olivier lamy c198d26e6b Updating to version 10.0.0-SNAPSHOT 2020-08-11 16:47:55 +08:00
olivier lamy 429b091578 Updating to version 10.0.0.beta1 2020-08-11 16:47:54 +08:00
Simone Bordet d53d9d8a1d Fixes #5079 - :authority header for IPv6 address not having square brackets. 
On the client:
* Origin.Address.host is passed through HostPort.normalizeHost(),
so that if it is IPv6 is bracketed.
Now the ipv6 address passed to an `HttClient` request is bracketed.
* HttpRequest was de-bracketing the host, but now it does not anymore.

On the server:
* Request.getLocalAddr(), getLocalName(), getRemoteAddr(),
getRemoteHost(), getServerName(), when dealing with an IPv6 address,
return it bracketed.
The reason to return bracketed IPv6 also from *Addr() methods is that
if it is used with InetAddress/InetSocketAddress it still works, but
often it is interpreted as a URI host so brackets are necessary.
* DoSFilter was blindly bracketing - now it does not.

Added a number of test cases, and fixed those that expected
non-bracketed IPv6.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-08-07 15:53:19 +02:00
Simone Bordet c49035570e Merged branch 'jetty-10.0.x' into 'jetty-10.0.x-convert_synchronized_to_autolock'. 2020-08-04 16:32:55 +02:00
Simone Bordet 55f51fa0b5 Fixed copyright headers. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-07-31 19:01:59 +02:00
Simone Bordet 2fe01626a5 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-07-31 17:47:37 +02:00
Greg Wilkins 7adbf247ec
Issue #5093 Static UrlEncoded (#5098) 
* Issue #5093 Static UrlEncoded

Updated UrlEncoded to static only class with no synchronization

* Fixed additional tests

* fixed formatting

Signed-off-by: gregw <gregw@webtide.com>
 2020-07-30 17:57:38 +02:00
Simone Bordet 089e51f0bc Fixes #5083 - Convert synchronized usages to AutoLock. 
Updates after review.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-07-29 15:34:01 +02:00
Simone Bordet 8d69fc41a7 Fixes #5083 - Convert synchronized usages to AutoLock. 
* Replaced relevant usages of synchronized with AutoLock.
* Made AutoLock serializable since classes that use it may be stored in the HttpSession.
* Added convenience methods to AutoLock to execute lambdas with the lock held.
* Introduced AutoLock.WithCondition to use a Lock and a Condition together.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-07-27 23:14:05 +02:00
Joakim Erdfelt fe9deae849 Updating to version 9.4.32-SNAPSHOT 2020-07-23 13:53:47 -05:00
Joakim Erdfelt 450ba27947 Updating to version 9.4.31.v20200723 2020-07-23 12:46:54 -05:00
Lachlan Roberts 9f3864af7e Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-07-23 18:08:20 +10:00
Lachlan 6b37983c89
Merge pull request #5065 from eclipse/jetty-9.4.x-5062-testKeystoreRemoval 
Issue #5062 - fix flaky test KeyStoreScannerTest.testKeystoreRemoval()
 2020-07-23 17:28:52 +10:00
Lachlan Roberts d5cf429537 fix websocket tests from merge 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-23 12:17:20 +10:00
Lachlan Roberts 5726fa9364 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-23 10:19:53 +10:00
Joakim Erdfelt 1b5268b511
Issue #5069 - Fixing assumeConnectTimeout test condition 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-07-21 16:04:27 -05:00
Lachlan Roberts 38a94879f9 Issue #5062 - KeyStoreScannerTest should use manual scanning to avoid timing issues 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-21 11:31:40 +10:00
Joakim Erdfelt f87711b2da
Adding jmh test to compare String.substring() vs String.repeat() 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-07-16 13:30:47 -05:00
Joakim Erdfelt 2d3b5d3f05
Moving badly merged jetty-jmh source files into correct location 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-07-16 13:20:43 -05:00
Lachlan Roberts ef60808bae fix licence headers and imports from merge 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-16 09:27:46 +10:00
Lachlan Roberts f0f153cc97 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-07-16 09:10:07 +10:00
Lachlan Roberts a83844df32 changes from review 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-14 16:10:07 +10:00
Lachlan Roberts b03643961d add tests in KeystoreScannerTest for changes with symlinks 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-14 00:22:21 +10:00
Lachlan Roberts 62ee077b79 move code of ssl-reload module to jetty-util, move module files to jetty-server 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-13 23:11:09 +10:00
olivier lamy eefe3d202b revert fail release 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-07-10 15:04:22 +10:00
olivier lamy 9619a5a743 Updating to version 10.0.0.beta1 2020-07-10 14:23:28 +10:00
olivier lamy aaeffb719e Updating to version 10.0.0-SNAPSHOT 2020-07-09 12:25:34 +10:00
olivier lamy 23c99ffdbe Updating to version 10.0.0.beta1 2020-07-09 11:20:55 +10:00
olivier lamy 4cd6a71134 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-07-09 07:54:59 +10:00
olivier lamy 7bcbc21ca9 no need of system property for this 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-07-09 07:52:47 +10:00
Simone Bordet 7d8e56bd10 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-07-03 16:46:23 +02:00
Simone Bordet ae43b70a9f
Jetty 9.4.x 4967 buffer corruption for http2 failures (#5001) 
Fixes #4967 - Possible buffer corruption in HTTP/2 session failures

Partially reverted the changes introduced in #4855, because they
were working only when sends were synchronous.

Introduced ByteBufferPool.remove(ByteBuffer) to fix the issue.
Now when a concurrent failure happens while frames are being
generated or sent, the buffer is discarded instead of being
recycled, therefore resolving the buffer corruption.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-07-03 16:35:33 +02:00
Lachlan Roberts b033d6078f Issue #5012 - Remove unneeded dependency for test-jaas-webapp 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-03 09:54:18 +02:00
Lachlan Roberts 6407322d9c Issue #5012 - Remove unneeded dependency for test-jaas-webapp 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-02 11:15:34 +10:00
Joakim Erdfelt 02bd1e5956
Followup changes from merge 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-06-25 12:52:49 -05:00
Joakim Erdfelt e1c8a0e8b8
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-06-25 12:52:29 -05:00
Joakim Erdfelt 3adec35cf5
Fixing CustomImportOrder checkstyle violations 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-06-25 09:25:05 -05:00
Simone Bordet 0b854a1f5f Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-06-18 15:37:09 +02:00
olivier lamy f745d5d5df remove unused imports and upgrade testcontainers.version 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-06-15 17:40:15 +10:00
Joakim Erdfelt 6795f3915f
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-06-12 12:04:50 -05:00
Joakim Erdfelt 4abd8b1b39
Merge remote-tracking branch 'origin/release-9.4.30' into jetty-9.4.x 2020-06-12 11:31:42 -05:00
Jan Bartel 004bbe4e9f Add deletion test for memcached session data cache. 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2020-06-12 18:20:14 +10:00
olivier lamy 7f0c725fd4 upgrade testcontainers to 1.14.2 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-06-12 18:20:14 +10:00
olivier lamy a78d2f475d use testcontainers to start memcached via docker for testing real remote memcached server 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-06-12 18:20:14 +10:00
Joakim Erdfelt 6df6fa33b8 Updating to version 9.4.31-SNAPSHOT 2020-06-11 08:24:34 -05:00
Joakim Erdfelt 271836e4c1 Updating to version 9.4.30.v20200611 2020-06-11 07:21:18 -05:00
Jan Bartel cb09abe873
Issue #4920 Restore ability to invalidate sessions on shutdown (#4933) 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2020-06-10 18:40:19 +02:00
olivier lamy 593d3e9aa6 remove duplicate dependency 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-06-07 09:31:44 +10:00
Joakim Erdfelt 426795660f
Cleaning up double-merge final issues. 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-06-03 16:14:32 -05:00
Joakim Erdfelt 0cce039e7c
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-06-03 16:10:41 -05:00
Jan Bartel 5d328ba928 Suppress debug stacktrace for TestFileSessions.testSweep 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2020-06-03 10:26:13 +02:00
Greg Wilkins b8c7a9509a Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2020-05-27 10:11:51 +02:00
olivier lamy 2b1fa80b63 always run the test except if Docker not available 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-05-27 16:00:23 +10:00
olivier lamy 7cc3573ceb remove derby system property 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-05-27 16:00:23 +10:00
olivier lamy 389f46c826 bye bye Derby tests, only use mariadb via container 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-05-27 16:00:23 +10:00
olivier lamy 1249763aad remove changes to DatabaseAdaptor with new fields username/password, use our own username/password in maria_db tests 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-05-27 16:00:23 +10:00
olivier lamy c05bd6c26d use testcontainers/docker to run jdbc sessions tests with Mariadb remote 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-05-27 16:00:23 +10:00
Joakim Erdfelt 5d6f3e2ddc Updating to version 9.4.30-SNAPSHOT 2020-05-21 13:42:25 -05:00
Joakim Erdfelt 77c232aed8 Updating to version 9.4.29.v20200521 2020-05-21 12:04:14 -05:00