2862 Commits

Author SHA1 Message Date
Greg Wilkins
99f4ed7352 477737 Improve handling of etags with dynamic and static gzip 2015-09-18 12:30:02 +10:00
Simone Bordet
014d021618 Removed unnecessary test condition. 2015-09-18 01:46:46 +02:00
Greg Wilkins
2d88fdf386 477278 Refactored DefaultServlet for cached Gzip & Etags
Refactored the DefaultServlet to better handle static gzipped files with etags in the cache.
Required a simplification of always having a HttpContent rather than the prior situation of
having either a Resource or a HttpContent.  So introduced a HttpContent.Factory, of which
the ResourceCache is the normal implementation, but there is also now a ResourceContentFactory
that creates content when there is no cache.

The Gzip resource is now associated with the normal resource, so less lookups are needed.
This also give scope for caching dynamic gzipping in the future.

The GzipHttpContent class has been introduced to send content with the headers of the
uncompress, but content of the compressed resource.
2015-09-17 18:19:58 +10:00
Jan Bartel
03a601f2b2 477385 Make jetty osgi manifests only resolve jetty packages against a single distro version 2015-09-16 19:13:47 +10:00
Jan Bartel
fa8232d3c8 More implementation 2015-09-11 19:52:05 +10:00
Greg Wilkins
02c5ea30be 477123 - AsyncListener callbacks need context scope
Also added DebugListener and deprecated DebugHandler
2015-09-11 12:06:23 +10:00
Jan Bartel
79ce5db312 Using SessionKey class 2015-09-10 10:46:43 +10:00
Jan Bartel
bf2a1fa29e Merge remote-tracking branch 'origin/master' into session-refactor 2015-09-09 16:13:10 +10:00
Jan Bartel
3e3bfb9d6b Does not compile, draft of changes. 2015-09-04 12:07:24 +10:00
Joakim Erdfelt
49c927974b Javadoc fix 2015-09-02 09:26:12 -07:00
Jesse McConnell
6409366499 [maven-release-plugin] prepare for next development iteration 2015-08-27 10:11:29 -05:00
Jesse McConnell
3086adc965 [maven-release-plugin] prepare release jetty-9.3.3.v20150827 2015-08-27 10:11:21 -05:00
Jesse McConnell
f5d1fb1058 Merge branch 'master' into release-9.3.3 2015-08-27 08:31:22 -05:00
Simone Bordet
bee5437bad 475927 - SecureRequestCustomizer fails to match host.
Cosmetic changes during review.
2015-08-27 11:14:33 +02:00
Jan Bartel
c45cd8ce03 Partial refactoring - does not yet compile. 2015-08-27 18:03:44 +10:00
Greg Wilkins
8070ce61f3 475927 - SecureRequestCustomizer fails to match host.
Moved host and wildcard to new X509 class
2015-08-27 12:25:52 +10:00
Simone Bordet
7057dae67b 475927 - SecureRequestCustomizer fails to match host.
Fixed by storing in the SSLSession the SNI names correspondent to the
alias that was selected when the TLS connection was initiated.
2015-08-26 20:36:43 +02:00
Simone Bordet
874300472e Do not hardcode the "http" scheme, but use that of the request. 2015-08-26 11:58:18 +02:00
Jesse McConnell
f8734f23ce [maven-release-plugin] prepare for next development iteration 2015-08-25 14:10:01 -05:00
Jesse McConnell
e9edf4c24b [maven-release-plugin] prepare release jetty-9.3.3.v20150825 2015-08-25 14:09:54 -05:00
Simone Bordet
bfeb7f56a6 Closing the connection also in case the parser is in CLOSED state.
When the request is fully read and the response is sent, the parser
may enter the CLOSE state if there were Connection: close headers.

It may happen that later the connection reads -1, then moves the
parser is CLOSED state, so the condition to close the connection must
include the CLOSED state.
2015-08-20 18:23:55 +02:00
Greg Wilkins
d44ba7e24a Improved Context pluggability 2015-08-19 16:28:36 +10:00
Greg Wilkins
2cc663685a ContextHandler.ContextScopeListener
Added a listener that is called as any thread enters/exits a context/request scope. This is
both normal servlet dispatches and async callbacks.
2015-08-19 15:30:52 +10:00
Greg Wilkins
afda638dd9 474685 - GzipHandler configuration supports csv paths and mimetypes.
readded for backward compatibility, but with a warning it will be removed.
2015-08-19 09:39:38 +10:00
Simone Bordet
805ec9554c 475195 - SNI matching fails when keystore does not contain wild certificates.
Fixed condition in SslContextFactory.getKeyManagers() that installs
the SniX509ExtendedKeyManager.

Miscellaneous code cleanups.
2015-08-17 20:55:20 +02:00
Simone Bordet
b96f2f5b24 474634 - AsyncListener.onError() handling.
Simplified exception handling, making sure that we terminate the
handling even in case the state was COMPLETING but the container
could not write the response.
2015-08-14 14:48:51 -07:00
Simone Bordet
b819273c7b 474634 - AsyncListener.onError() handling.
Refactored continuation tests.
2015-08-14 14:48:51 -07:00
Greg Wilkins
946b1476f8 474634 - AsyncListener.onError() handling.
reverted onComplete behaviour
2015-08-14 12:24:06 +10:00
Greg Wilkins
d780839bec 474634 - AsyncListener.onError() handling.
Added HttpConfiguration.maxErrorDispatches to detect error loops
Fixed ManyWays... unit test to handle error dispatch.
2015-08-14 10:06:57 +10:00
Greg Wilkins
9b9b9524dc 474634 - AsyncListener.onError() handling.
Allow IOException from complete flush to goto an onError call.
2015-08-13 19:09:57 +10:00
Greg Wilkins
8c0e4f53d3 474634 - AsyncListener.onError() handling.
Fixed AsyncContextTests
2015-08-13 18:12:38 +10:00
Greg Wilkins
f21ea15725 474634 - AsyncListener.onError() handling.
Handle errors thrown from dispatch when async is started with onError
2015-08-13 18:06:14 +10:00
Greg Wilkins
d1aa9ce993 474634 - AsyncListener.onError() handling.
Removed special termination case handling. Unhandle can be avoided with a break loop.
Replaced actions COMPLETING and COMPLETED with COMPLETE (which is an action)

Refactored test harness to use a static history array rather than headers
2015-08-13 16:22:02 +10:00
Simone Bordet
79086f3fe3 474634 - AsyncListener.onError() handling.
Interim work on getting the right behavior for onError().
2015-08-13 01:33:28 +02:00
Joakim Erdfelt
791896339d Fixing javadoc 2015-08-12 14:22:53 -07:00
Simone Bordet
4c7d5f661e Fixed import error. 2015-08-11 12:32:27 +02:00
Simone Bordet
aa684a5dcc 470311 - Introduce a proxy-protocol module.
Support for the PROXY protocol is now enabled via 2 new modules:
proxy-protocol and proxy-protocol-ssl, respectively for the HTTP
connector and the SSL connector.
2015-08-11 12:17:24 +02:00
Joakim Erdfelt
9ca235beca Revert "474618 - AsyncListener.onComplete not called when error occurs"
This reverts commit 60f409e4fff79df88f331d3fa0e16438636ede72.
2015-08-10 09:38:40 -07:00
Joakim Erdfelt
60f409e4ff 474618 - AsyncListener.onComplete not called when error occurs 2015-08-10 07:56:14 -07:00
Joakim Erdfelt
b522dd7fe2 474617 - AsyncListener.onError not called for errors
+ Making onError call correctly
2015-08-10 07:53:56 -07:00
Greg Wilkins
98f8852b51 more robust testharness for graceful stop 2015-08-05 15:44:46 +10:00
Greg Wilkins
4939854893 473321 - Overriding SSL context KeyStoreType requires explicit override of TrustStoreType 2015-08-05 14:58:08 +10:00
Joakim Erdfelt
a3684f7fb8 [maven-release-plugin] prepare for next development iteration 2015-07-30 09:47:57 -07:00
Joakim Erdfelt
798fc8118b [maven-release-plugin] prepare release jetty-9.2.13.v20150730 2015-07-30 09:47:48 -07:00
Joakim Erdfelt
4b3879845d [maven-release-plugin] prepare for next development iteration 2015-07-30 07:02:10 -07:00
Joakim Erdfelt
6b7e9ac4b0 [maven-release-plugin] prepare release jetty-9.3.2.v20150730 2015-07-30 07:02:02 -07:00
Greg Wilkins
5aa5a4e525 fixed accidental NPE on Context logger 2015-07-30 18:50:04 +10:00
Greg Wilkins
a568ee6f17 473832 SslConnection flips back buffers on handshake exception 2015-07-30 11:52:31 +10:00
Greg Wilkins
4a727a7f08 472974 Improved StatisticsHandler 503 generation 2015-07-30 11:24:30 +10:00
Greg Wilkins
df6b935b94 470351 Fixed SNI matching of wildcard certificates 2015-07-23 19:49:06 +10:00