Greg Wilkins
3fafd6ee8f
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-06-08 16:25:29 +10:00
Greg Wilkins
3a9dfd913a
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-06-08 16:24:09 +10:00
Greg Wilkins
f4c13e5f54
Issue #623 Add gzip suffix to etags in 304 response
2016-06-08 14:33:49 +10:00
Greg Wilkins
6449f61393
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-05-20 12:11:40 +10:00
Greg Wilkins
24ac1b7edd
removed fragile test
2016-05-20 12:10:06 +10:00
Greg Wilkins
595e44a3f2
removed fragile test
2016-05-20 12:08:23 +10:00
Jesse McConnell
4bf91b5ab3
Merge remote-tracking branch 'origin/release-9.3.9' into jetty-9.3.x
2016-05-19 09:55:58 -05:00
Simone Bordet
59ba37ad95
Merged branch 'jetty-9.4.x' into 'master'.
2016-05-19 11:51:15 +02:00
Greg Wilkins
79e5c31029
improved unit test, fixed deferred on chunking
2016-05-19 17:46:50 +10:00
Greg Wilkins
74110d445e
fixed bad unit test
2016-05-19 17:39:19 +10:00
Jan Bartel
2e2b8e1a13
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-05-18 18:33:06 +10:00
Greg Wilkins
49ec41f600
Issue #525 fix blockForContent spin
...
Improved test
2016-05-18 12:54:27 +10:00
Jesse McConnell
dc4574f380
[maven-release-plugin] prepare for next development iteration
2016-05-17 17:30:17 -05:00
Jesse McConnell
0bbebec1e0
[maven-release-plugin] prepare release jetty-9.3.9.v20160517
2016-05-17 17:30:13 -05:00
Simone Bordet
201bde8bf2
Merged branch 'jetty-9.4.x' into 'master'.
2016-05-16 15:14:20 +02:00
Simone Bordet
039ced6e25
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-05-16 15:13:54 +02:00
Joakim Erdfelt
e5062a74dd
Merge pull request #569 from eclipse/bugs/567
...
Fixes #567 - NPE in ErrorPageErrorHandler debug
2016-05-13 15:47:36 -07:00
Greg Wilkins
7c6786a050
Issue #525
...
fixed bad merge
2016-05-12 13:42:46 +10:00
Greg Wilkins
252e9b626a
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-05-11 16:24:48 +10:00
Greg Wilkins
6fb095f02c
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-05-11 16:23:06 +10:00
Joakim Erdfelt
9cf8f2965a
Fixes #567 - NPE in ErrorPageErrorHandler debug
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2016-05-10 17:28:34 -07:00
Greg Wilkins
d8715ad217
improved test
2016-05-10 11:43:34 +10:00
Simone Bordet
5af72ed1fc
Merged branch 'jetty-9.4.x' into 'master'.
2016-05-06 17:44:16 +02:00
Simone Bordet
9a5d8f3943
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-05-06 17:43:49 +02:00
Greg Wilkins
2a5b120fc3
Issue #525 fix blockForContent spin
...
abort request in bad request handling
2016-05-06 20:31:55 +10:00
Greg Wilkins
1c292819fe
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-05-04 11:45:23 +10:00
Greg Wilkins
5b8f411ba9
Issue #539
...
Made ResourceService pluggable
2016-05-04 11:08:49 +10:00
Greg Wilkins
a5ad291add
Squashed commit of the following: ( #528 )
...
commit 4bf6b7c951
Merge: a50e882
301fc12
Author: Greg Wilkins <gregw@webtide.com>
Date: Wed Apr 27 12:12:08 2016 +1000
Merge branch 'master' into jetty-9.4.x-Feature
commit a50e8825a3
Author: Greg Wilkins <gregw@webtide.com>
Date: Sat Apr 23 09:38:00 2016 +1000
work in progress
commit 4e286266c0
Merge: 5ae7da0
f550fcd
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Apr 21 16:34:12 2016 +1000
Merge branch 'master' into jetty-9.4.x-Feature
commit 5ae7da049b
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Apr 21 12:12:24 2016 +1000
Work in progress on Features
commit adfc430ad4
Author: Jan Bartel <janb@webtide.com>
Date: Wed Apr 20 22:05:55 2016 +1000
Refactor Configurations.isEnabledByDefault, enable all configurations by default.
commit 70cca692cc
Author: Jan Bartel <janb@webtide.com>
Date: Wed Apr 20 17:32:22 2016 +1000
Fix features for jsp with osgi
commit 22d2b251e9
Merge: 571d503
2c4cdbe
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Apr 14 16:19:43 2016 +1000
Merge branch 'master' into jetty-9.4.x-Feature
commit 571d50315e
Author: Greg Wilkins <gregw@webtide.com>
Date: Wed Apr 13 15:36:36 2016 +1000
code comment
commit d9b229f298
Author: Greg Wilkins <gregw@webtide.com>
Date: Sat Apr 9 21:24:22 2016 +1000
fixed quickstart validation
commit 154d58bf62
Merge: 8e54aad
ef92338
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Apr 8 18:25:17 2016 +1000
Merge branch 'master' into jetty-9.4.x-Feature
commit 8e54aad414
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Apr 8 18:21:30 2016 +1000
general cleanup of Configuration and ClasspathPattern usage
commit 65f8e5dbd0
Merge: ea1deda
2fb9b55
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Apr 8 09:15:28 2016 +1000
Merge branch 'master' into jetty-9.4.x-Feature
commit ea1deda4f9
Merge: cfe9c83
f92588c
Author: Greg Wilkins <gregw@webtide.com>
Date: Tue Mar 15 18:21:56 2016 +1100
Merge branch 'master' into jetty-9.4.x-Feature
commit cfe9c83691
Author: Greg Wilkins <gregw@webtide.com>
Date: Tue Mar 15 17:57:23 2016 +1100
work in progress
commit 725be8c051
Author: Greg Wilkins <gregw@webtide.com>
Date: Tue Mar 15 10:11:49 2016 +1100
work in progress
commit 61d2c07534
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Mar 11 14:01:00 2016 +1100
progress on OSGi
commit a977536c7d
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Mar 11 12:52:33 2016 +1100
Fixed plugin
commit f08b84ba0e
Merge: f19bd2c
8a24798
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Mar 11 12:21:55 2016 +1100
Merge branch 'master' into jetty-9.4.x-Feature
commit f19bd2c65a
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Mar 11 12:21:06 2016 +1100
work in progress... all but OSGi
commit 2f15c3e4f9
Merge: 36b5687
7b1486b
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Mar 10 16:52:43 2016 +1100
Merge branch 'master' into jetty-9.4.x-Feature
commit 36b5687329
Merge: 13d914a
e7081d7
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Mar 10 07:20:05 2016 +1100
Merge branch 'master' into jetty-9.4.x-Feature
commit 13d914aa7c
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Mar 10 04:41:30 2016 +1100
Work in progress on Features
Moved jar discovery to META-INF
commit d41bd264ad
Author: Greg Wilkins <gregw@webtide.com>
Date: Sat Mar 5 17:48:15 2016 +0100
Work in progress towards new quickstart arch
commit c5c23698c4
Merge: fd34007
692aae0
Author: Greg Wilkins <gregw@webtide.com>
Date: Sat Mar 5 11:29:18 2016 +0100
Merge branch 'master' into jetty-9.4.x-Feature
commit fd34007c3d
Author: Greg Wilkins <gregw@webtide.com>
Date: Sat Mar 5 11:04:35 2016 +0100
Work in progress on Features for QuickStart
commit c5f0c80cd2
Merge: 0e6d886
b61c5ff
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Mar 4 16:05:23 2016 +0100
Merge branch 'master' into jetty-9.4.x-Feature
commit 0e6d886b01
Merge: d150405
2b67e04
Author: Greg Wilkins <gregw@webtide.com>
Date: Wed Mar 2 17:32:36 2016 +0100
Merge branch 'master' into jetty-9.4.x-Feature
commit d1504055de
Merge: 22a6cd0
3300d54
Author: Greg Wilkins <gregw@webtide.com>
Date: Wed Mar 2 15:21:20 2016 +0100
Merge branch 'master' into jetty-9.4.x-Feature
commit 22a6cd05b7
Author: Greg Wilkins <gregw@webtide.com>
Date: Mon Feb 29 20:53:17 2016 +0100
Features work in progress
convert more server/system classes to Configurations
commit 037e04bfe5
Merge: add9876
bb08b65
Author: Greg Wilkins <gregw@webtide.com>
Date: Mon Feb 29 17:11:04 2016 +0100
Merge branch 'master' into jetty-9.4.x-Feature
commit add9876f83
Merge: 5263f15
eb5e25c
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Feb 25 10:11:08 2016 +0100
Merge branch 'master' into jetty-9.4.x-Feature
commit 5263f15acd
Merge: 89803ae
21fdaf5
Author: Greg Wilkins <gregw@webtide.com>
Date: Tue Feb 23 14:35:31 2016 +0100
Merge remote-tracking branch 'origin/master' into jetty-9.4.x-Feature
commit 89803aec95
Merge: 5fed7c7
779317d
Author: Greg Wilkins <gregw@webtide.com>
Date: Tue Feb 16 16:09:38 2016 +0100
Merge branch 'master' into jetty-9.4.x-Feature
commit 5fed7c713f
Author: Greg Wilkins <gregw@webtide.com>
Date: Tue Feb 16 11:21:13 2016 +0100
fixed merge
commit ec22a1ba0b
Merge: 4c8257d
d0541e5
Author: Greg Wilkins <gregw@webtide.com>
Date: Tue Feb 16 10:53:16 2016 +0100
Merge branch 'master' into jetty-9.4.x-Feature
commit 4c8257d23b
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Dec 17 09:34:28 2015 +1100
Do not default quickstart
commit 57ce87770a
Merge: 14bde1f
96e4d72
Author: Greg Wilkins <gregw@webtide.com>
Date: Wed Dec 16 17:16:14 2015 +1100
Merge branch 'master' into jetty-9.4.x-Feature
commit 14bde1f696
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Dec 4 16:26:58 2015 +1100
work in progress on Configurations as services
commit 46ce2aef3a
Merge: 9e82fa0
ae9dc79
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Dec 4 10:11:09 2015 +1100
Merge branch 'master' into jetty-9.4.x-Feature
commit 9e82fa0a22
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Dec 4 08:52:37 2015 +1100
work in progress to Configurations as ServiceLoader
commit 6e11f22de4
Merge: 120e330
5afa348
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Dec 3 18:16:14 2015 +1100
Merge branch 'master' into jetty-9.4.x-Feature
commit 120e33034f
Merge: 6c5b95d
384caf0
Author: Greg Wilkins <gregw@webtide.com>
Date: Thu Dec 3 14:20:52 2015 +1100
Merge branch 'master' into jetty-9.4.x-Feature
commit 6c5b95d6b8
Merge: 722eb60
5e40bf2
Author: Greg Wilkins <gregw@webtide.com>
Date: Wed Dec 2 11:16:37 2015 +1100
Merge branch 'master' into jetty-9.4.x-Feature
commit 722eb60ce5
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Nov 27 13:58:16 2015 +1100
Configurations can add server/system classes
commit 2972354db7
Author: Greg Wilkins <gregw@webtide.com>
Date: Fri Nov 27 11:47:03 2015 +1100
Self ordering WebApp Configurations
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2016-05-02 17:55:54 +10:00
Joakim Erdfelt
c09f31a51d
Bumping up master to version 10.0.0-SNAPSHOT
2016-04-29 11:47:15 -07:00
Greg Wilkins
3e8187dcd5
Merge remote-tracking branch 'origin/jetty-9.3.x'
2016-04-29 16:58:00 +10:00
Greg Wilkins
9dbd944850
Issue #525 Looping on malformed request
...
Fixed unit test for 9.4 error handling
2016-04-29 15:05:19 +10:00
Greg Wilkins
d38bdb6e7c
486530 - Handler added to WebAppContext prevents ServletContext initialization
...
Fixed needless warnings during destroy
2016-04-28 15:17:28 +10:00
Greg Wilkins
092ed57a17
Merge remote-tracking branch 'origin/jetty-9.3.x'
2016-04-28 08:17:45 +10:00
Greg Wilkins
695b63fc78
Issue #525 Looping on malformed request
...
Improved onBadMessage handling so that it better handles ISE thrown when a bad message is detected while dispatched to the servlet.
2016-04-27 18:57:15 +10:00
Joakim Erdfelt
44fa2b0de1
Issue #525 - Possible 100% CPU Consumption in HttpInputOverHttp.blockForContent with malformed HTTP-Request
...
+ Adding testcase to attempt to replicate
(Does not cause spin loop, so set to @Ignore for now)
2016-04-26 14:31:08 -07:00
Joakim Erdfelt
f1c34cb10f
Close #526 - Headers set from RequestDispatcher.include() not showing up in response
...
+ Adding 2 testcases to verify behavior
2016-04-26 14:04:56 -07:00
Mikko Tiihonen
aa8597c19e
Sort equal quality accept-encoding values based on server configured preference ( #507 )
...
* Sort equal quality accept-encoding values based on server configured preference. Add fixed size cache to reduce overhead of complex header parsing. #507
Signed-off-by: Mikko Tiihonen <mikko.tiihonen@nitorcreations.com>
* Only look at the first Accept-Encoding header value in the request. Jetty has never supported handling of multiple headers before and the worst thing that can happen is that the static content is sent uncompressed
* Rename tieBreakerFunction to secondaryOrderingFunction
* Make accept-encoding header cache size configurable
* Add back multiple accept-encoding header handling (with optimizations). Merge QuotedEncodingQualityCSV back to QuotedQualityCSV. Fix documentation on how to use precompressed servlet init parameter
2016-04-15 20:04:01 +10:00
Jan Bartel
d28dffb16e
Remove SessionManager; refactor names of session classes; add start modules for new session arch
2016-04-15 11:08:46 +10:00
Joakim Erdfelt
6fb338e50d
Updating to version 9.3.9-SNAPSHOT
2016-04-11 16:20:50 -07:00
Joakim Erdfelt
bb4f3c4882
Updating to version 9.3.9.M1
2016-04-11 15:35:22 -07:00
Greg Wilkins
2fb9b55da2
Issue #485 Multiple compressed formats from static content
...
Renamed ResourceCache as per TODO
Added javadoc and XML comments
2016-04-07 17:33:47 +10:00
Greg Wilkins
a72838162d
Issue #485 Multiple compressed formats from static content
...
Fixed formatting from the PR
2016-04-07 16:47:28 +10:00
Mikko Tiihonen
3261e03edb
Support for configurable set of precompressed static resources
...
* Support for configurable set of precompressed static resources
Signed-off-by: Mikko Tiihonen <mikko.tiihonen@nitorcreations.com>
* Use QuotedQualityCSV to parse preferred content encodings
Signed-off-by: Mikko Tiihonen <mikko.tiihonen@nitorcreations.com>
2016-04-07 13:57:00 +10:00
Greg Wilkins
3590abc534
Merge remote-tracking branch 'origin/jetty-9.3.x'
2016-03-30 20:05:59 +11:00
Greg Wilkins
c768828703
Issue #458 Improve Quality list handling
...
Added QuotedCSV and QuotedQualityCSV that are up to date with RFC7230
2016-03-30 19:07:11 +11:00
Greg Wilkins
acfa1268bc
Merge remote-tracking branch 'origin/jetty-9.3.x'
2016-03-24 12:58:06 +11:00
Greg Wilkins
4ae077f2b6
Issue #448 - RFC2616 Compliance Mode should track and report RFC7230 violations
...
Improved compliance level reporting
Improved method names to make code read better
2016-03-23 14:42:05 +11:00
Greg Wilkins
7f96db72c4
Issue #448 - RFC2616 Compliance Mode should track and report RFC7230 violations
...
Empty value is not a compliance issue
removed debug
moved violation handling to end of header rather than end of message
2016-03-23 13:13:16 +11:00
Joakim Erdfelt
7be58f9730
Issue #448 - RFC2616 Compliance Mode should track and report RFC7230 violations
...
+ added Optional behavior to record violations in a Request attribute
+ added servlet testcase showing this violation recording abillity
+ currently the recorded violation doesn't report the correct compliance mode that it violates
+ there is still a problem with a quoted empty string value from Issue #451
2016-03-22 12:20:19 -07:00
Joakim Erdfelt
3624339ec6
Merge branch 'jetty-9.3.x'
2016-03-16 10:29:29 -07:00