Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
18,733 Commits 79 Branches 465 Tags 366 MiB
Commit Graph

4482 Commits

Author SHA1 Message Date
Lachlan Roberts ab8f37e12b Merge remote-tracking branch 'eclipse/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-06-06 07:58:24 +10:00
Lachlan Roberts e75ca325fd Issue #3683 - close part if failure occurs in MultiPartFormInputStream 
parameterize MultiPartServletTest over compliance modes

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-06-04 12:03:24 +10:00
Lachlan Roberts 17b8eb8401 Issue #3683 - ensure multipart files are still cleaned up after errors 
- do not parse MultiParts in constructor so the attribute can be set
- deleteParts in MultiPartFormInputStream from _parts MultiMap
- only add the MultiPartCleanerListener once per context

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-06-04 11:19:42 +10:00
Simone Bordet 2ba4cb2924 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-06-03 17:31:50 +02:00
Simone Bordet 5ebd6d4ad2
Merge pull request #3682 from eclipse/jetty-9.4.x-3681-HttpFieldsOptimize 
Jetty 9.4.x 3681 http fields optimize
 2019-06-03 16:51:58 +02:00
Greg Wilkins 301934cc68
Issue #3719 clean up modules (#3720) 
* Issue #3719 clean up modules

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-06-03 11:11:18 +02:00
Jan Bartel 3208af6c1c Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2019-06-03 10:29:36 +02:00
Jan Bartel dec10044e0
Jetty 9.4.x 3722 session destroy listeners (#3723) 
* Issue #3722 Use webapp classloader for HttpSessionListener.sessionDestroyed calls
 2019-06-03 10:27:38 +02:00
Greg Wilkins cf9c238721 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-3681-HttpFieldsOptimize 2019-05-26 16:18:13 +02:00
Greg Wilkins 53dc425bde Issue #3681 
updates from review

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-05-23 12:33:35 +02:00
olivier lamy d377db5d26 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-05-23 14:18:39 +10:00
Olivier Lamy f2c59a3cb7
add convenient StringUtil isEmpty method (#3687) 
* add StringUtil.isEmpty

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-05-23 09:01:36 +10:00
Greg Wilkins 4dc004cf96 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-3681-HttpFieldsOptimize 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-05-22 23:26:48 +02:00
Greg Wilkins d37038496e Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-05-22 23:21:02 +02:00
Greg Wilkins 26169491c9 Issue #3655 simplifications of Cookie handling 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-05-22 23:10:12 +02:00
Joakim Erdfelt 2de5456790 Issue #3655 - Fixing javadoc 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-05-22 23:10:12 +02:00
Joakim Erdfelt 5d267963a3 Issue #3655 - Cookie generation now complies with RFC6265 spaces 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-05-22 23:10:12 +02:00
Greg Wilkins 2ba0c7bb79 Issue #3681 
cacheContent type and avoid unnecessary character encoding calculations

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-05-22 14:12:52 +02:00
Greg Wilkins 70311fe987 Issue #3681 
minor cleanups

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-05-22 14:02:38 +02:00
Greg Wilkins 2256c532be Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-05-22 10:30:25 +02:00
Michael Hausegger 1e84a04682 Removed blank 
Signed-off-by: Michael Hausegger <hausegger.michael@googlemail.com>
 2019-05-22 08:27:53 +02:00
Michael Hausegger e8f11d3c7e Added small performance improvements 
Signed-off-by: Michael Hausegger <hausegger.michael@googlemail.com>
 2019-05-22 08:27:53 +02:00
Greg Wilkins b0bc9c9200 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2019-05-17 16:47:45 +02:00
Jan Bartel 671d1cb2b8
Issue #3653 Ensure custom SecurityManager.checkPermission is used. (#3654) 
* Issue #3653 Ensure custom SecurityManager.checkPermission is used.
 2019-05-17 16:28:42 +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 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
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
Greg Wilkins 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
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 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
Joakim Erdfelt 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
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
Joakim Erdfelt 112d08259d Migrating away from hamcrest deprecated matchers 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-04-30 13:21:54 -05:00
Joakim Erdfelt e33dfabba9 Moving to IPv6 Assumption (from junit Group/Tag) 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-04-30 12:26:14 -05:00
Joakim Erdfelt 734be56938 Updating to version 9.4.19-SNAPSHOT 2019-04-29 16:27:23 -05:00
Joakim Erdfelt e1bc35120a Updating to version 9.4.18.v20190429 2019-04-29 15:40:33 -05:00
Greg Wilkins f28bfa9377 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2019-04-29 13:21:59 +02:00
Jan Bartel ab174d1015
Issue #3597 Fix session persistence classloading for deep structures (#3602) 
* Issue #3597 Fix session persistence classloading for deep structures with system classes.
 2019-04-29 12:05:34 +02:00
Joakim Erdfelt 29b960551f Merge branch `release-9.4.17` into `jetty-9.4.x` 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

# Conflicts:
#	jetty-bom/pom.xml
 2019-04-25 09:15:42 -05:00
olivier lamy 0b6c27e276 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-04-23 13:01:42 +10:00
olivier lamy 8bacb603a7 default handler is now HTML5 compliant so default character encoding is now UTF-8 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-04-23 12:59:47 +10:00
Joakim Erdfelt 05bb111580 Updating to version 9.4.18-SNAPSHOT 2019-04-18 15:59:49 -05:00