Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
17,709 Commits 69 Branches 462 Tags 354 MiB
Commit Graph

1508 Commits

Author SHA1 Message Date
Jesse McConnell 513b5e5f90 Updating to version 9.2.21.v20170120 2017-01-20 12:32:00 -06:00
Jesse McConnell d0c33ebe8b Updating to version 9.4.2-SNAPSHOT 2017-01-20 10:49:06 -06:00
Jesse McConnell 556ecbcdcf Updating to version 9.4.1.v20170120 2017-01-20 09:47:53 -06:00
Jesse McConnell 66b43ecda8 Updating to version 9.3.17-SNAPSHOT 2017-01-20 09:33:43 -06:00
Jesse McConnell df03355d00 Updating to version 9.3.16.v20170120 2017-01-20 09:06:48 -06:00
Simone Bordet cef2ff9522 Happy New Year 2017. 2017-01-19 19:31:53 +01:00
Simone Bordet 0c8273f2ca Happy New Year 2017. 2017-01-19 19:26:41 +01:00
Simone Bordet 07838b057f Happy New Year 2017. 2017-01-19 18:54:03 +01:00
Simone Bordet 347c48d657 Revert "resolve merge and update license headers" 
This reverts commit 53b31b03dd, reversing
changes made to 4565c186d7.
 2017-01-19 18:26:43 +01:00
Jesse McConnell 53b31b03dd resolve merge and update license headers 2017-01-19 09:33:16 -06:00
Jesse McConnell ce3e6dafec update license headers to 2017 2017-01-19 09:30:00 -06:00
Jan Bartel 46668d5a66 Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-01-19 13:54:22 +11:00
Jan Bartel 1ecaac9383 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-01-19 13:53:51 +11:00
Jan Bartel edfd05dd9c Issue #1268 
Add unit tests, tweak log and error messages, fix bug.
 2017-01-19 13:49:50 +11:00
Greg Wilkins 80163993aa Merge remote-tracking branch 'origin/jetty-9.4.x' 2017-01-18 15:24:26 +11:00
Greg Wilkins 2a3c367f55 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-01-18 15:21:05 +11:00
Jan Bartel 69afe33b82 Issue #1268 2017-01-18 15:16:52 +11:00
Simone Bordet b7b3dfdc77 Merged branch 'jetty-9.4.x' into 'master'. 2017-01-12 17:53:09 +01:00
Greg Wilkins 611e79945c Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-01-11 18:10:50 +11:00
Greg Wilkins 36dcf47f18 Issue #1234 onBadMessage 
Added a boolean to determine if headerComplete has been called, and if so then earlyEOF is called
 2017-01-11 17:36:04 +11:00
Joakim Erdfelt 7494914ff6 Updating to version 9.3.16-SNAPSHOT 2016-12-20 13:09:32 -07:00
Joakim Erdfelt 680ecd646b Updating to version 9.3.15.v20161220 2016-12-20 12:31:58 -07:00
Joakim Erdfelt 6b3b59df43 Updating to version 9.2.21-SNAPSHOT 2016-12-16 16:23:06 -07:00
Joakim Erdfelt bcbcee7f23 Updating to version 9.2.20.v20161216 2016-12-16 15:47:41 -07:00
Jesse McConnell 6a7e5dd4f5 Updating to version 9.4.1-SNAPSHOT 2016-12-08 09:41:50 -06:00
Jesse McConnell c54efb5929 Updating to version 9.4.0.v20161208 2016-12-08 08:56:45 -06:00
Jesse McConnell f8338b3f59 Updating to version 9.4.1-SNAPSHOT 2016-12-07 10:32:41 -06:00
Jesse McConnell dac1d17a2d Updating to version 9.4.0.v20161207 2016-12-07 09:47:30 -06:00
Joakim Erdfelt fa6d9029fc Merge branch 'jetty-9.4.x' 2016-11-15 14:30:19 -07:00
Greg Wilkins a7048a325a Issue #1077 
Removed concrete handle from AbstractHandler
Added AbstractHandler.ErrorDispatchHandler
cleanup context listeners
Removed vanity inlining of ScopeHandler methods

Squashed commit of the following:

commit 0f3619ac1101707de476ad9b7f7394e8de18d95f
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Nov 8 10:59:55 2016 +1100

    Issue #1077

    Removed concrete handle from AbstractHandler
    Added AbstractHandler.ErrorDispatchHandler

commit 0876fee0334b9f43297f28fc4b855f447b7ee73f
Merge: 5eabad2 7716ada
Author: Greg Wilkins <gregw@webtide.com>
Date:   Tue Nov 8 08:48:53 2016 +1100

    Merge branch 'jetty-9.4.x' into jetty-9.4.x-issue-1077

commit 5eabad29a5c4d893e204cb403a1d276ea3b15281
Author: Greg Wilkins <gregw@webtide.com>
Date:   Mon Nov 7 21:15:40 2016 +1100

    Issue #1077 cleanup context listeners

commit 9edf91a386aa20a3c0af86a634b4b3dbbc8e1092
Author: Greg Wilkins <gregw@webtide.com>
Date:   Mon Nov 7 18:08:01 2016 +1100

    Issue #1077 Removed vanity inlining of ScopeHandler methods
 2016-11-08 15:58:15 +11:00
Jesse McConnell 9a6f68be78 Merge branch 'release-9.3.14' into jetty-9.3.x 2016-11-07 10:45:04 -06:00
Greg Wilkins 6781a949b1 Issue#1066 Simplify HttpGeneration 
Reduce the transformations needed on header fields, so they can be more often
set directly and no need to split and recombine.

The Content-Length field is added IF it is needed for framing or if it was explicitly set

The Transfer-Encoding: chunk field is used only as a hint that there is content.

Connection fields are used as is, but are checked for close and keep-alive
 2016-11-03 16:55:33 +11:00
Jan Bartel dfdd324bc8 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-11-03 10:56:35 +11:00
Jan Bartel f3f31d163c Issue #1050 
Add check for duplicate FilterHolder,ServletHolder objects
 2016-11-03 10:55:02 +11:00
Jan Bartel 1a6dd7615d Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-11-02 17:33:35 +11:00
Jan Bartel 8461cc07b3 Issue #1050 2016-11-02 17:32:55 +11:00
Joakim Erdfelt 2c38511828 Updating to version 9.3.15-SNAPSHOT 2016-10-28 13:01:34 -07:00
Joakim Erdfelt 14611d2f76 Updating to version 9.3.14.v20161028 2016-10-28 12:21:02 -07:00
Simone Bordet 69aa9d77ee Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-10-28 12:15:14 +02:00
Simone Bordet 206122756f Fixes #1037 - Don't execute AsyncListener.onTimeout events in spare Scheduler-Thread. 
Now calling onTimeout() from pooled threads.
Restored AsyncListener test cases.
 2016-10-28 12:01:39 +02:00
Jan Bartel 917c7440b6 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-10-26 16:33:24 +11:00
Joakim Erdfelt ade14ba34b Updating to version 9.3.14-SNAPSHOT 2016-10-14 11:33:51 -07:00
Joakim Erdfelt c3a78e70a8 Updating to version 9.3.13.v20161014 2016-10-14 10:39:37 -07:00
Denis Bardadym 8eb56edc8a Fix typo in DefaultServlet (#988) 
Fixes #952

Signed-off-by: Denis Bardadym <bardadymchik@gmail.com>
 2016-10-14 14:18:16 +11:00
Jan Bartel 15be8d206a Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-10-13 15:27:59 +11:00
Jan Bartel 8e4c595b52 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-10-13 15:26:48 +11:00
Jan Bartel 5a85c33e6e Issue #1000 
Refine warning message.
 2016-10-13 15:25:45 +11:00
Jan Bartel 6a2316fb23 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-10-13 15:21:51 +11:00
Jan Bartel 457c66c58d Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-10-13 15:21:17 +11:00
Jan Bartel 37ec4160bb Issue #1000 2016-10-13 15:06:47 +11:00
Greg Wilkins be1726e251 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-10-05 13:51:03 +11:00
Greg Wilkins 98bb582d45 Jetty 9.4.x http interceptor #382 
* Issue #382 Request compression

Added identity HttpInput.Interceptor
Moved GZIPContentDecoder to jetty-http
Reworking interceptor and GZIPContentDecoder to avoid data copies
Completed and tested GZIPContentDecoder
Implemented GzipHttpInputInterceptor
updated GzipHandler.java
updated gzip module
use common GZIP decoder
Gzip Bomb
handle read() after empty interception
 2016-10-05 13:49:20 +11:00
Jesse McConnell 863913b64e set for dev 2016-09-30 19:05:47 +00:00
Jesse McConnell b91cc8a4ea set for release 2016-09-30 18:01:20 +00:00
Simone Bordet 79889f05f5 Merged branch 'jetty-9.4.x' into 'master'. 2016-09-26 12:21:05 +02:00
Simone Bordet 716c595cdf Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-09-26 12:20:22 +02:00
Simone Bordet 74b86bad35 Fixes #960 - Async I/O spin when reading early EOF. 
AsyncIOServletTest is now testing HTTP/1.1 and HTTP/2 transports.
 2016-09-26 11:49:57 +02:00
Simone Bordet f3b3d4a2ff Merged branch 'jetty-9.4.x' into 'master'. 2016-09-22 21:57:46 +02:00
Simone Bordet 9551d0f62b Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-09-22 21:57:12 +02:00
Simone Bordet 1f92ba2112 Code cleanup. 2016-09-22 21:28:09 +02:00
Joakim Erdfelt b0880f617a Merge branch 'release-9.3.12' into jetty-9.3.x 2016-09-20 14:39:08 -07:00
Simone Bordet 4f533f39be Merged branch 'jetty-9.4.x' into 'master'. 2016-09-16 10:38:25 +02:00
Simone Bordet 82aec3986e Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-09-16 10:37:45 +02:00
Olivier Lamy 1bf87b317b Add support of a query param to reset stats of StatisticsHandler tru StatisticsServlet (#919) 
StatisticsServlet: support a new parameter to be able to reset stats

Signed-off-by: olivier lamy <olamy@webtide.com>
 2016-09-16 10:36:33 +02:00
Joakim Erdfelt 6cf10172ca Updating to version 9.3.13-SNAPSHOT 2016-09-15 07:34:52 -07:00
Joakim Erdfelt 8b35fdc5a5 Updating to version 9.3.12.v20160915 2016-09-15 06:48:16 -07:00
Simone Bordet eb78d5e2c3 Merged branch 'jetty-9.4.x' into 'master'. 
Removed deprecated ConnectorStatistics class and its usages.
 2016-09-14 17:28:51 +02:00
Simone Bordet 14e000428f Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-09-14 17:26:00 +02:00
Simone Bordet cb89ea8466 Fixes #131 - Improve Connector Statistic names and values. 
Removed references to deprecated ConnectorStatistic in favor of
ConnectionStatistics.
 2016-09-14 17:24:45 +02:00
Greg Wilkins 26cfaa2efb Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-09-14 18:29:28 +10:00
Greg Wilkins ea08a6db72 Issue #911 
Fix spec compliance, return HttpServletRequest.getContextPath as encoded.
 2016-09-14 18:28:02 +10:00
Jan Bartel 44fa57b38a Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-09-09 16:39:16 +10:00
Greg Wilkins b6a39cf7d3 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-09-09 10:13:38 +10:00
Greg Wilkins 68340a94d0 Issue #911 encode requestURI in startAsync(req,res) 2016-09-09 10:12:08 +10:00
Greg Wilkins 0c0d47055c Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-09-09 09:22:39 +10:00
Greg Wilkins b408786b9a Issue #911 encode requestURI in startAsync(req,res) 2016-09-09 09:20:24 +10:00
Greg Wilkins 4312995d89 Issue #911 encode requestURI in startAsync(req,res) 2016-09-09 09:19:01 +10:00
Greg Wilkins ebec811427 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-09-09 09:10:48 +10:00
Greg Wilkins 1247380976 Issue #911 encode requestURI in startAsync(req,res) 2016-09-09 09:09:51 +10:00
Joakim Erdfelt fb7da26ad2 Updating to version 9.2.20-SNAPSHOT 2016-09-08 13:04:11 -07:00
Joakim Erdfelt 7b94bc32f4 Updating to version 9.2.19.v20160908 2016-09-08 12:11:44 -07:00
Greg Wilkins e29aa306cf Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-09-08 15:03:31 +10:00
Greg Wilkins a6512c991b Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-09-08 15:03:10 +10:00
Greg Wilkins f7d017ca1a Issue #911 encode requestURI in startAsync(req,res) 2016-09-08 15:00:54 +10:00
Jan Bartel 4639aeb536 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-09-02 15:45:48 +10:00
Jan Bartel 30bf3febdc Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-09-02 15:45:15 +10:00
Jan Bartel 58c3b30f9e Merge branch 'jetty-9.3.x' of github.com:eclipse/jetty.project into jetty-9.3.x 2016-09-02 15:43:31 +10:00
Jan Bartel 9e74080f8b Merge remote-tracking branch 'origin/jetty-9.2.x' into jetty-9.3.x 2016-09-02 15:42:48 +10:00
Greg Wilkins 32f1b30901 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-09-02 14:58:08 +10:00
Greg Wilkins 25574d2843 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-09-02 14:57:44 +10:00
Greg Wilkins 1f7c5a5b20 Issue #898 
Added addCSV method to HttpFields to more efficiently add values to a CSV field without duplicates.
Improved usage of QuotedCSV and removed older parsing

Used new method in GazipHttpOutPutInterceptor to avoid duplicate Vary fields
 2016-09-02 14:57:13 +10:00
Jan Bartel 0d6667dc9f Issue #894 2016-09-02 13:50:25 +10:00
Joakim Erdfelt 2830e51e04 Merge branch 'jetty-9.3.x' into release-9.3.11 2016-07-28 12:20:36 -07:00
Greg Wilkins 7d4a509462 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-07-28 18:45:47 +10:00
Greg Wilkins a415e72e2d Fixed Debug NPE #754 
Fixed the fix
 2016-07-28 18:29:21 +10:00
Joakim Erdfelt a0d866687f Merge branch 'jetty-9.4.x' 2016-07-25 17:03:11 -07:00
Joakim Erdfelt 87c8e1c019 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-07-25 17:02:51 -07:00
Greg Wilkins e53ea55f48 Issue #752 SETTINGS_MAX_HEADER_LIST_SIZE 
Defined missing status codes (removed old/wrong javadoc)
Changed use of 413 to 431
Received SETTINGS_MAX_HEADER_LIST_SIZE is set on hpack encoded and warning generated only for large responses.
 2016-07-23 12:17:50 +10:00
Joakim Erdfelt 6e1b1cdb36 Updating to version 9.3.12-SNAPSHOT 2016-07-21 19:07:19 -07:00
Joakim Erdfelt 9fd6d4354e Updating to version 9.3.11.v20160721 2016-07-21 18:37:09 -07:00
Joakim Erdfelt 0b18340179 Updating to version 9.2.19-SNAPSHOT 2016-07-21 13:10:23 -07:00
Joakim Erdfelt d3ff3423f0 Updating to version 9.2.18.v20160721 2016-07-21 12:35:26 -07:00
Greg Wilkins 53c07a5a83 Servlet 4.0 getMappings rough implementation #746 2016-07-20 13:58:19 +10:00
Simone Bordet 491be7505b Merged branch 'jetty-9.4.x' into 'master'. 2016-07-19 10:34:59 +02:00
Greg Wilkins 86ff9f984d fixed noisy/broken tests 2016-07-19 15:16:14 +10:00
Simone Bordet a1cc30c751 Merged branch 'jetty-9.4.x' into 'master'. 2016-07-15 18:12:46 +02:00
Simone Bordet 6adb5eb031 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-07-15 18:12:02 +02:00
Simone Bordet 0433a8ca73 Issue #730 - "Slow" client causes IllegalStateException. 
Fixed by allowing state ASYNC to call onWritePossible().
 2016-07-15 18:11:28 +02:00
Simone Bordet a38e819907 Code cleanups. 2016-07-15 18:09:44 +02:00
Joakim Erdfelt e47052f706 Merge branch 'jetty-9.4.x' 2016-07-13 12:30:08 -07:00
Joakim Erdfelt 165a7082ba Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-07-13 12:29:43 -07:00
Joakim Erdfelt 241ef90769 Issue #721 - Enhancing multi-line response header testcase 2016-07-13 12:29:02 -07:00
Simone Bordet 624405d54d Merged branch 'jetty-9.4.x' into 'master'. 2016-07-13 20:10:56 +02:00
Simone Bordet 2954ef0fd8 Merge branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-07-13 20:10:08 +02:00
Joakim Erdfelt e4249fdd9b Issue #721 - Adding testcase for multi-line response values 2016-07-13 09:33:30 -07:00
Joakim Erdfelt b28064c2c8 Using LocalConnector in test 2016-07-13 09:20:34 -07:00
Greg Wilkins 68f57cf3e8 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-07-13 14:49:19 +10:00
Greg Wilkins c60cca7b8c clean up import 2016-07-13 11:59:02 +10:00
Joakim Erdfelt ba761071f3 Merge branch 'jetty-9.4.x' 2016-07-12 17:50:37 -07:00
Joakim Erdfelt 232a077b9d Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-07-12 17:50:16 -07:00
Joakim Erdfelt 30f8f32594 Issue #717 - Adding Transfer-Encoding: chunked testcase 2016-07-12 17:47:53 -07:00
Joakim Erdfelt d08d5b949c Issue #717 - Adding testcase for GzipHandler.minGzipSize 2016-07-12 12:04:49 -07:00
Jan Bartel 52f0858485 Merge remote-tracking branch 'origin/jetty-9.4.x' 2016-07-08 13:23:33 +10:00
Jan Bartel 5b5c8c3791 Issue #282 2016-07-08 13:23:00 +10:00
Joakim Erdfelt 294362954d Merge branch 'jetty-9.4.x' 2016-07-07 13:43:16 -07:00
Greg Wilkins e38ec83de9 Issue #695 use the getResponse methods 2016-07-07 18:13:44 +10:00
Jesse McConnell ae931538ab [maven-release-plugin] prepare for next development iteration 2016-06-22 13:59:10 -05:00
Jesse McConnell df1ed4fb03 [maven-release-plugin] prepare release jetty-9.3.11.M0 2016-06-22 13:59:06 -05:00
Jesse McConnell 2b947e8f72 Merge branch 'jetty-9.3.x' into release-9.3.10 2016-06-22 13:22:27 -05:00
Joakim Erdfelt 0a196e2123 Merge branch 'jetty-9.4.x' 2016-06-22 10:43:58 -07:00
Joakim Erdfelt 8157a4533c Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-06-22 10:43:43 -07:00
Joakim Erdfelt cb03ffd9a2 Merge branch 'jetty-9.2.x' into jetty-9.3.x 2016-06-22 08:51:24 -07:00
Joakim Erdfelt 2731ac1752 Issue #654: Confirming ServletContext.getResourceAsStream() behavior in Jetty 9.2.x 2016-06-22 08:50:25 -07:00
Jesse McConnell 030ec61837 [maven-release-plugin] prepare for next development iteration 2016-06-22 09:14:25 -05:00
Jesse McConnell 9a4cb41122 [maven-release-plugin] prepare release jetty-9.3.11.M0 2016-06-22 09:14:21 -05:00
Jesse McConnell e7034117ea [maven-release-plugin] prepare for next development iteration 2016-06-21 08:50:13 -05:00
Jesse McConnell 16c435c69d [maven-release-plugin] prepare release jetty-9.3.10.v20160621 2016-06-21 08:50:09 -05:00
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
Jesse McConnell d5c6793e6a [maven-release-plugin] prepare for next development iteration 2016-05-17 15:33:46 -05:00
Jesse McConnell 0bab7e6616 [maven-release-plugin] prepare release jetty-9.2.17.v20160517 2016-05-17 15:33:42 -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 939505c342 Updating to version 9.2.17-SNAPSHOT 2016-04-14 14:03:21 -07:00
Joakim Erdfelt 778fac638d Updating to version 9.2.16.v20160414 2016-04-14 13:21:34 -07:00
Joakim Erdfelt 47bbd9364d Revert "Updating to version 9.2.16.v20160414" 
This reverts commit 29ae63855b.
 2016-04-14 13:19:59 -07:00
Joakim Erdfelt 29ae63855b Updating to version 9.2.16.v20160414 2016-04-14 13:17:21 -07: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
Joakim Erdfelt 13fde643ed Merge branch 'release-9.3.8' into jetty-9.3.x 2016-03-16 10:03:29 -07:00
Greg Wilkins 1c5a1fc6a2 Issue #431 
Suppress stack traces from unit tests
 2016-03-16 18:19:40 +11:00
Joakim Erdfelt c68d3b1d8d Updating to version 9.3.9-SNAPSHOT 2016-03-14 09:07:52 -07:00
Joakim Erdfelt 1f3b3f31f4 Updating to version 9.3.8.v20160314 2016-03-14 08:30:20 -07:00
Greg Wilkins 2b67e04861 fixed bad merge 2016-03-02 17:32:17 +01:00
Greg Wilkins 3300d54b5a Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-03-02 14:13:29 +01:00
Greg Wilkins 3963309f62 Issue #379 Insufficient information on asyncNotSupported 
Converted the boolean for asyncSupported to a String holding the source
of the async not supported.
 2016-03-02 14:09:15 +01:00
Greg Wilkins dd4a72ce76 479903 - improve async onError handling 
Work in progress towards clean build
 2016-02-17 14:13:21 +01:00
Joakim Erdfelt f98dde5e5b Updating to version 9.2.16-SNAPSHOT 2016-02-10 15:36:41 -07:00
Joakim Erdfelt 9b6890d3c1 Updating to version 9.2.15.v20160210 2016-02-10 14:49:12 -07:00
Simone Bordet 2ac465a343 Merged branch 'jetty-9.3.x' into 'master'. 2016-02-09 18:14:07 +01:00
Simone Bordet 6306f06e2f Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2016-02-09 18:12:04 +01:00
Simone Bordet 145e4bee71 487511 - Jetty HTTP won't work on turkish systems. 
Fixed usages of toLowerCase() and toUpperCase() to use Locale.ENGLISH.
 2016-02-09 17:50:26 +01:00
Simone Bordet cb79379b79 Merged branch 'jetty-9.3.x' into 'master'. 2016-02-05 18:14:56 +01:00
Jan Bartel dd2e042ddf Revert "486394 - Restore MultiPartFilter behavior with regards to temp file access" 
This reverts commit 009fde2400.
 2016-02-04 08:41:14 +01:00
Jan Bartel 94a56f0802 Revert "Fixing license header formatting on new file" 
This reverts commit c858bc126a.
 2016-02-04 08:41:00 +01:00
Greg Wilkins bb89e113a9 fixed merge 2016-02-04 07:00:39 +01:00
Greg Wilkins df79ad689a Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-02-04 07:00:13 +01:00
Joakim Erdfelt c858bc126a Fixing license header formatting on new file 2016-02-03 08:31:08 -07:00
Joakim Erdfelt 009fde2400 486394 - Restore MultiPartFilter behavior with regards to temp file access 
+ Adding HttpServletRequest.getParts() demonstration of duplicate name="" entries
+ Adding 2 new testcases in MultipartFilterTest demonstrating
  location/temp file access issue (currently @Ignored)
 2016-02-03 08:19:37 -07:00
Greg Wilkins 6c9a444b6c 486530 - Handler added to WebAppContext prevents ServletContext initialization 
Added warnings for loops and inappropriate handlers.
Used insertHandler in more XML files
 2016-02-03 10:54:39 +01:00
Joakim Erdfelt 1aef09acc2 486604 - Add debug logging of ErrorPageErrorHandler logic 2016-01-27 11:55:00 -07:00
Joakim Erdfelt e0ce545ad7 Updating to version 9.3.8-SNAPSHOT 2016-01-15 17:15:14 -07:00
Joakim Erdfelt c0b191119b Updating to version 9.3.7.v20160115 2016-01-15 16:40:15 -07:00
Joakim Erdfelt b7f9c9aca9 Updating to version 9.3.7-SNAPSHOT 2016-01-13 08:21:01 -07:00
Joakim Erdfelt 21ca3f6690 Updating to version 9.3.7.RC1 2016-01-13 07:30:24 -07:00
Joakim Erdfelt 30308f2316 Javadoc updates 2016-01-13 07:25:15 -07:00
dreis2211 8dc6e25b89 Removed superfluous condition in ServletHandler.getFilterChain() 
Signed-off-by: dreis2211 <christoph.dreis@freenet.de>
 2016-01-09 15:49:44 +01:00
Joakim Erdfelt ac24196b0d Happy New Year 2016 2016-01-04 14:34:20 -07:00
Joakim Erdfelt cd39fd84fe Happy New Year 2016 2016-01-04 14:31:22 -07:00
Joakim Erdfelt b5db18378d Happy New Year 2016 2016-01-04 14:21:26 -07:00
Greg Wilkins 460e6e2ff3 Refactored DefaultServlet and ResourceHandler to use commong ResourceService 2015-12-27 16:17:11 +11:00
Greg Wilkins 133e9e054d Merge remote-tracking branch 'origin/jetty-9.3.x' 
Conflicts:
	jetty-security/src/main/java/org/eclipse/jetty/security/HashLoginService.java
 2015-12-18 12:50:19 +11:00
Greg Wilkins 5cd676581c 484622 - Improve handling of Direct and Mapped buffers for static content 
ResourceHttpContent now applies a maxBufferSize that is passed through the call to getContent
ResourceCache now accounts for the exact memory usage of content, which may have an indirect
buffer plus either a direct or mapped buffer.  Thus content size may be 0, 1 or 2 times the
file size.

Some more limited unit tests
 2015-12-18 12:36:27 +11:00
Joakim Erdfelt a4cf7d654b 482042 - New API, Allow customization of ServletHandler path mapping 
+ Swapping out PathMap for PathMappings in ServletHandler

Conflicts:
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java

Conflicts:
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
 2015-12-17 14:38:55 -07:00
Joakim Erdfelt 31cd3fee84 Merge branch 'jetty-9.3.x' 
Conflicts:
	jetty-http/src/main/java/org/eclipse/jetty/http/PathMap.java
	jetty-http/src/main/java/org/eclipse/jetty/http/pathmap/PathSpecSet.java
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/gzip/GzipHandler.java
	jetty-util/src/main/java/org/eclipse/jetty/util/IncludeExclude.java
	jetty-util/src/main/java/org/eclipse/jetty/util/RegexSet.java
 2015-12-17 12:51:57 -07:00
Joakim Erdfelt 343aa066ae Merge branch 'jetty-9.2.x' into jetty-9.3.x 
Conflicts:
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java
	jetty-http/src/main/java/org/eclipse/jetty/http/PathMap.java
	jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/AbstractJettyMojo.java
	jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/WarPluginInfo.java
	jetty-rhttp/jetty-rhttp-gateway/src/main/java/org/eclipse/jetty/rhttp/gateway/Main.java
	jetty-security/src/main/java/org/eclipse/jetty/security/PropertyUserStore.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/CrossOriginFilter.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/CompressedResponseWrapper.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/GzipHandler.java
	jetty-util/src/main/java/org/eclipse/jetty/util/IncludeExclude.java
	jetty-util/src/main/java/org/eclipse/jetty/util/RegexSet.java
	jetty-util/src/test/java/org/eclipse/jetty/util/IncludeExcludeTest.java
	jetty-util/src/test/java/org/eclipse/jetty/util/ssl/SslContextFactoryTest.java
 2015-12-16 12:56:13 -07:00
Joakim Erdfelt 4f9d785b46 Revert "482042 - New API, Allow customization of ServletHandler path mapping" 
This reverts commit 77d4b54082.
 2015-12-16 10:08:02 -07:00
Matt Gilman abe5d090bb [447816] - ServletHolder#compareTo not transitive 
Updating compareTo to properly order when one _className is null and the other is not.

Signed-off-by: Matt Gilman <matt.c.gilman@gmail.com>
 2015-12-16 09:24:40 +11:00
Greg Wilkins 50899ab212 Merge branch 'master' of git://github.com/mcgilman/jetty.project 2015-12-16 09:18:01 +11:00
Joakim Erdfelt 77d4b54082 482042 - New API, Allow customization of ServletHandler path mapping 
+ Swapping out PathMap for PathMappings in ServletHandler

Conflicts:
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
 2015-12-15 14:41:37 -07:00
Matt Gilman e8b3b68e90 [447816] - ServletHolder#compareTo not transitive 
Updating compareTo to properly order when one _className is null and the other is not.

Signed-off-by: Matt Gilman <matt.c.gilman@gmail.com>
 2015-12-14 15:03:31 -05:00
Joakim Erdfelt 1df5a05ee1 482042 - New API, Allow customization of ServletHandler path mapping 
+ Swapping out PathMap for PathMappings in ServletHandler
 2015-12-14 11:22:24 -07:00
Joakim Erdfelt e2a20e0465 Using Map interface to get around ConcurrentHashMap.keySet() bug with Java 8 
See https://gist.github.com/AlainODea/1375759b8720a3f9f094
for details

Conflicts:
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/listener/ELContextCleaner.java
 2015-12-08 14:55:45 -07:00
Greg Wilkins ae9dc7922d 483427 - AsyncContext complete while pending async Reads/Writes 
improved unit test
 2015-12-04 10:10:12 +11:00
Greg Wilkins 5afa348aaa removed debug 2015-12-03 17:27:43 +11:00
Joakim Erdfelt 97722aeea8 Merge branch 'jetty-9.3.x' 2015-12-02 12:20:06 -07:00
Joakim Erdfelt bae1138211 Fixing test expectations on Decorator counts 2015-12-02 12:19:52 -07:00
Joakim Erdfelt 1e6b940942 Merge branch 'jetty-9.3.x' 
Conflicts:
	jetty-server/src/test/java/org/eclipse/jetty/server/AbstractHttpTest.java
 2015-12-02 11:39:52 -07:00
Greg Wilkins ddba6c20cd 483427 - AsyncContext complete while pending async Reads/Writes 2015-12-02 16:46:20 +11:00
Greg Wilkins 4bbd060ca8 483427 - AsyncContext complete while pending async Reads/Writes 2015-12-02 16:07:59 +11:00
Joakim Erdfelt 481102db30 483413 - Warn on @Deprecated servlet/filter use 2015-12-01 15:53:46 -07:00
Greg Wilkins cea05f17d9 483119 - CachingWebAppClassLoader breaks JSP 
Cleaned up debugging and impl.  No fix for JSP problem
 2015-11-27 10:39:52 +11:00
Joakim Erdfelt 33307730ea 482041 - Add ServletHandler.newCachedChain() to ease customization 2015-11-24 08:51:22 -07:00
Joakim Erdfelt b64b1d98e0 480898 - Introduce FilterMapping.getDispatcherTypes() method 2015-11-24 08:51:21 -07:00
Greg Wilkins a311c8bde1 480904 - jetty-util Loader simplification 
The Loader has been simplified to now just be a switch between loading from the context loader,
the same loader as another class or the system loader.    Multiple loaders will never be tried.

A new runWithServerClassAccess(PriviledgedAction) method has been added to WebAppClassLoader, that
is now used during configuration for actions that need access to both the WEB-INF/lib classes and
the server classes (eg jetty-web.xml and env.xml).

The JMX MBean mechanism has also been modified to look for an MBean class in the same loader that
object came from before attempting the context loader (only if different).
 2015-11-19 12:14:05 +11:00
Joakim Erdfelt 4e773c16e2 Merge branch 'release-9.3.6' into jetty-9.3.x 2015-11-18 11:24:04 -07:00