4348 Commits

Author SHA1 Message Date
Greg Wilkins
9d37feba3c
Cleanup after #2903 (#2933)
Improved dump output of ServletHandler and ContextHandler
Fixed duplicate listeners
Removed unused fields

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-10-03 10:00:14 +10:00
olivier lamy
90ca8063eb Merge branch 'jetty-9.4.x' into jetty-10.0.x 2018-10-03 09:55:58 +10:00
Simone Bordet
8213a95a7b Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2018-10-02 22:51:46 +02:00
Joakim Erdfelt
57ef060325 Issue #2936 - Allow Dispatcher.error() to work for BadMessageException
+ Applying fixes from review

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-10-02 08:39:05 -05:00
Joakim Erdfelt
fe66e3d0cb Issue #2936 - Allow Dispatcher.error() to work for BadMessageException
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-10-01 10:43:57 -05:00
Simone Bordet
27e7b3287a Merged branch 'jetty-9.4.x' into 'jetty-9.4.x-2191-jpms_automatic_module_name'. 2018-09-26 13:51:21 +02:00
Simone Bordet
7e68ef1e17 Issue #2191 - JPMS Support.
Now server.mod patches the servlet.api JPMS module with jetty-schemas.jar.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-09-26 13:22:29 +02:00
Simone Bordet
701a21fb1a Merged branch 'jetty-9.4.x' into 'jetty-9.4.x-2727-mbeanInfoCaching2'. 2018-09-26 10:07:25 +02:00
Simone Bordet
92e70f2c84 Issue #2727 - Revisit JMX MBean lookup behavior.
Fixed invoke() lookup.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-09-24 10:49:29 +02:00
Greg Wilkins
304eac7460 improved debug (more to do)
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-09-24 16:41:03 +10:00
olivier lamy
49c12ae0f0 fix merge
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-09-22 21:19:31 +10:00
olivier lamy
5e8a7403d1 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2018-09-22 20:11:03 +10:00
Olivier Lamy
71a1801433
Issue #2918 restore a TestTracker with junit5 (#2927)
* add TestTracker junit5 extension #2918

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-09-21 14:03:05 +10:00
Greg Wilkins
a9566d429c
Issue #2912 Remove Content-Length from inflated requests (#2915)
Issue #2912 Remove Content-Length from inflated requests
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-09-21 07:44:53 +10:00
Simone Bordet
3a8a20557d Fixes #2913 - ClassNotFoundException: sun.reflect.Reflection with JDK 11
Another update after review.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-09-19 17:07:49 +02:00
Simone Bordet
bae502681c Fixes #2913 - ClassNotFoundException: sun.reflect.Reflection with JDK 11
Another update after review.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-09-19 13:50:33 +02:00
Simone Bordet
9a9a52b960 Fixes #2913 - ClassNotFoundException: sun.reflect.Reflection with JDK 11
Updated after review.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-09-19 13:44:12 +02:00
Simone Bordet
3384ff90ea Fixes #2913 - ClassNotFoundException: sun.reflect.Reflection with JDK 11
Replaced usage of sun.reflect.Reflection with a
SecurityManager subclass, so that it works in all JDKs.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-09-19 12:46:39 +02:00
Joakim Erdfelt
a07f6cf7b9 Using declared default for Jetty 10.x
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-09-10 02:03:43 -05:00
Joakim Erdfelt
4978321a93 More post-merge IPv6 test corrections (missed merges)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-09-07 13:55:21 -05:00
olivier lamy
32912b922d Merge branch 'jetty-9.4.x' into jetty-10.0.x 2018-09-06 17:39:57 +10:00
olivier lamy
1504b7da93 Revert "Issue #2431 - Upgrade to Junit 5 (#2436)"
This reverts commit e24fc485396852569b0a6dac32d8872fa15ef297.
2018-09-06 09:27:11 +10:00
olivier lamy
8a05c651c0 Revert "fix merging"
This reverts commit a3e4a08903912c7b7b3f77ca72591dac1355f832.
2018-09-06 09:26:57 +10:00
olivier lamy
a3e4a08903 fix merging
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-09-05 22:05:18 +10:00
Joakim Erdfelt
e24fc48539 Issue #2431 - Upgrade to Junit 5 (#2436)
+ Changes needed for new Junit 5
+ Migrating from Vintage junit API to Jupiter junit API
+ Relies on SNAPSHOT jetty-test-helper
  - this will be a formal release once this issue has been
    resolved satisfactory
+ Have jenkins always pull latest SNAPSHOT for each build
+ Adding jetty.snapshots repository
+ Using surefire 2.22.0 per advice from junit
+ Ensuring <reuseForks>true</reuseForks> to work around issue junit-team/junit5#801
+ Disabling <forkMode>always</forkMode> in maven-surefire-plugin
  due to bug https://github.com/junit-team/junit5/issues/801
+ OSGi tests must remain at vintage due to PaxExam
+ Moving from vintage TestingDir to jupiter WorkDir
+ Fixing imports to use jupiter, not vintage
+ Migrating vintage ExpectedException to jupiter assertThrows
+ Migrating vintage TestName to jupiter TestInfo
+ Migrating @RunWith(Parameterized.class)
  to @ParameterizedTest with Argument Sources
+ Migrating assertTrue(val.contains(needle))
  to assertThat(val, containsString(needle))
+ Aligning junit versions per recommendations from @sormuras
+ Adjusting parameter order change for assertEquals()
+ Test LifeCycle Annotation Migration

junit 4      | junit 5 / jupiter
------------ | -----------
@Before      | @BeforeEach
@After       | @AfterEach
@BeforeClass | @BeforeAll
@AfterClass  | @AfterAll

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-09-05 21:27:18 +10:00
Joakim Erdfelt
a3f1592c50 Issue #2431 - Upgrade to Junit 5 (#2436)
+ Changes needed for new Junit 5
+ Migrating from Vintage junit API to Jupiter junit API
+ Relies on SNAPSHOT jetty-test-helper
  - this will be a formal release once this issue has been
    resolved satisfactory
+ Have jenkins always pull latest SNAPSHOT for each build
+ Adding jetty.snapshots repository
+ Using surefire 2.22.0 per advice from junit
+ Ensuring <reuseForks>true</reuseForks> to work around issue junit-team/junit5#801
+ Disabling <forkMode>always</forkMode> in maven-surefire-plugin
  due to bug https://github.com/junit-team/junit5/issues/801
+ OSGi tests must remain at vintage due to PaxExam
+ Moving from vintage TestingDir to jupiter WorkDir
+ Fixing imports to use jupiter, not vintage
+ Migrating vintage ExpectedException to jupiter assertThrows
+ Migrating vintage TestName to jupiter TestInfo
+ Migrating @RunWith(Parameterized.class)
  to @ParameterizedTest with Argument Sources
+ Migrating assertTrue(val.contains(needle))
  to assertThat(val, containsString(needle))
+ Aligning junit versions per recommendations from @sormuras
+ Adjusting parameter order change for assertEquals()
+ Test LifeCycle Annotation Migration

junit 4      | junit 5 / jupiter
------------ | -----------
@Before      | @BeforeEach
@After       | @AfterEach
@BeforeClass | @BeforeAll
@AfterClass  | @AfterAll

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-09-05 10:07:17 +10:00
Jesse McConnell
863a19bccf
Updating to version 9.3.26-SNAPSHOT 2018-09-04 17:23:31 -05:00
Jesse McConnell
3ce520221d
Updating to version 9.3.25.v20180904 2018-09-04 16:08:21 -05:00
Jesse McConnell
8dd05ac3f7
merge from 9.4.x 2018-09-04 13:48:43 -05:00
Simone Bordet
831b684300 Issue #2871 - Server reads -1 after client resets HTTP/2 stream.
Backported to jetty-9.3.x branch.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-08-31 19:07:57 +02:00
Jesse McConnell
dcf6a8fa9f
Updating to version 9.4.13-SNAPSHOT 2018-08-30 10:48:22 -05:00
Jesse McConnell
2720868475
Updating to version 9.4.12.v20180830 2018-08-30 08:56:44 -05:00
Simone Bordet
eb87415ed6 Issue #2871 - Server reads -1 after client resets HTTP/2 stream.
HttpInput.consume() now checks if the state is already failed,
and if so it does not change it when consuming the input.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-08-30 11:47:50 +02:00
WalkerWatch
d95b39f5f7 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2018-08-29 12:16:26 -04:00
Simone Bordet
7cf027b98f Jetty 9.4.x 2711 tls 13 compliance (#2857)
Issue #2711 - TLS 1.3 compliance.

Disabled few tests that are TLS 1.2 specific.
Renegotiation in SslConnection is now skipped for TLS 1.3.
Replaced SNI keystore DSA certificate with RSA certificate.
First full build achieved with JDK 11+28.
Small changes after review.
Modified the test case to pass in JDK 8, where the implementation
throws SSLException, while in later JDKs throws SSLHandshakeException.
Minor cleanup

Signed-off-by: Greg Wilkins <gregw@webtide.com>
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-08-28 21:43:45 +10:00
WalkerWatch
90f15f278b 9.4.x->10.0.x 2018-08-27 22:58:01 -04:00
Simone Bordet
5b5f2fcf5f Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2018-08-27 10:29:12 +02:00
Olivier Lamy
44e57f2170
Issue #2775 LowResourceMonitor extendable (#2812)
* make LowResourceMonitor extendable #2775

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-08-23 21:42:37 +10:00
Greg Wilkins
5afe2e215f Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2018-08-23 17:17:46 +10:00
Greg Wilkins
460f3fcb9b
Close on graceful #2749 (#2772)
Cleanup of Graceful shutdown, plus ensure Connection:close if connector is shutdown for #2749 
* WIP close connection when shutting down
* WIP use HttpChannel.Listener
* cleanups
* support graceful stop of a context
* only close connections if the connector is shutdown
* minor cleanups
* fixed toString and test
* fixed imports
* Move close logic to HttpConnection
* fixed generator to not override persistent
* Issue #2749 - Close connections on graceful shutdown.
* Small fix after review.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-08-23 08:08:17 +10:00
Greg Wilkins
bd143a674b
Issue #2787 BadMessage if bad query detected in dispatcher (#2827)
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-08-22 08:29:12 +10:00
Joakim Erdfelt
fc5dd874f3 Issue #2824 - Request.getParameters() should not reparse or recreate _parameters Map
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-08-21 11:09:15 -05:00
Greg Wilkins
f15bd225b4 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2018-08-21 14:47:19 +10:00
Lachlan
dbe340a20e Issue #300 - Implement Deflater Pool (#2784)
Issue #300 - Implement Deflater Pool

Removed the ThreadLocal pooling of deflaters in GzipHandler in favour of a new DeflaterPool class
GzipHttpOutputInterceptor.GzipBufferCB now recycles the Deflater in onCompleteFailure()
added benchmark for the DeflaterPool

allow negative capacity to mean no limit on the pool size
added mod file and xml changes

replace setDeflaterPool with newDeflaterPool

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-08-21 10:32:34 +10:00
Joakim Erdfelt
a3fe88cf1f Removing invalid (and ignored) test from Issue #1175
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-08-20 14:23:17 -05:00
Greg Wilkins
04cbb13ad3 Issue #2787 BadMessage if bad query detected in dispatcher
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-08-18 11:52:28 +10:00
Jan Bartel
9fcb5ef9fb
Jetty 9.4.x 2745 jdbcsessiondatastore nvarchar (#2783)
* Issue #2745 Allow string type to be explicitly set for JDBCSessionDataStore

Signed-off-by: Jan Bartel <janb@webtide.com>
2018-08-16 08:28:32 +10:00
Greg Wilkins
a315d5464f
Unwrap ServletException #2787 (#2790)
* Issue #2787 Unwrap ServletException
* Do not unwrap UnavailableException
* unwrap to specific targets
* fixes from review
* fixes after merge

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-08-15 12:51:27 +10:00
Greg Wilkins
e5f0531db0 fixes after merge
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-08-15 11:59:15 +10:00
Greg Wilkins
9ff37122db Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2018-08-15 11:58:52 +10:00