Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
17,930 Commits 67 Branches 465 Tags 359 MiB
Commit Graph

4332 Commits

Author SHA1 Message Date
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 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
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
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
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 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 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
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 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
Joakim Erdfelt aa1c656c31 Updating to version 9.4.17.v20190418 2019-04-18 14:44:28 -05:00
Joakim Erdfelt 5882d63ba7 Updating to version 9.3.28-SNAPSHOT 2019-04-18 13:54:17 -05:00
Joakim Erdfelt d3e249f869 Updating to version 9.3.27.v20190418 2019-04-18 13:10:03 -05:00
Joakim Erdfelt 2c14d93885 Updating to version 9.2.29-SNAPSHOT 2019-04-18 12:17:07 -05:00
Joakim Erdfelt 1dffa36fe3 Updating to version 9.2.28.v20190418 2019-04-18 11:23:17 -05:00
Joakim Erdfelt c75136fe63 Merge branch 'release-9.4.16' into jetty-9.4.x 2019-04-18 10:13:20 -05:00
Jan Bartel b6809f5555
Jetty 9.4.x 2140 infinispan expired sessions (#3457) 
Infinispan and hazelcast changes to scavenge zombie expired sessions.

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
Signed-off-by: Jan Bartel <janb@webtide.com>
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-04-18 17:24:25 +10:00
Joakim Erdfelt 2995029c98 Merge branch `jetty-9.3.x` into `jetty-9.4.x` 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

# Conflicts:
#	jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientTest.java
#	jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientURITest.java
#	jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/AbstractHttpClientServerTest.java
#	jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/HttpClientTest.java
#	jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ConnectHandlerTest.java
#	jetty-server/src/main/java/org/eclipse/jetty/server/handler/DefaultHandler.java
#	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DefaultServletTest.java
#	jetty-util/src/main/java/org/eclipse/jetty/util/resource/Resource.java
#	pom.xml
 2019-04-17 17:10:53 -05:00
Joakim Erdfelt 3ab1ea3181 Merge branch `jetty-9.2.x` into `jetty-9.3.x` 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

# Conflicts:
#	jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientTest.java
#	jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientURITest.java
#	jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/AbstractHttpClientServerTest.java
#	jetty-fcgi/fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/HttpClientTest.java
#	jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ConnectHandlerTest.java
#	jetty-server/src/main/java/org/eclipse/jetty/server/handler/DefaultHandler.java
#	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DefaultServletTest.java
#	jetty-spdy/spdy-http-client-transport/src/test/java/org/eclipse/jetty/spdy/client/http/HttpClientTest.java
#	jetty-util/src/main/java/org/eclipse/jetty/util/resource/Resource.java
#	pom.xml
 2019-04-17 16:47:15 -05:00
Joakim Erdfelt a15534d72c Issue #3555 - Applying more changes from review 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-04-17 16:36:33 -05:00
Joakim Erdfelt b0f72a87d5 Issue #3555 - Applying more changes from review 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-04-17 12:16:18 -05:00
Joakim Erdfelt 5ef8a8abfa Issue #3555 - Applying more changes from review 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-04-17 10:51:05 -05:00
Joakim Erdfelt 99f3926d05 Issue #3555 - Applying changes from review 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-04-16 14:49:03 -05:00
Joakim Erdfelt d983890d17 Issue #3555 - DefaultHandler output cleaned up. 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-04-16 13:28:57 -05:00
Joakim Erdfelt 6d847d4a73 Issue #3555 - DefaultHandler output is now HTML5 compliant. 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-04-16 12:02:15 -05:00
Joakim Erdfelt 9f506e4123 Issue #3555 - Do not reveal base resource in error response 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-04-15 18:24:35 -05:00
Joakim Erdfelt 04c994712c Issue #3555 - Do not reveal base resource in error response 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-04-15 18:20:39 -05:00
Joakim Erdfelt 79537a5f51 Updating to version 9.4.17-SNAPSHOT 2019-04-11 11:00:24 -05:00
Joakim Erdfelt e0aa4ae4c0 Updating to version 9.4.16.v20190411 2019-04-11 10:01:26 -05:00
Joakim Erdfelt 9fc5eb2af8 Issue #3545 - NPE in HttpOutput with print("") 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-04-11 07:17:00 -05:00
Joakim Erdfelt 20343ba7cb
Merge pull request #3542 from eclipse/jetty-9.4.x-issue-3540-ssl-provider-consistency 
Issue #3540 - Use configured Security Provider consistently
 2019-04-10 08:16:03 -07:00
Joakim Erdfelt 1532eba61d Issue #3319 - Fixing sorting of listings 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-04-10 10:15:21 -05:00
Joakim Erdfelt 0efa519553 Issue #3540 - Use configured Security Provider consistently 
+ If optional Security Provider is configured, then use it consistently
  for all security objects that take a Provider argument.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-04-10 08:22:16 -05:00
Simone Bordet 3eda16988c Fixed ClassCastException. 
Cannot cast Handler[] down to ContextHandlerCollection[].

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-04-07 11:05:26 +02:00
olivier lamy 4ad8553fb1 fix format removing extra space 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-04-07 10:06:06 +10:00
Simone Bordet 6647b9cf37 Issue #3319 - Modernize Directory Listing: HTML5 and Sorting. 
Fixed test.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-04-06 11:51:16 +02:00
Olivier Lamy 8829602201
Exclude ipv6 tests for ci profile (Jenkins) (#3528) 
* exclude ipv6 test as currently failing on kubernetes, using junit tag and ci profile activated via Jenkinsfile

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

* upgrade surefire to 3.0.0-M3

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-04-06 13:27:42 +10:00
Simone Bordet e4e72968cd Issue #3361 - HandlerCollection.addHandler is lacking synchronization. 
Removed unused code.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-04-05 09:00:45 +02:00
Simone Bordet 97d501d444 Merged branch 'jetty-9.4.x' into 'jetty-9.4.x-3361-thread-safe-setHandlers'. 2019-04-05 08:47:34 +02:00
Joakim Erdfelt 9b19374c5d Updating to version 9.2.28-SNAPSHOT 2019-04-03 19:38:05 -05:00
Joakim Erdfelt 84dfe74b97 Updating to version 9.2.27.v20190403 2019-04-03 19:04:45 -05:00
Joakim Erdfelt c70034766e Updating to version 9.3.27-SNAPSHOT 2019-04-03 18:46:31 -05:00
Joakim Erdfelt dae476e369 Updating to version 9.3.26.v20190403 2019-04-03 18:16:32 -05:00
Joakim Erdfelt 2ccde9772b Undoing bad release-9.3.26 2019-04-03 18:11:16 -05:00
Joakim Erdfelt 7478c04351 Merge branch `jetty-9.3.x` into `jetty-9.4.x` 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

# Conflicts:
#	Jenkinsfile
#	VERSION.txt
#	aggregates/jetty-all-compact3/pom.xml
#	aggregates/jetty-all/pom.xml
#	apache-jsp/pom.xml
#	apache-jstl/pom.xml
#	examples/async-rest/async-rest-jar/pom.xml
#	examples/async-rest/async-rest-webapp/pom.xml
#	examples/async-rest/pom.xml
#	examples/embedded/pom.xml
#	examples/pom.xml
#	jetty-alpn/jetty-alpn-client/pom.xml
#	jetty-alpn/jetty-alpn-java-client/pom.xml
#	jetty-alpn/jetty-alpn-java-server/pom.xml
#	jetty-alpn/jetty-alpn-server/pom.xml
#	jetty-alpn/pom.xml
#	jetty-annotations/pom.xml
#	jetty-ant/pom.xml
#	jetty-bom/pom.xml
#	jetty-cdi/cdi-core/pom.xml
#	jetty-cdi/cdi-full-servlet/pom.xml
#	jetty-cdi/cdi-servlet/pom.xml
#	jetty-cdi/cdi-websocket/pom.xml
#	jetty-cdi/pom.xml
#	jetty-cdi/test-cdi-webapp/pom.xml
#	jetty-client/pom.xml
#	jetty-continuation/pom.xml
#	jetty-deploy/pom.xml
#	jetty-distribution/pom.xml
#	jetty-documentation/pom.xml
#	jetty-fcgi/fcgi-client/pom.xml
#	jetty-fcgi/fcgi-server/pom.xml
#	jetty-fcgi/pom.xml
#	jetty-gcloud/jetty-gcloud-memcached-session-manager/pom.xml
#	jetty-gcloud/jetty-gcloud-session-manager/pom.xml
#	jetty-gcloud/pom.xml
#	jetty-hazelcast/pom.xml
#	jetty-http-spi/pom.xml
#	jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/HttpSpiContextHandler.java
#	jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/JettyHttpContext.java
#	jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/JettyHttpExchangeDelegate.java
#	jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/JettyHttpServerProvider.java
#	jetty-http/pom.xml
#	jetty-http2/http2-alpn-tests/pom.xml
#	jetty-http2/http2-client/pom.xml
#	jetty-http2/http2-common/pom.xml
#	jetty-http2/http2-hpack/pom.xml
#	jetty-http2/http2-http-client-transport/pom.xml
#	jetty-http2/http2-server/pom.xml
#	jetty-http2/pom.xml
#	jetty-infinispan/pom.xml
#	jetty-io/pom.xml
#	jetty-jaas/pom.xml
#	jetty-jaspi/pom.xml
#	jetty-jmx/pom.xml
#	jetty-jndi/pom.xml
#	jetty-jspc-maven-plugin/pom.xml
#	jetty-maven-plugin/pom.xml
#	jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyDeployWar.java
#	jetty-monitor/pom.xml
#	jetty-nosql/pom.xml
#	jetty-osgi/jetty-osgi-alpn/pom.xml
#	jetty-osgi/jetty-osgi-boot-jsp/pom.xml
#	jetty-osgi/jetty-osgi-boot-warurl/pom.xml
#	jetty-osgi/jetty-osgi-boot/pom.xml
#	jetty-osgi/jetty-osgi-httpservice/pom.xml
#	jetty-osgi/pom.xml
#	jetty-osgi/test-jetty-osgi-context/pom.xml
#	jetty-osgi/test-jetty-osgi-fragment/pom.xml
#	jetty-osgi/test-jetty-osgi-webapp/pom.xml
#	jetty-osgi/test-jetty-osgi/pom.xml
#	jetty-plus/pom.xml
#	jetty-proxy/pom.xml
#	jetty-quickstart/pom.xml
#	jetty-rewrite/pom.xml
#	jetty-runner/pom.xml
#	jetty-security/pom.xml
#	jetty-security/src/test/java/org/eclipse/jetty/security/AliasedConstraintTest.java
#	jetty-server/pom.xml
#	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java
#	jetty-servlet/pom.xml
#	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java
#	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DefaultServletTest.java
#	jetty-servlets/pom.xml
#	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/ThreadStarvationTest.java
#	jetty-spring/pom.xml
#	jetty-start/pom.xml
#	jetty-start/src/test/java/org/eclipse/jetty/start/BaseHomeTest.java
#	jetty-start/src/test/java/org/eclipse/jetty/start/ConfigurationAssert.java
#	jetty-util-ajax/pom.xml
#	jetty-util/pom.xml
#	jetty-util/src/main/java/org/eclipse/jetty/util/resource/Resource.java
#	jetty-webapp/pom.xml
#	jetty-websocket/javax-websocket-client-impl/pom.xml
#	jetty-websocket/javax-websocket-server-impl/pom.xml
#	jetty-websocket/pom.xml
#	jetty-websocket/websocket-api/pom.xml
#	jetty-websocket/websocket-client/pom.xml
#	jetty-websocket/websocket-common/pom.xml
#	jetty-websocket/websocket-server/pom.xml
#	jetty-websocket/websocket-servlet/pom.xml
#	jetty-xml/pom.xml
#	pom.xml
#	tests/pom.xml
#	tests/test-continuation/pom.xml
#	tests/test-http-client-transport/pom.xml
#	tests/test-integration/pom.xml
#	tests/test-jmx/jmx-webapp-it/pom.xml
#	tests/test-jmx/jmx-webapp/pom.xml
#	tests/test-jmx/pom.xml
#	tests/test-loginservice/pom.xml
#	tests/test-quickstart/pom.xml
#	tests/test-sessions/pom.xml
#	tests/test-sessions/test-file-sessions/pom.xml
#	tests/test-sessions/test-gcloud-sessions/pom.xml
#	tests/test-sessions/test-infinispan-sessions/pom.xml
#	tests/test-sessions/test-jdbc-sessions/pom.xml
#	tests/test-sessions/test-memcached-sessions/pom.xml
#	tests/test-sessions/test-mongodb-sessions/pom.xml
#	tests/test-sessions/test-sessions-common/pom.xml
#	tests/test-webapps/pom.xml
#	tests/test-webapps/test-jaas-webapp/pom.xml
#	tests/test-webapps/test-jetty-webapp/pom.xml
#	tests/test-webapps/test-jndi-webapp/pom.xml
#	tests/test-webapps/test-mock-resources/pom.xml
#	tests/test-webapps/test-proxy-webapp/pom.xml
#	tests/test-webapps/test-servlet-spec/pom.xml
#	tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
#	tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
#	tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
#	tests/test-webapps/test-webapp-rfc2616/pom.xml
 2019-04-03 17:47:18 -05:00
Joakim Erdfelt 554fc39f06 Merge branch `jetty-9.2.x` into `jetty-9.3.x` 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

# Conflicts:
#	jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/HttpSpiContextHandler.java
#	jetty-http-spi/src/main/java/org/eclipse/jetty/http/spi/JettyHttpServerProvider.java
#	jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyDeployWar.java
#	jetty-security/src/test/java/org/eclipse/jetty/security/AliasedConstraintTest.java
#	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java
#	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DefaultServletTest.java
#	jetty-start/src/test/java/org/eclipse/jetty/start/BaseHomeTest.java
#	jetty-start/src/test/java/org/eclipse/jetty/start/ConfigurationAssert.java
#	jetty-util/src/main/java/org/eclipse/jetty/util/resource/Resource.java
 2019-04-03 17:19:34 -05:00
Joakim Erdfelt ca77bd384a Issue #3319 - Refactoring DefaultServlet Index/Listing 
+ Now generates valid HTML5
+ Now allows column sort

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-04-03 16:28:26 -05:00
bkmz c14bf735a2 Compression pool for PermessageDeflate extensions for websockets 
- Implements Compression Pool (based on apache Commons Pool)
- Implements Inflater Pool
- Plugs Compression Pools usage in Permessage-Deflate

Signed-off-by: bkmz <ilya.cherkasov@gmail.com>
 2019-04-03 12:13:00 +03:00
Greg Wilkins 9f4b3542cb Updating to version 9.3.27-SNAPSHOT 2019-04-03 17:32:08 +11:00
Greg Wilkins 7ec6d2fb32 Updating to version 9.3.26.v20190403 2019-04-03 13:06:51 +11:00
Simone Bordet c4b2621f56
Merge pull request #3480 from eclipse/jetty-9.4.x-3464-split_sslcontextfactory 
Issue #3464 - Split SslContextFactory into Client and Server
 2019-04-02 12:39:37 +02:00
Greg Wilkins 879b9f5d6b Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-3361-thread-safe-setHandlers 2019-04-02 12:44:08 +11:00
Greg Wilkins 1c956dc470 Issue #3361 thread safe addHandler 
Updates from review:
 - undeploy destroys context
 - reinstated mapContexts

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-03-26 14:15:36 +11:00
Joakim Erdfelt 10d3ea2548 Merge branch `jetty-9.4.x-3427-classpath-with-spaces` into `jetty-9.4.x` 2019-03-21 14:26:00 -05:00
Simone Bordet 6fb243ff6c Issue #3464 - Split SslContextFactory into Client and Server 
Introduced SslContextFactory subclasses Client and Server.
Replaced all usages of SslContextFactory with either Client or Server
as required.

Refactored configuration checking so that warnings are not emitted
when non necessary.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-03-21 14:42:42 +01:00
Greg Wilkins f2e9f2f7b3 Issue #3361 thread safe addHandler 
Updates from review:
 - private fields
 - better blocker for deployment

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-03-21 17:11:47 +11:00
Greg Wilkins 790dbbfaaa Issue #3361 thread safe addHandler 
Updates from review:
 - private fields
 - callbacks on deploy/undeploy
 - more deprecated javadoc

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-03-21 10:24:14 +11:00
Greg Wilkins 2f2c9f2f3f Merge branch 'jetty-9.4.x-3361-thread-safe-setHandlers' of github.com:eclipse/jetty.project into jetty-9.4.x-3361-thread-safe-setHandlers 2019-03-21 10:05:45 +11:00
Greg Wilkins a2195e5fe3 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-3361-thread-safe-setHandlers 2019-03-21 10:05:24 +11:00
Simone Bordet 512886ae7f Issue #3361 thread safe addHandler 
Code cleanup.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-03-20 10:51:16 +01:00
Greg Wilkins 338f56ea93 Issue #3361 thread safe addHandler 
Improved names and javadoc.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-03-20 18:36:48 +11:00
Jan Bartel 432fc41a32
Jetty 9.4.x 3456 programmatic authentication (#3472) 
* Issue #3456 Allow multiple programmatic login/logout in same request.

Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-03-20 18:19:55 +11:00
Greg Wilkins 1accced62f Issue #3361 thread safe addHandler 
Added new thread safe methods deployHandler and undeployHandler

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-03-20 18:18:55 +11:00
Greg Wilkins 79c1700f62 Issue #3361 thread safe addHandler 
Make handler list and context mappings controlled by a single CaS
operation

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-03-19 18:57:55 +11:00
Greg Wilkins 49eadc5246 Issue #3361 thread safe addHandler 
Made Context mapping atomic with a volatile mapping

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-03-19 17:58:27 +11:00
Greg Wilkins b7e3d6ce5e Issue #3361 thread safe addHandler 
Removed synchronization for now, leaving just some cleanups

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-03-19 16:40:45 +11:00
Greg Wilkins d6ed19a97c Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-3361-thread-safe-setHandlers 2019-03-19 16:12:50 +11:00
Greg Wilkins ffdbbd1821 Issue #3440 Stop failed lifecycle 
check that contexts after error are not started.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-03-14 09:07:16 +11:00
Greg Wilkins 6db357d2fc Completed implementation of GzipRequestCustomizer 2019-03-13 13:30:54 +11:00
Greg Wilkins c1f6f6b608 Implementation of a request customizer to do gzip inflation 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-03-12 18:05:41 +11:00
Greg Wilkins 76a37352f5 Issue #3440 Stop on Unavailable 
+ revert schedulers to non-daemon threads for now so this PR can
   proceed.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-03-12 09:21:19 +11:00
Greg Wilkins a9707471a0 Issue #3440 Stop on Unavailable 
+ ContainerLifeCycle stops started beans on failure.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-03-11 17:10:03 +11:00
Greg Wilkins 054d7f240e Issue #3440 Stop on Unavailable 
+ cleanup after review

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-03-11 16:41:20 +11:00
Greg Wilkins 375ad81f4b Issue #3440 Stop on Unavailable 
+ Any schedulers created are named (for ease of debug) and daemon
   so they do not stop the JVM exiting.
 + If the server.doStart() fails, it calls server.doStop to ensure
   connectors are stopped, ports are free etc.
 + cleanup of addBean handling of scheduler in proxy

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-03-07 15:10:53 +11:00
Greg Wilkins dbf0d2e6be Issue #3421 Duplicate session set-cookie (#3426) 
Added Response.replaceCookieuse replaceCookie in sessions
unit tests

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-03-06 14:44:48 +11:00
Joakim Erdfelt 0bccaf0246 Issue #3427 - Testing .getClassPath() handling of directory with spaces 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-03-05 11:48:27 -05:00
Greg Wilkins 73e68ac7b5 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-3404-QCSV-Doubles 2019-03-05 08:52:36 +11:00
Greg Wilkins ca8a10a9d5 Issue #3404 Cleanup QCSV mime ordering 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-03-01 10:17:02 +11:00
Simone Bordet 676b7ecaba Issue #1861 - Limit total bytes pooled by ByteBufferPools. 
Added a bytebufferpool module to be able to configure
the ByteBufferPool used by ServerConnectors.

Added JMX methods to the ByteBufferPool implementations.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-02-27 17:16:09 +01:00
Greg Wilkins b478332793 Issue #3361 thread set setHandlers 
protect handler mutation with synchronized.
Correctly use copy-on-write semantics for accessing volatile

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-02-20 14:15:51 +11:00
Joakim Erdfelt 9cdb59d4d7 Updating to version 9.4.16-SNAPSHOT 2019-02-15 13:35:15 -05:00
Joakim Erdfelt eb70b24016 Updating to version 9.4.15.v20190215 2019-02-15 11:53:00 -05:00
Simone Bordet d22ec03acc
Merge pull request #3287 from eclipse/jetty-9.4.x-3049-sslcontextfactory_warnings 
Issue #3049 - Warn on common SslContextFactory problematic configurations
 2019-02-04 22:56:32 +01:00
Simone Bordet 6c0eee7012
Merge pull request #3322 from eclipse/jetty-9.4.x-3210-unmanaged_threadpool 
Fixes #3210 - Threadpool module creates unmanged threadpool.
 2019-02-04 22:52:30 +01:00
Greg Wilkins 0809228549 Issue #3317 avoid double log of exception 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-02-05 08:28:37 +11:00
Greg Wilkins 051edc94d7 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-02-05 08:21:38 +11:00
Simone Bordet 6a64031840 Fixes #3210 - Threadpool module creates unmanged threadpool. 
The thread pool is now created as a nested object, rather than a top
level object, so that it is not started before the Server instance.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-02-04 19:40:29 +01:00
Simone Bordet da490673af Fixes #3311 - Ability to serve HTTP and HTTPS from the same port. 
Updated implementation and tests after reviews.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-02-03 14:24:07 +01:00
alexey.barsov 25afa868da Issue #3302 Supporting host:ip in X-Forwarded-For (fixing unit tests) 
Signed-off-by: alexey.barsov <alexey.barsov@jetbrains.com>
 2019-02-01 15:48:58 +01:00
alexey.barsov 803a45b43b Issue #3302 Supporting host:ip in X-Forwarded-For (fixing review remarks) 
Signed-off-by: alexey.barsov <alexey.barsov@jetbrains.com>
 2019-02-01 15:38:33 +01:00
Simone Bordet d9855fb1bc Fixes #3311 - Ability to serve HTTP and HTTPS from the same port. 
Do not assume that the read from the network produced more than 1 byte.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-02-01 09:14:32 +01:00
Simone Bordet 5061a5ca30 Fixes #3311 - Ability to serve HTTP and HTTPS from the same port. 
Fixed handling of upgradeTo() in case of null buffers.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-01-31 17:15:07 +01:00
Simone Bordet ccda1ee5f6 Fixes #3311 - Ability to serve HTTP and HTTPS from the same port. 
Introduced PlainOrSslConnectionFactory, to "sniff" the first bytes
on a connection and upgrade to SSL (if the bytes are TLS bytes), or
upgrade to a specific, configured, protocol.

Added also the ability to fail the upgrade in case of a `http`
request to a `https` port and write a minimal response to the client.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-01-31 13:23:58 +01:00
alexey.barsov edf74a6554 Issue #3302 Supporting host:ip in X-Forwarded-For 
Signed-off-by: alexey.barsov <foster_licey_reg@mail.ru>
 2019-01-30 11:11:44 +01:00
Jan Bartel 169d93e790
Jetty 9.4.x 3284 sessions and system clock jitter (#3296) 
* Issue 3284 System clock jitter can affect session timers.

Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-01-30 14:02:35 +11:00
Simone Bordet e4d78608a7 Issue #3049 - Warn on common SslContextFactory problematic configurations. 
Made default endpointIdentificationAlgorithm=HTTPS to avoid warnings
when SslContextFactory is used on a server.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-01-23 17:31:41 +01:00
Lachlan Roberts 2fc6185c29 Issue #3236 - fixed CustomRequestLogTest failure when JAVA_HOME not set 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-01-15 13:11:06 -06:00
Joakim Erdfelt e9143725b0 Issue #3242 - Post-review cleanup of ProxyEndPoint 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-01-11 10:23:51 -06:00
Joakim Erdfelt aad5e97336 Issue #3242 - Relying on EndPoint.toString() for ProxyEndPoint.toString() 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-01-08 15:48:22 -06:00
Olivier Lamy 9b7afd8a03
Happy new year!! (#3232) 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-01-01 11:52:16 +10:00
Greg Wilkins 8f06fa8083 Issue #3207 
updates after review

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-12-20 08:53:16 +11:00
Greg Wilkins 225760c2de Issue #3207 
Fix #3207 by providing async compliant print methods

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-12-19 13:57:58 +11:00
Greg Wilkins 503bd71d4c Issue #3202 
Handle async cross context session completion
 2018-12-18 16:00:46 +11:00
Greg Wilkins 06bbab50f9 Issue #3202 
Handle async cross context session completion
 2018-12-18 14:07:16 +11:00
Jan Bartel 34b6ecec6c Issue #3202 Ensure sessions created during async are cleaned up. 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2018-12-18 09:32:12 +11:00
Greg Wilkins fb06b82172 Issue #3030 ignore identity content encoding during parameter extraction 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-12-13 13:42:08 +11:00
Bjørn Christian Seime 71c0e47446 Change access of LowResourceCheck to public 
This interface is currently package-private while it's in the
signature of several public methods (e.g. addLowResourceCheck, getLowResourceChecks)

Signed-off-by: Bjørn Christian Seime <bjorncs@yahoo-inc.com>
 2018-12-10 13:39:29 +01:00
Greg Wilkins 132aef4420 Issue #113 
default to extended format

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-11-29 12:10:18 +01:00
Greg Wilkins 7742650fa5 Issue #113 
Fixed property names

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-11-29 10:55:00 +01:00
Greg Wilkins fc39e96653 Issue #113 
Updated customrequestlog module defaults for timezone

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-11-29 10:34:42 +01:00
Greg Wilkins e7d4f55891 Issue #113 
Use CustomRequestLog in examples.
Convenience constructors

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-11-29 10:13:12 +01:00
Greg Wilkins bda9307028
Merge pull request #3144 from lachlan-roberts/jetty-9.4.x 
Issue #113 - CustomRequestLog
 2018-11-29 09:29:43 +01:00
Lachlan Roberts 472d7a1529 Issue #113 - latency test failures fixed 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2018-11-28 22:28:40 +01:00
Lachlan Roberts c2749ff5e3 Issue #113 - fixed documentation inconsistency 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2018-11-28 16:22:37 +01:00
Lachlan Roberts e58fd93742 Issue #113 - StacklessLogging for NcsaRequestLogTest expected exceptions 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2018-11-28 16:05:03 +01:00
Lachlan Roberts 982895719c Issue #113 - changes from review and bug fixes 
%t now takes in locale and timezone in the format string argument
instead of getting it from the setters on the CustomRequestLog class

fixed issue with multiline format strings

requestLog writers are now managed objects

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2018-11-28 14:58:28 +01:00
Lachlan Roberts 63aa9ce97d Issue #113 - problems with latency tests and request handler name 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2018-11-28 10:52:17 +01:00
Lachlan Roberts 8aa3655c55 Issue #113 - fix to failing tests 
removed tests for %B and %b which have been removed in favor of %O
adjusted the NcsaRequestLogTest to only test ExtendedNCSA format

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2018-11-28 09:26:55 +01:00
Lachlan Roberts b97c80b3c1 Issue #113 - testing of logConnectionStatus implemented 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2018-11-27 14:26:31 +01:00
Lachlan Roberts b35df419bb Issue #113 - reformat, javadoc update and changes after review 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2018-11-27 14:26:12 +01:00
Lachlan Roberts 2cd579353c Issue #113 - fix javadoc errors 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2018-11-26 14:12:16 +01:00
Lachlan Roberts 7c0ea57923 Issue #113 - CustomRequestLog terminology refactor 
replaced terminology for addresses and ports to use
client and server referring to the logical connection and
local and remote referring to the physical connection to the first hop

finished implementing tests in CustomRequestLogTest otherwise
disabled tests which will be verified manually instead

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2018-11-24 10:28:57 +01:00
Greg Wilkins 97cb063a57 Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x 2018-11-23 17:01:39 +01:00
Greg Wilkins 92317a7bb4 Issue #3132 improve dump readability 
fixed tests

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-11-23 16:54:36 +01:00
Jan Bartel 4e672c6b27
Issue #2646 - Better handle concurrent calls to change session id and invalidate within a context (#2670) 
* Issue #2646 handle concurrent invalidate/changeid calls

Signed-off-by: Jan Bartel <janb@webtide.com>
 2018-11-23 16:15:27 +01:00
Lachlan Roberts 771f120508 Issue #113 - customrequestlog module 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2018-11-22 20:01:19 +01:00
Lachlan Roberts 112d57f474 Issue #113 - CustomRequestLog 
added missing copyright header in some new files

added CustomRequestLogTest in jetty-servlet to test things like
logFilename and logRequestHandler

the log strings produced do no longer contain a trailing newline

implemented more tests in CustomRequestLogTest
and finished implementing some of the logging in CustomRequestLog

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2018-11-22 10:32:22 +01:00
Greg Wilkins 8c4ee8496f
Jetty 9.4.x 3038 ssl connection leak (#3121) 
Issue #3038 - SSL connection leak.

Fixed SSL spin caused when fill had NEED_WRAP, but a flush/wrap
produced 0 bytes and stayed in NEED_WRAP

Removed check of isInputShutdown prior to filling that allowed EOF to
overtake data already read.

Fix for leak by shutting down output in HttpConnection if
filled -1 and the HttpChannelState was no longer processing
current request.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-11-20 13:53:42 +01:00
Lachlan Roberts 6040bd3497 Issue #113 - AbstractNCSARequestLog no longer abstract and test cleanups 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2018-11-19 15:05:47 +01:00
Lachlan Roberts cc1ae54feb Issue #113 - Parameterized RequestLogTest to test NCSA format string 
renamed to NcsaRequestLogTest as is only testing NCSA log formats

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2018-11-19 14:53:48 +01:00
Lachlan Roberts e4d30b367c Issue #113 - Added Request Log Writers 
Introduced the RequestLog.Writer where a RequestLog takes a writer
which manages what to do with the log strings produced by the RequestLog

deprecated the NCSA and SLF4J RequestLogs in favor of CustomRequestLog

Implemented more format codes in CustomRequestLog

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2018-11-19 13:58:53 +01:00
Greg Wilkins 7dd3cfffe6 Issue #113 channel persistance and completed getters 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-11-15 14:36:40 +01:00
Joakim Erdfelt 29fd18e046 Updating to version 9.4.15-SNAPSHOT 2018-11-14 16:42:40 -06:00
Joakim Erdfelt c4550056e7 Updating to version 9.4.14.v20181114 2018-11-14 15:19:10 -06:00
Lachlan Roberts 7ca6577ac6 Issue 113 - CustomRequestLog 
fixed parsing issues for the format string by parsing left to right
and reversing the list of parsed tokens

reduced to parsing to single regex expression

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2018-11-13 14:51:06 +01:00
Joakim Erdfelt a903017f5f Updating to version 9.4.14-SNAPSHOT 2018-11-11 21:06:50 -06:00
Joakim Erdfelt 49123a3313 Updating to version 9.4.13.v20181111 2018-11-11 20:02:42 -06:00
Simone Bordet 422f4d9341 Issue #3085 - Restore Dump methods for backwards compatibility reasons. 
Removed dead code.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2018-11-09 18:53:50 +01:00
Simone Bordet f814354bb5 Issue #3085 - Restore Dump methods for backwards compatibility reasons. 
Restored removed methods to maintain backwards compatibility.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2018-11-09 17:47:46 +01:00
Lachlan Roberts 1e50b371fe Issue 113 - CustomRequestLog 
javadoc cleanup

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2018-11-08 18:39:29 +01:00
Lachlan Roberts 0d8369c5c1 Issue 113 - CustomRequestLog 
added test methods for all format codes

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2018-11-08 18:07:53 +01:00
Lachlan Roberts 3ce7016a35 Issue 113 - CustomRequestLog 
added methods for each of the format codes described in javadoc

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2018-11-08 11:17:59 +01:00
Greg Wilkins cf2de4411c
Issue #3041 separate CookieCompliance for parsing and generation (#3048) 
* Issue #3041 separate CookieCompliance for parsing and generation

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

* improved documentation

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

* use only getters

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

* Rename setters to avoid setSetXxxx

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-11-07 10:03:18 +01:00
Lachlan Roberts 22e7679dd6 Issue 113 - CustomRequestLog 
changed the log type to include the response

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2018-11-06 12:21:30 +01:00
Lachlan Roberts 4be4b4e7b4 Issue #113 - CustomRequestLog 
update logHandle directly rather than creating list of tokens

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2018-11-06 12:16:22 +01:00
Lachlan Roberts 012d412ccb Issue #113 - CustomRequestLog 
javadoc detailing the custom log formats

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2018-11-06 11:48:08 +01:00
Lachlan Roberts 557f40f41f Issue #113 - CustomRequestLog 
created new CustomRequestLog class

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2018-11-06 11:46:26 +01:00
Jan Bartel 871f73cdf6
Jetty 9.4.x 2932 switchable classloader for session attribute values (#2964) 2018-11-06 10:03:48 +01:00
Greg Wilkins 3995cd2ec0
Issue #3023 redirect to / when pathInfoOnly (#3047) 
Issue #3023 redirect to / when pathInfoOnly (#3047)
 2018-11-02 16:38:43 +01:00
Greg Wilkins b69f8e4084
Issue #2886 Handle SNI with non SNI certificates (#2888) 
* Issue #2886 Handle SNI with non SNI certificates

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

* Issue #2886 Single SNI with default certificate
 2018-11-02 05:20:17 +01:00
Greg Wilkins bb045f641e
Issue #3049 Warn on common SslContext vulnerable configurations (#3050) 
* Issue #3049 Warn on common SslContext vulnerable configurations

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

* Adding documentation notes for weak cipher warnings

Signed-off-by: WalkerWatch <ctwalker@gmail.com>

* Issue #3049 - SslContextFactory warnings on known bad config

+ Changes warnings from being a boolean on SslContextFactory
  to being a logger named
  "org.eclipse.jetty.util.ssl.SslContextFactory.config"

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

* Issue #3049 - SslContextFactory warnings on known bad config

+ Cleanup based on review

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

* Issue #3049 - SslContextFactory warnings on known bad config

+ Cleanup based on review

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2018-11-02 05:19:03 +01:00
Jan Bartel 58c1d547a0
Issue #3044 Use unwrapped session for SessionAsyncListener (#3053) 
* Issue #3044 Use unwrapped session for SessionAsyncListener
 2018-11-02 04:14:24 +11:00
Greg Wilkins 161f1698cf
Jetty 9.4.x 3018 request logging bad messages (#3020) 
Issue #3018 improve logging and handling of slow data rates.

* Slow data rates now result in aborted channels, but exception is still thrown.  Test for 408 in requestLog
* Updated many RequestLog usages to use Server.setRequestLog rather than a RequestLogHandler
* Fixed javadoc
* removed BadRequestLogHandlerTest (tested in RequestLogTest)
* added JMH to show the future of request logging for #113
* copyright header.
* Updates from review
* Revert to throwing BadMessageException
* BME ensures a 408 is logged rather than a 500

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-11-01 17:06:04 +01:00
Greg Wilkins 8dcd7e44d8
Allows commas to separate cookies in RFC2965 compliance mode (#3045) 
* Allows commas to separate cookies in RFC2965 compliance mode

* cleanup after review

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

* revert accidental change

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-11-01 11:43:11 +01:00
Greg Wilkins 898560bec5
Issue #3030 Enforce Content-Encoding check only on parameter extraction. (#3031) 2018-10-26 06:44:40 +11:00
Jan Bartel 4ababf9888
Issue #294 Initial enter scope for DebugListener (#3021) 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2018-10-23 17:29:54 +11:00
Jan Bartel 8eb21f84a3 Issue #2998 Add key to DebugListener dump; ensure LoginService dumped 
only once.
 2018-10-23 17:18:12 +11:00
Greg Wilkins 15e1c73f9c
Cleanup the dump implementation (#2998) 
* Cleanup the dump implementation
* improved the clarity of utility methods for dump and updated most dump methods
* fixed upgrade filter dump
* Improved dump after review
* Moved dumpObjects to Dumpable
* implemented dumpBeans with dumpObjects
* less verbose dump
* Dump streams
* fixed dump test

Signed-off-by: Greg Wilkins <gregw@webtide.com>
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2018-10-22 11:53:59 +11:00
Greg Wilkins efdf3c2473
Issue #2970 ensure onComplete is called (#2971) 
* Issue #2970 ensure onComplete is called
* Cleanup after review - single try

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-10-20 10:15:05 +11:00
Joakim Erdfelt 9e84c1ee93 Testing for BindException cause as well 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2018-10-19 10:38:09 -05:00
Joakim Erdfelt 35ea653f73 Fixing PR #3003 - formatting and junit5 syntax 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2018-10-19 10:36:26 -05:00
Magnus Reftel 37a85152eb Improve error message when binding to in-use port 
Signed-off-by: Magnus Reftel <magnus.reftel@skatteetaten.no>
 2018-10-19 10:46:13 +02:00
Simone Bordet bd3eeeaa3f Merged branch 'jetty-9.4.x' into 'jetty-9.4.x-2191-jpms_automatic_module_name'. 2018-10-04 12:27:31 +02:00
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
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 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 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
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
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
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 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
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
Greg Wilkins 52de1965b6
Unwrap ServletException 9.3 #2787 (#2789) 
* Issus #2787 unwrap ServletException

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

* Do not unwrap unavailable exception

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

* unwrap to specific targets

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

* fixes from review

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-08-15 11:43:52 +10:00
Kazuhiro Sera 96218e8bc4 Fix typos detected by github.com/client9/misspell 
Signed-off-by: Kazuhiro Sera <seratch@gmail.com>
 2018-08-10 23:52:16 +09:00
Joakim Erdfelt 516d93c488 Updating to version 9.2.27-SNAPSHOT 2018-08-06 11:33:22 -05:00
Joakim Erdfelt 8c637489ae Updating to version 9.2.26.v20180806 2018-08-06 10:51:25 -05:00
Greg Wilkins 2cc90c2be5 Less verbose testing 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-08-02 16:41:06 +10:00
Greg Wilkins cd0cf3d11f Issue #2706 - minor cleanup 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-07-20 16:03:27 +02:00
Greg Wilkins d6b7f8d71f
Merge pull request #2729 from lachlan-roberts/jetty-9.4.x-2706-ResourceService 
Issue #2706 - Resource Service Incorrectly Returning 404
 2018-07-20 15:29:09 +02:00
Lachlan Roberts 8444681880 Issue #2706 - Resource Service Incorrectly Returning 404 
changes from review

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2018-07-20 21:30:00 +10:00
Greg Wilkins cf3681ef56
Issue #1688 Encoded form content (#2733) 
* Issue #1688 Encoded form content

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

* fixes from review

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-07-20 09:30:36 +02:00
Lachlan Roberts 0f3f77761f Issue #2706 - Resource Service Incorrectly Returning 404 
Replaced the response.isCommitted() check with a boolean returned from _resourceService.doGet().
This means the response does not need to be committed for the check to work correctly.

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2018-07-20 11:01:56 +10:00
Lachlan Roberts 648554ad5c Issue #2706 - Resource Service Incorrectly Returning 404 
Removed response.flushBuffer() after writing to fix DefaultServletTest.testFiltered()

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2018-07-19 12:46:18 +10:00
Simone Bordet eceaff7bed Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2018-07-18 16:21:00 +02:00
Simone Bordet 37e4da24cb Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2018-07-18 16:15:27 +02:00
Greg Wilkins 17b6eee5ac
Jetty 9.4.x 2233 ssl flush try again 2 (#2726) 
Major refactor of SslConnection to address #2233 and to simplify in preparation for java-11 support.

Made the `needFillInterest` and `onIncompleteFlush` methods the primary stateful methods with state for fill and flush side that does not reproduce state already held by the SslEngine itself.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2018-07-18 10:11:35 +02:00
Lachlan Roberts 6de77d26e2 Issue #2706 - Resource Service Incorrectly Returning 404 
Flush response buffer in places where the response needs to be committed.
Removed if statement preventing HEAD requests processing conditional headers.
Added two new test cases which failed before the changes and should now pass.

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2018-07-18 11:27:19 +10:00
Simone Bordet cc1071fa05 Fixes #2717 - Async requests are not considered when shutting down gracefully. 
Now using _requestStats instead of _dispatchedStats to check for
requests completed when shutting down StatisticsHandler.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2018-07-16 10:54:43 +02:00
Joakim Erdfelt 0b69f00665 Updating to version 9.4.12-SNAPSHOT 2018-07-11 17:32:16 -05:00
Joakim Erdfelt 260596dd10 Updating to version 9.4.12.RC0 2018-07-11 16:30:55 -05:00
lachan-roberts e05c11ae30 Changing default Http headerCacheSize from 512 to 4096 
Signed-off-by: lachan-roberts <lachlan@webtide.com>
 2018-07-10 10:39:45 +10:00
Venkata Jaswanth 9d9189d476 check for session id in path if url tracking mode is enabled (#2668) 
Signed-off-by: Venkata Jaswanth U <aj.jaswanth@gmail.com>
 2018-07-04 10:37:08 +02:00
Greg Wilkins 93a8afcc6b Fixed #2677 use decoded path for favicon.ico 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-06-21 11:55:16 +02:00
Greg Wilkins 4f54447585
Jetty 9.4.x 2501 accept listener (#2511) 
* Issue #2501 - Accept Listener
* Issue #2501 - Include accepting connections in connection limit.
* AcceptRateLimit minimal delay

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-06-19 09:03:54 +02:00
Matthias Perktold 09f614b48e Eliminated redundant invocations of HandlerCollection.getHandlers() 
Signed-off-by: Matthias Perktold <tias251@gmail.com>
 2018-06-18 19:19:07 +02:00
Simone Bordet 253c637742
Fixes #2663 - Guard Throwable.addSuppressed() calls. (#2665) 
* Fixes #2663 - Guard Throwable.addSuppressed() calls.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2018-06-14 15:21:44 +02:00
Joakim Erdfelt 1adbceae97
Merge pull request #2652 from lachlan-roberts/jetty-9.4.x-2398-MultiPartFormInputStream-Charset-Documentation 
Issue #2398 - MultiPart Charset Encoding
 2018-06-13 16:57:28 -05:00
Greg Wilkins 346879f2a5
Merge pull request #2664 from mperktold/jetty-9.4.x 
Issue #2662 Unnecessary boxing conversions
 2018-06-13 22:52:27 +02:00
Matthias Perktold f901efc413 Issue #2662 - Unnecessary boxing conversions 
Signed-off-by: Matthias Perktold <tias251@gmail.com>
 2018-06-13 16:20:12 +02:00
Lachlan Roberts 34351c7854 Issue #2398 - MultiPart Charset Encoding 
Improved comment describing charset behaviour for MultiPart

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2018-06-12 17:31:04 +10:00
Simone Bordet 4f1dd352d6
Issue #2468 - Remove SoLinger. (#2644) 
* Issue #2468 - Remove SoLinger.

For non-blocking sockets, StandardSocketOptions#SO_LINGER javadocs
report that the behavior is undefined. In JDK 11 setting SoLinger
for non-blocking sockets will be ignored.

As such, there is no point in allowing SoLinger to be configured
in Jetty that only uses non-blocking sockets.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2018-06-09 13:21:24 +02:00
Joakim Erdfelt 3932b11e64 Merge remote-tracking branch 'origin/release-9.4.11' into jetty-9.4.x 2018-06-07 14:31:24 -05:00
Joakim Erdfelt 0e6c91b604 Updating to version 9.2.26-SNAPSHOT 2018-06-06 18:54:58 -05:00
Joakim Erdfelt 4830fd15e9 Updating to version 9.2.25.v20180606 2018-06-06 16:42:54 -05:00
Joakim Erdfelt f54629a3c4
Merge pull request #2629 from eclipse/jetty-9.2.x-issue-2135-android-direct-buffers 
Issue #2135 - proposal for Android 8.1 with SSL and direct buffers
 2018-06-06 16:27:43 -05:00
Joakim Erdfelt 2d5ef67d3f Issue #2135 - TLS on Android 8.1 workaround configuration for Direct ByteBuffer use 
+ Changes from review with @sbordet

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2018-06-06 10:55:28 -05:00
Joakim Erdfelt ea116028d4 Issue #2135 - TLS on Android 8.1 workaround configuration for Direct ByteBuffer use 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2018-06-06 10:44:53 -05:00
Simone Bordet fddfa40e3d Issue #2626 - Test failure: ShutdownMonitorTest.testStartStopSamePortDifferentKey. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2018-06-06 09:53:46 +02:00
Greg Wilkins 1f1a5cb064
Merge pull request #2610 from lachlan-roberts/jetty-9.4.x-issue-2592-ServerTimeoutTest-testAsyncWriteIdleTimeoutFires 
Issue #2592 - fix for ServerTimeoutTest.testAsyncWriteIdleTimeoutFires [HTTP] on windows
 2018-06-06 08:24:07 +02:00
Lachlan Roberts 29c9afe135 Issue #2592 - Failing test on Windows: ServerTimeoutsTest.testAsyncWriteIdleTimeoutFires[transport: HTTP] 
removed HttpOutput.close(Closeable) method as IO.close(Closeable) should be used instead
added isFailed() method to WriteFlusher and used it to fix WriteFlusherTest.testFailWhileBlocking()
surrounded usage of onError() in HttpOutput.run() with try-finally so that IO.close(this) is executed if onError throws

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2018-06-06 15:35:54 +10:00
Joakim Erdfelt e4bfe00dce Updating to version 9.4.12-SNAPSHOT 2018-06-05 14:18:37 -05:00
Joakim Erdfelt d5fc0523cf Updating to version 9.4.11.v20180605 2018-06-05 13:23:02 -05:00
Joakim Erdfelt 5eefa90e05 Updating to version 9.3.25-SNAPSHOT 2018-06-05 13:13:07 -05:00
Joakim Erdfelt 84205aa28f Updating to version 9.3.24.v20180605 2018-06-05 12:11:03 -05:00
Joakim Erdfelt f0ff571c98 Reverting version to 9.3.24-SNAPSHOT 2018-06-05 12:06:58 -05:00
Joakim Erdfelt 13640c297c Bumping version to 9.3.25-SNAPSHOT 2018-06-05 11:58:37 -05:00
Lachlan Roberts 72dcfc15e5 Issue #2592 - Failing test on Windows: ServerTimeoutsTest.testAsyncWriteIdleTimeoutFires[transport: HTTP] 
changed write flusher to go from pending state to failed state
reverted previous HttpOutput changes

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2018-06-05 19:21:30 +10:00
Simone Bordet 9524156d8a Issue #2602 - Failing test: ServerConnectorTimeoutTest. 
Removed duplicate test.
Removed lines that were testing unreliable TCP behavior.
Fixed retrieval of EndPoint in case of SSL.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2018-06-01 18:13:25 +02:00
Simone Bordet 946e6682b7 Merged 'origin/jetty-9.4.x' into 'jetty-9.4.x'. 2018-06-01 16:43:24 +02:00
Simone Bordet 5baabd0ba8 Fixes #2237 - Test failure: SelectChannelServerSslTest.testFullURI. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2018-06-01 16:35:23 +02:00
Simone Bordet af739ce85e Issue #2237 - Test failure: SelectChannelServerSslTest.testFullURI. 
Cleanup of test classes.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2018-06-01 16:34:29 +02:00
Greg Wilkins c3670d5870 Issue #2237 reduce large URI to avoid split write 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-06-01 16:30:07 +02:00
Joakim Erdfelt 53e8bc2a63 Backport of issue #2560 fixes to jetty-9.3.x 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2018-05-31 12:43:17 -05:00
Joakim Erdfelt ad4dceb1c0 Issue #2560 - Moving InvalidPath logic from PathResource to ResourceContentFactory 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2018-05-31 11:31:36 -05:00
Lachlan Roberts 1bf5128e6d Fixes #2592 - changes to fix ServerTimeoutsTest.testAsyncWriteIdleTimeoutFires[transport: HTTP] on windows 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2018-05-31 19:44:51 +10:00
Greg Wilkins 2bcc528920 expand spruious tabs in java sources 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-05-29 10:40:09 +02:00
Lachlan Roberts d13e79a284 Merge remote-tracking branch 'eclipse/jetty-9.4.x' into jetty-9.4.x-server-stackTraceRemoval 2018-05-26 00:35:02 +10:00
Greg Wilkins e6e49bdc85 Updated javadoc for callbacks 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-05-25 08:01:31 +02:00
Lachlan Roberts c829ee3210 Issue #2424 - ReadPendingException in testHttpWriteIdleTimeout() 
Replacing setBlockingTimeout with setIdleTimeout to fix the ReadPendingException on ServerConnectorTimeoutTest.testHttpWriteIdleTimeout().

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2018-05-23 07:41:20 +10:00
Lachlan Roberts 0664893022 Issue #2542 - Log exception stackTraces instead of printing 
replaces some usages of printStackTrace with logging in ConnectorTimeoutTest to avoid printing out the stack trace on passing tests

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2018-05-23 07:39:23 +10:00
Simone Bordet 462679910f Fixes #2544 - Test Failure: LowResourcesMonitorTest.testMaxLowResourceTime(). 
Rewrote the test to not write to the server,
thus avoiding connection resets.

The rewrite also clarified what the test was testing.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2018-05-22 12:55:03 +02:00
Simone Bordet 6b7f4c91db
Merge pull request #2552 from eclipse/jetty-9.4.x-2549-ConsumeAll 
Issue #2549 ConsumeAll forced EOF or EarlyEOF
 2018-05-18 09:18:57 +02:00
Greg Wilkins c69ab6bd56 Issue #2549 ConsumeAll forced EOF or EarlyEOF 
Cleanup after review

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-05-18 16:39:44 +10:00
Greg Wilkins 252ab9facf
Jetty 9.4.x 2550 coalesce ranges (#2551) 
Issue #2550 coalesce ranges

Author: Lachlan Roberts <lachlan@webtide.com>
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
Signed-off-by: Greg Wilkins <gregw@webtide.com>
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2018-05-18 08:45:54 +10:00
Greg Wilkins b93cc5abb6 Issue #2549 ConsumeAll forced EOF or EarlyEOF 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-05-17 13:05:13 +10:00
Greg Wilkins aa97518d0b Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2018-05-17 08:27:45 +10:00
Greg Wilkins be8ff431a4 Merge remote-tracking branch 'origin/jetty-9.2.x' into jetty-9.3.x 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-05-17 08:16:39 +10:00
Greg Wilkins a285deea42 Issue #2529 RFC2616 vs RFC7230 cleanup 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-05-17 08:00:53 +10:00
Simone Bordet 01f7aecc4e Fixes #2546 - Incorrect parsing of PROXY protocol v2. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2018-05-16 21:33:22 +02:00
Greg Wilkins 4cc8f4dcf6 Issue #2346 Revert stack logging 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-05-16 17:21:06 +10:00
Greg Wilkins 820b5752d7 Issue #2525 fixed jetty.xml 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-05-16 14:32:41 +10:00
Greg Wilkins 10eaa6e261 javadoc 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-05-14 21:33:41 +10:00
Simone Bordet 317a8a5c66 Issue #2525 - Clean up SharedBlockingCallback. 
Small cleanups and added test for thread interruption.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2018-05-14 10:27:34 +02:00
Greg Wilkins 625d1f7726 Issue #2525 Clean up SharedBlockingCallback 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-05-13 23:11:38 +10:00
Steve Bolton 7e0afae70b Issue #1785 Fix Javadoc and vhost warn logic 
Signed-off-by: Steve Bolton <steve@boltn.com>
 2018-05-04 02:01:04 -04:00
Greg Wilkins 03d96ae538 Issue #1785 minor cleanups 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-05-04 10:20:15 +10:00
Steve Bolton ad21d35d51 Issue #1785 Pre-process vhost entries and provide warning 
Signed-off-by: Steve Bolton <steve@boltn.com>
 2018-05-03 16:48:18 -04:00
Steve Bolton c73352b1f0 Merge branch 'jetty-9.4.x' of https://github.com/eclipse/jetty.project into jetty-9.4.x 2018-05-03 12:52:50 -04:00
Joakim Erdfelt 1732ffca51 Updating to version 9.4.11-SNAPSHOT 2018-05-03 11:48:05 -05:00
Joakim Erdfelt daa59876e6 Updating to version 9.4.10.v20180503 2018-05-03 10:55:19 -05:00
Jan Bartel 5515e13649
Issue #2427 Stop and start session idle timer (#2466) 
* Issue #2427 Stop and start session idle timer

Signed-off-by: Jan Bartel <janb@webtide.com>
 2018-05-03 08:05:26 +10:00
Jan Bartel 394c6313b3 Issue #2495 Make FileSessionDataStore private methods protected 2018-05-01 09:26:51 +10:00
Simone Bordet d25fa7d20c Code cleanup. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2018-04-27 10:12:19 +02:00
BenBE f7faf392b2 Fix operator priority in ProxyConnectionFactory 
Due to shift operations taking less precedence over addition the expression was parsed in an unintended way.

With this change the intention is made more clear and the intended order of calculations (shift the single byte values into some variable) is actually implemented.

Signed-off-by: Benny Baumann <BenBE@geshi.org>
 2018-04-26 16:15:35 +02:00
Olivier Lamy f36eba4577
class.newInstance is deprecated #2435 (#2437) 
* Class.newInstance() is deprecated in Java 9+ #2435

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2018-04-17 19:07:20 +10:00