Commit Graph

16748 Commits

Author SHA1 Message Date
Simone Bordet f0e4102896
Merge pull request #3657 from TheRealHaui/small-minor-performance-improvements
Using `isEmpty()` instead of testing size/length.
2019-05-15 21:29:07 +02:00
Michael Hausegger 53c9a8c35a Small minor performance improvements
Signed-off-by: Michael Hausegger <hausegger.michael@googlemail.com>
2019-05-15 20:23:45 +02:00
Michael Hausegger 665b1929e0 Small minor performance improvements
Signed-off-by: Michael Hausegger <hausegger.michael@googlemail.com>
2019-05-15 20:17:33 +02:00
Joakim Erdfelt 076c6b1c71 Issue #2909 - adding jmh tests
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-05-15 10:08:11 +02:00
Joakim Erdfelt 73d7eaaba3 Issue #2909 - Replace B64Code with java.util.Base64
+ Address Mime Encoding behavior difference detected in testcase

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-05-15 10:08:11 +02:00
Joakim Erdfelt b44ecc932a Issue #2909 - Replace B64Code with java.util.Base64
+ Deprecated B64Code
+ All code that isn't B64CodeTest is now using java.util.Base64
+ B64CodeTest is updated to confirm change to java.util.Base64
  is possible without change in behavior. Just have to make
  sure you use the appropriate Encoder / Decoder for the task
  at hand (default vs mime vs url)

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-05-15 10:08:11 +02:00
Greg Wilkins 8e4756b89c added benchmark
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-05-14 17:08:01 +02:00
Joakim Erdfelt 09a60cd4f3 Issue #3630 - more HostPort tests
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-05-14 17:08:01 +02:00
Greg Wilkins cec50b3d2c Issue #3630 Optimized ForwardedRequestCustomizer
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-05-14 17:08:01 +02:00
Greg Wilkins 9f3b0223ab Issue #3630 Forwarded-Port
reformatted code
Avoid updating handles unless configuration is changed.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-05-14 17:08:01 +02:00
Greg Wilkins 05072b34dc Issue #3630 Forwarded-Port
Added support for the X-Forwarded-Port header.
Reimplemented header scanning using more efficient Trie and MethodHandles

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-05-14 17:08:01 +02:00
Joakim Erdfelt 3f4d196070
Merge pull request #3643 from eclipse/jetty-9.4.x-websocket-ssl
Updating WebSocket Examples seen in documentation
2019-05-14 09:19:10 -05:00
Simone Bordet 368db49f82
Merge pull request #3646 from eclipse/jetty-9.4.x_upgrade_plugins
upgrade maven plugins and configure clean plugin version
2019-05-14 08:55:43 +02:00
olivier lamy 699026b08d upgrade maven plugins and configure clean plugin version
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-05-14 11:09:32 +10:00
Joakim Erdfelt 54d8faf664 Updating WebSocket Examples seen in documentation
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-05-10 09:08:59 -05:00
Jan Bartel e7801ffbcd
Jetty 9.4.x 3609 more infinispan module refactor (#3638)
* Issue #3609 Refactor infinispan modules

Signed-off-by: Jan Bartel <janb@webtide.com>
2019-05-09 15:07:03 +02:00
Olivier Lamy 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
Greg Wilkins a176c60c5c reformatted code
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-05-08 14:15:10 +02:00
Greg Wilkins 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
Jan Bartel 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
Joakim Erdfelt 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
Joakim Erdfelt 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
Joakim Erdfelt 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
Joakim Erdfelt 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
Joakim Erdfelt 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
Michael Hausegger 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
Simone Bordet 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
Simone Bordet 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
Gary Gregory 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
Jan Bartel 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
Simone Bordet 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
Joakim Erdfelt 8a4f4d390c Issue #3620 - Applying changes from review
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-05-03 10:13:25 -05:00
Greg Wilkins 6c6646286d cleanup after review
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-05-03 15:25:05 +02:00
Greg Wilkins 45270814d1 removed unused class
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-05-03 15:25:05 +02:00
Greg Wilkins 604f2379bd cleanup dumps from review
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-05-03 15:25:05 +02:00
Greg Wilkins aafb0fcec1 simplification after review
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-05-03 15:25:05 +02:00
Greg Wilkins 1a76d487cc improved names and javadoc
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-05-03 15:25:05 +02:00
Greg Wilkins feb0333844 Fixed IncludeExclude combination logic
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-05-03 15:25:05 +02:00
Greg Wilkins 8b5f0211a8 parameterize include and exclude
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-05-03 15:25:05 +02:00
Nicholas DiPiazza e4471ca77a Format source and add license header
Signed-off-by: Nicholas DiPiazza <nicholas.dipiazza@lucidworks.com>
2019-05-03 15:25:05 +02:00
Nicholas DiPiazza 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
olivier lamy 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
Joakim Erdfelt 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
Joakim Erdfelt 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
olivier lamy 80fe389c8b fix javadoc:aggregate-jar goal order
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-05-02 10:15:46 +10:00
Joakim Erdfelt 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
Joakim Erdfelt 205c4dc498
Merge pull request #3612 from eclipse/jetty-9.4.x-update-test-helper
Update testing
2019-05-01 05:40:24 -07:00
Lachlan Roberts bb8e5557d2 fix flaky test ClientCloseTest.testWriteException
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-05-01 07:58:24 +02:00
Joakim Erdfelt 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
Joakim Erdfelt 41ab9baf8c Standardizing on hamcrest Matchers (not CoreMatchers from junit4)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-04-30 14:39:57 -05:00