2ba8542ed1
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2019-05-09 07:12:27 +10:00
45468988ea
Issue #3583 maven plugin do not use testOutputDirectory directory for test dependencies within reactor ( #3606 )
...
* Issue #3583 maven plugin do not use testOutputDirectory directory for test dependencies within reactor
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* use same spaces formatting
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-05-09 07:00:20 +10:00
d50ed94baa
Adding Eclipse IDE Code Style XML
2019-05-08 15:40:54 -05:00
62ebcedc59
Updating checkstyle for lambdas
2019-05-08 15:40:41 -05:00
371f828378
Update to jetty-checkstyle.xml + Intellij Style Def
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-05-08 14:22:04 -05:00
8246011020
Initial /build-resources/ with jetty-checkstyle.xml
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-05-08 10:57:15 -05:00
4dd76fc092
Issue #3550 Cleanup QTP after review
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-05-08 14:28:20 +02:00
16b73e55bc
Merge branch 'jetty-9.4.x' into jetty-9.4.x-3550-QueuedThreadPool-cleanup
2019-05-08 14:23:30 +02:00
a176c60c5c
reformatted code
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-05-08 14:15:10 +02:00
797b6af1fb
Merge branch 'add-Tests' of https://github.com/TheRealHaui/jetty.project into jetty-9.4.x
2019-05-08 14:12:06 +02:00
2d1a1553a1
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2019-05-08 10:21:19 +02:00
5dd35ee706
Issue #3627 Only renew session id when spnego authentication is fully complete ( #3629 )
...
* Issue #3627 Only renew session id when spnego authentication is fully complete.
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-05-08 10:20:42 +02:00
cb50d6f9aa
Issue #3498 - fix suspend implementation to suspend WebSocket frames
...
Signed-off-by: lachan-roberts <lachlan@webtide.com>
2019-05-08 12:28:29 +10:00
a305660c54
Merge branch `jetty-9.4.x` into `jetty-10.0.x`
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# jetty-server/src/main/config/etc/jetty-ssl-context.xml
# jetty-websocket/javax-websocket-client-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/ClientContainer.java
# jetty-websocket/javax-websocket-server-impl/src/main/java/org/eclipse/jetty/websocket/jsr356/server/ServerContainer.java
# jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/WebSocketClient.java
# jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java
2019-05-07 13:54:27 -05:00
bfcf8f8b2a
Merge pull request #3611 from eclipse/jetty-9.4.x-aggregate-javadoc
...
deploy aggregated javadoc as well during release
2019-05-07 11:47:18 -07:00
4188f92ca0
Merge pull request #3634 from eclipse/jetty-9.4.x-3633-wrong_endPointIdentificationAlgorithm_in_module_files
...
Fixes #3633 - endpointIdentificationAlgorithm enabled by default jetty-ssl-context.xml.
2019-05-07 11:46:56 -07:00
7e7920a969
Merge pull request #3622 from eclipse/jetty-9.4.x_use_local_repo_dist_test
...
force using local repo to download module dependencies
2019-05-07 11:46:43 -07:00
fa3ecefd79
Merge pull request #3621 from eclipse/jetty-9.4.x-3620-failonstartup-inhome
...
Issue #3620 - Exit Server.start() if LifeCycle.start() fails
2019-05-07 11:46:25 -07:00
8efc620d29
Merge pull request #3617 from eclipse/jetty-9.4.x-3616-backport-ws-sessiontracker
...
Issue #3616 - Backport of WebSocket SessionTracker from Jetty 10
2019-05-07 11:46:05 -07:00
cced3bd5e6
Added Unit Tests to increase code coverage.
...
Signed-off-by: Michael Hausegger <hausegger.michael@googlemail.com>
2019-05-07 18:01:10 +02:00
7d52a6957b
Fixes #3633 - endpointIdentificationAlgorithm enabled by default jetty-ssl-context.xml.
...
Updated *.xml and *.mod to reflect the right default (null), rather than "HTTPS".
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-05-07 16:46:34 +02:00
8cdb36f32b
Merge pull request #3631 from garydgregory/jetty-9.4.x_proxy_with_custom_status_code_redux
...
Allow subclasses to map exceptions to status codes.
2019-05-07 16:25:45 +02:00
b410d75091
Fixes #3605 - IdleTimeout with Jetty HTTP/2 and InputStreamResponseListener.
...
Now properly resetting HttpReceiverOverHTTP2.ContentNotifier by overriding
reset() and making sure fields are cleared from previous values.
Also, disable channel recycling by default - needs to be benchmarked
whether it's beneficial or not.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-05-07 16:22:44 +02:00
8155942344
Allow subclasses to map exceptions to status codes.
...
Signed-off-by: Gary Gregory <garydgregory@gmail.com>
2019-05-07 09:59:09 -04:00
2d5984da20
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-05-07 15:37:27 +02:00
6f35067375
Issue #3568 Make UserStore automatically startable by HashLoginService. ( #3594 )
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-05-07 14:51:48 +02:00
e45c176649
Fixes #3628 - NPE in QueuedThreadPool.getReservedThreads().
...
Added guard to avoid NPE.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-05-07 12:53:15 +02:00
b6d6c83bf1
Issue #3382 - changes from review
...
Signed-off-by: lachan-roberts <lachlan@webtide.com>
2019-05-07 09:26:36 +02:00
ec88316116
Issue #3382 - improve testing for WS suspend and fix demand on resume
...
Signed-off-by: lachan-roberts <lachlan@webtide.com>
2019-05-07 09:26:36 +02:00
7c7932a475
Issue #3498 - improve testing for websocket suspend
...
Signed-off-by: lachan-roberts <lachlan@webtide.com>
2019-05-07 11:00:32 +10:00
6887f9d6dd
Issue #3608 - fix merge of tests jetty-10
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-05-04 14:50:20 +02:00
8a4f4d390c
Issue #3620 - Applying changes from review
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-05-03 10:13:25 -05:00
6c6646286d
cleanup after review
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-05-03 15:25:05 +02:00
45270814d1
removed unused class
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-05-03 15:25:05 +02:00
604f2379bd
cleanup dumps from review
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-05-03 15:25:05 +02:00
aafb0fcec1
simplification after review
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-05-03 15:25:05 +02:00
1a76d487cc
improved names and javadoc
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-05-03 15:25:05 +02:00
feb0333844
Fixed IncludeExclude combination logic
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-05-03 15:25:05 +02:00
8b5f0211a8
parameterize include and exclude
...
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-05-03 15:25:05 +02:00
e4471ca77a
Format source and add license header
...
Signed-off-by: Nicholas DiPiazza <nicholas.dipiazza@lucidworks.com>
2019-05-03 15:25:05 +02:00
1f4189eb19
Addresses #3562
...
## Ports the `ipaccess` being added as a module from jetty 10
you can now do `java -jar start.jar --add-to-start=inetaccess` to add
the inetaccess handler to your jetty config.
## Allows you to specify a list of connector names that the
`InetAccessHandler` applies to
This is important for those who run jetty using `start.jar` to make it
possible to do things like have an open HTTPS connector but a whitelist
restricted HTTP connector.
Example:
`etc/jetty-inetaccess.xml`
```
<?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN"
"http://www.eclipse.org/jetty/configure_9_3.dtd ">
<Configure id="Server" class="org.eclipse.jetty.server.Server">
<Call name="insertHandler">
<Arg>
<New id="InetAccessHandler"
class="org.eclipse.jetty.server.handler.InetAccessHandler">
<Call name="exclude"><Arg>127.0.0.128-127.0.0.129</Arg></Call>
<Call name="includeConnectorName"><Arg>http</Arg></Call>
</New>
</Arg>
</Call>
</Configure>
```
You can now
`java -jar start.jar --add-to-start=https`
and
`java -jar start.jar --add-to-start=inetaccess`
And you can now choose what inetaccess handler rules apply to http
versus https.
## Adds a basic `InetAccessHandler` Unit Test
Cover a few of the basic features of InetAccessHandler so it can have
some coverage.
Signed-off-by: Nicholas DiPiazza <nicholas.dipiazza@lucidworks.com>
2019-05-03 15:25:05 +02:00
13c9d24f08
force using local repo to download module dependencies
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-05-03 19:03:20 +10:00
2fa8a0a943
Issue #3620 - Fixing unixsocket distribution test
...
+ Giving download more time to complete
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-05-02 19:30:19 -05:00
78a71b71cc
Issue #3620 - Exit Server.start() if LifeCycle.start() fails
...
+ DeploymentManager will hang onto errors encountered and report them
en-masse if on it's own doStart().
+ Added jetty-deploy test cases.
+ Added test-distribution test case.
+ Updated test-distribution to allow this kind of test case.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-05-02 18:51:06 -05:00
80fe389c8b
fix javadoc:aggregate-jar goal order
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-05-02 10:15:46 +10:00
52bb963186
Merge branch `jetty-9.4.x` into `jetty-10.0.x`
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
# Conflicts:
# aggregates/jetty-all-compact3/pom.xml
# jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientTest.java
# jetty-deploy/src/test/java/org/eclipse/jetty/deploy/bindings/GlobalWebappConfigBindingTest.java
# jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/HttpClientTest.java
# jetty-http/src/test/java/org/eclipse/jetty/http/HttpParserTest.java
# jetty-http2/http2-alpn-tests/pom.xml
# jetty-http2/http2-http-client-transport/pom.xml
# jetty-infinispan/infinispan-remote-query/src/test/java/org/eclipse/jetty/server/session/infinispan/RemoteQueryManagerTest.java
# jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ConnectHandlerTest.java
# jetty-server/src/test/java/org/eclipse/jetty/server/HttpConnectionTest.java
# jetty-server/src/test/java/org/eclipse/jetty/server/ProxyConnectionTest.java
# jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextTest.java
# jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ErrorPageTest.java
# jetty-servlets/src/test/java/org/eclipse/jetty/servlets/CrossOriginFilterTest.java
# jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipDefaultTest.java
# jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipTester.java
# jetty-servlets/src/test/java/org/eclipse/jetty/servlets/HeaderFilterTest.java
# jetty-servlets/src/test/java/org/eclipse/jetty/servlets/PutFilterTest.java
# jetty-util/src/test/java/org/eclipse/jetty/util/BufferUtilTest.java
# jetty-util/src/test/java/org/eclipse/jetty/util/resource/ResourceCollectionTest.java
# jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/DecoderReaderManySmallTest.java
# jetty-websocket/javax-websocket-server-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/server/DelayedStartClientOnServerTest.java
# jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/client/DelayedStartClientTest.java
# jetty-websocket/javax-websocket-tests/src/test/java/org/eclipse/jetty/websocket/javax/tests/server/AltFilterTest.java
# jetty-websocket/jetty-websocket-client/src/test/java/org/eclipse/jetty/websocket/client/HttpClientInitTest.java
# jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/ClientCloseTest.java
# jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/io/AbstractWebSocketConnection.java
# jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/ByteAccumulatorTest.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WSServer.java
# jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketServerFactoryTest.java
# jetty-xml/src/test/java/org/eclipse/jetty/xml/XmlConfigurationTest.java
# pom.xml
# tests/jetty-http-tools/src/main/java/org/eclipse/jetty/http/tools/matchers/HttpFieldsMatchers.java
# tests/test-http-client-transport/pom.xml
# tests/test-http-client-transport/src/test/java/org/eclipse/jetty/http/client/ServerTimeoutsTest.java
# tests/test-integration/src/test/java/org/eclipse/jetty/test/support/rawhttp/HttpResponseTesterTest.java
2019-05-01 15:02:31 -05:00
9d159318f5
Issue #3616 - Backport of SessionTracker from Jetty 10.0.x
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-05-01 10:47:08 -05:00
205c4dc498
Merge pull request #3612 from eclipse/jetty-9.4.x-update-test-helper
...
Update testing
2019-05-01 05:40:24 -07:00
bb8e5557d2
fix flaky test ClientCloseTest.testWriteException
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-05-01 07:58:24 +02:00
7eb35a3374
Fixing testcase .dispose() that doesn't like assumed tests
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-04-30 15:43:01 -05:00
olivier lamy
Joakim Erdfelt
Greg Wilkins
Jan Bartel
lachan-roberts
Michael Hausegger
Simone Bordet
Gary Gregory
Nicholas DiPiazza