Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
24,653 Commits 69 Branches 465 Tags 360 MiB
Commit Graph

665 Commits

Author SHA1 Message Date
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
Simone Bordet 5b5f2fcf5f Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2018-08-27 10:29:12 +02: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
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
Joakim Erdfelt 7ad182fbcf Issue #2780 - making servlet output reliable for EOL 2018-08-07 15:59:42 -05: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
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
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 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 c4bcc4005a Merge branch 'jetty-9.4.x-issue-2560-pathresource-exceptions' of github.com:eclipse/jetty.project into jetty-9.4.x-issue-2560-pathresource-exceptions 2018-05-31 11:32:24 -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
Joakim Erdfelt c36390967f Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-issue-2560-pathresource-exceptions 2018-05-31 10:15:11 -05:00
Jan Bartel 0f23af315c Issue #2599 Fix AsyncServletIOTest 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2018-05-30 18:15:04 +02:00
Joakim Erdfelt be61fabc63 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-issue-2560-pathresource-exceptions 2018-05-29 12:09:07 -05:00
Greg Wilkins d3b81e5372 Fix for #2583 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-05-29 12:41:19 +02:00
Joakim Erdfelt 65de2c6690 Issue #2560 - Review of PathResource exception handling 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2018-05-22 10:30:30 -05: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 a933456089 update etags for all methods #1416 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2018-03-13 14:07:37 +11:00
Lachlan Roberts a639ee9275 Resolved errorprone MissingOverride warnings #2206 
`@Override` was added to methods which were missing the annotation #2206

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2018-03-01 13:59:25 +11:00
Greg Wilkins 8b7480f088 Merge branch 'jetty-9.4.x' into jetty-9.4.x-2022-FineGrainedComplianceModes 2018-01-10 22:25:49 +01:00
Joakim Erdfelt 41ed9f29f4 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2018-01-09 09:37:25 -06:00
Joakim Erdfelt fa4c7b0ca9 Issue #2108 - Updating license headers for year 2018 2018-01-09 08:39:37 -06:00
Joakim Erdfelt 067fc5d2d8 Issue #2108 - Upgrade licenses for 2018 2018-01-09 07:42:06 -06:00
Greg Wilkins 22beb1d02a Updated tests to use _LEGACY modes 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2017-12-27 14:16:23 +01:00
Greg Wilkins 7e516e29fb pass existing compliance tests 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2017-12-24 18:00:03 +01:00
Greg Wilkins 5ce07dddd6
#2006 Use a NOOP to allow unhandle to cope with stolen read (#2009) 
#2006 Use a NOOP to allow unhandle to cope with stolen read

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2017-12-02 12:14:43 +01:00
Jan Bartel b1c80ba231
Issue #1986 ServletContextHandler.Context addListener() methods support session listeners (#2000) 
* Issue #1986 Support session listeners in ServletContextHandler.addEventListener method.

Signed-off-by: Jan Bartel <janb@webtide.com>
 2017-11-30 15:03:37 +01:00
Greg Wilkins d4061fcfeb
Issue #1966 Case Sensitive method (PR #1967) 
Issue #1966 Case Sensitive method (PR #1967)

* Modified the compliance violations to warn if case insensitivety is applied to a header
* removed duplicated if
* Fixed string comparison
* Improved compliance messages and comments
* updated expected violation messages
* Require a header colon only when in 7230 compliance mode
 2017-11-29 18:56:54 +01:00
Greg Wilkins c843b809f0 Fixed #1737 DefaultServlet wrong welcome dispatcher using non-root URL path 
If operating in pathInfoOnly mode, prepend the serlvet path to the welcome path
 2017-08-16 09:54:52 +10:00
Joakim Erdfelt 12e61bf973 Making tests more reliable on lesser FileSystems 2017-08-08 09:14:11 -07:00
Greg Wilkins c9a1395f08 Issue #1618 Async dispatch encoded passed URI 2017-08-08 09:13:43 -07:00
Joakim Erdfelt 61904052f4 Issue #1618 - new testcase for startAsync(req,resp).dispatch() behavior with regards to URL/URI 2017-08-08 09:13:41 -07:00
Joakim Erdfelt 8c96fdde4c Issue #1618 - updating testcase expectations for getPathInfo to match javadoc 2017-08-08 09:13:41 -07:00
Joakim Erdfelt 4556680ddb Issue #1618 - adding testcase to verify AsyncContext dispatch encoding 2017-08-08 09:13:40 -07:00
Joakim Erdfelt 11f2cc5294 Updating test to use HttpTester 2017-08-08 09:13:39 -07:00
Greg Wilkins e7ef74dd4f removed deprecated test method usage 2017-08-08 09:10:25 -07:00
Greg Wilkins 58a4d9e115 Fixes #1592 bad compressed etag comparison 2017-08-08 09:10:25 -07:00
Greg Wilkins b0edf18ad9 Issues #1538 #1435 
Get base content type directly rather than through Type which maybe null
 2017-05-08 15:31:00 +02:00
Greg Wilkins 3495525fe1 Isssue #1530 Do not check for broken final content, only for no last chunk 2017-05-03 20:26:02 +02:00
Greg Wilkins 5493c9e596 Refactor ServletHandler to add getMappedServlet method (#1519) 2017-05-01 16:38:55 +02:00
Greg Wilkins 5e5d650b05 Issue #1500 2017-04-26 16:02:18 +02:00
Joakim Erdfelt e5b5a3c4ee Issue #1500 - adding testcase 2017-04-24 12:42:57 -07:00
Greg Wilkins 63ff4af6b8 improved unit test 2017-04-21 15:21:04 +10:00
Greg Wilkins 02276974a8 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2017-04-20 13:19:28 +10:00
Greg Wilkins 2f04b0f869 Fix #1487 2017-04-20 11:38:28 +10:00
Greg Wilkins f5631a9f1b Fix #1486 2017-04-20 09:38:50 +10:00
Greg Wilkins 781c5750d9 Test for #1435 2017-03-30 11:31:53 +11:00
Joakim Erdfelt 5e57b9562f Merge branch 'jetty-9.3.x' into jetty-9.4.x 2017-02-02 16:14:10 -07:00
Joakim Erdfelt 9a8f22d5dd Testing Updates 
+ Upgrading to jetty-test-helper 4.0
+ Removing use of org.eclipse.jetty.toolchain.test.SimpleRequest
+ Removing use of org.eclipse.jetty.toolchain.test.http.SimpleHttpParser
+ Removing use of org.eclipse.jetty.toolchain.test.http.SimpleHttpResponse
+ Updating long since deprecated (and now removed) known quirky methods
  in jetty-test-helper and the test classes.
 2017-02-02 15:51:38 -07: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 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 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
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
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 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 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
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 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
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
Greg Wilkins ea08a6db72 Issue #911 
Fix spec compliance, return HttpServletRequest.getContextPath as encoded.
 2016-09-14 18:28:02 +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 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
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
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
Greg Wilkins a415e72e2d Fixed Debug NPE #754 
Fixed the fix
 2016-07-28 18:29:21 +10: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
Greg Wilkins 86ff9f984d fixed noisy/broken tests 2016-07-19 15:16:14 +10: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 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 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 c60cca7b8c clean up import 2016-07-13 11:59:02 +10: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 5b5c8c3791 Issue #282 2016-07-08 13:23:00 +10:00
Greg Wilkins e38ec83de9 Issue #695 use the getResponse methods 2016-07-07 18:13:44 +10: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
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 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
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
Greg Wilkins 49ec41f600 Issue #525 fix blockForContent spin 
Improved test
 2016-05-18 12:54:27 +10:00
Greg Wilkins 7c6786a050 Issue #525 
fixed bad merge
 2016-05-12 13:42:46 +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
Greg Wilkins d8715ad217 improved test 2016-05-10 11:43:34 +10: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 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 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
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 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
Greg Wilkins 1c5a1fc6a2 Issue #431 
Suppress stack traces from unit tests
 2016-03-16 18:19:40 +11: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
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 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 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
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
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
Greg Wilkins ae9dc7922d 483427 - AsyncContext complete while pending async Reads/Writes 
improved unit test
 2015-12-04 10:10:12 +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
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
Greg Wilkins 4ed4fda173 Merge remote-tracking branch 'origin/jetty-9.3.x' 2015-11-18 15:53:36 +11:00
Greg Wilkins 8ed34b3395 482243 GzipHandler include test 2015-11-18 15:52:32 +11:00
Greg Wilkins 0d647fc95a Merge remote-tracking branch 'origin/jetty-9.3.x' 2015-11-18 15:11:17 +11:00
Greg Wilkins 12ec44894b 482272 Fixed relative symlink checking 2015-11-18 11:13:35 +11:00
Greg Wilkins cfeee5cec7 479903 - improve async onError handling 2015-10-16 14:51:57 +11:00
Simone Bordet 29e64f5b1c Fixed test. 2015-10-07 23:10:11 +02:00
Joakim Erdfelt 5300f0c7f7 478757 - DebugHandler thread name is mangled 
+ Added testcase, and fixed handler for threadname output.
 2015-09-30 12:47:31 -07:00
Greg Wilkins 67aee72bdd 477680 Encode merged query parameters 2015-09-18 13:19:00 +10:00
Greg Wilkins 99f4ed7352 477737 Improve handling of etags with dynamic and static gzip 2015-09-18 12:30:02 +10: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
Greg Wilkins 02c5ea30be 477123 - AsyncListener callbacks need context scope 
Also added DebugListener and deprecated DebugHandler
 2015-09-11 12:06:23 +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 087b4c94d7 474358 - DefaultServlet bad Content-Type on compressed content 2015-08-14 16:03:08 +10:00
Greg Wilkins 108821aacb 474634 - AsyncListener.onError() handling. 
Fixed more tests in jetty-servlets
 2015-08-13 18:44:25 +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 0f6a83f710 474634 - AsyncListener.onError() handling. 
Fixed async blocking read test
 2015-08-13 16:55:45 +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 8837291393 474634 - Exception handling from AsyncContext handling inconsistent 
+ Adding AsyncListenerTest examples of Exceptions during AsyncContext
  scoped servlet requests.
 2015-08-10 10:55:44 -07:00
Greg Wilkins 04062a8383 Improved graceful shutdown and added tests 2015-07-02 16:57:56 +10:00
Greg Wilkins 9eb2cb4c0f 446564 Refactored RequestLog Mechanism 
reverted API
 2015-04-22 10:37:39 +10:00
Joakim Erdfelt bcd4e5fc45 464727 - Update Javadoc for Java 8 DocLint 
+ Fixing javadoc in jetty-servlet
 2015-04-21 14:31:44 -07:00
Greg Wilkins 1cb0449be3 Organised imports 2015-03-26 12:32:15 +11:00
Joakim Erdfelt 87246263b8 453834 - CDI Support for WebSocket 
+ Verifying ServletContextHandler behavior of Decorators
+ Marking old ServletContextHandler methods as deprecated
+ Updates to DecoratedObjectFactory
+ Removing customized weld scopes/context (for now)
+ Deferring JSR356 ServerContainer endpoint init
  till Container.doStart() to allow weld to init properly first
+ Removing JSR356 BasicServerEndpointConfigurator in favor
  of ContainerDefaultEndpointConfigurator
+ Only decorating server endpoints if they were created by
  ContainerDefaultEndpointConfigurator, all others are trusted
  to be complete and injected already.
 2015-03-12 10:09:52 -07:00
Joakim Erdfelt 130afb9535 Merge branch 'jetty-9.2.x' 
Conflicts:
	jetty-client/src/main/java/org/eclipse/jetty/client/LeakTrackingConnectionPool.java
	jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientLoadTest.java
	jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientUploadDuringServerShutdown.java
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java
	jetty-spdy/spdy-server/src/test/java/org/eclipse/jetty/spdy/server/SynDataReplyDataLoadTest.java
	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/TooFastClientTest.java
 2015-03-06 15:57:52 -07:00
Greg Wilkins 9edd7c4b30 461070 Handle setReadListener on request with no content 2015-03-07 08:44:51 +11:00
Greg Wilkins f44bf8e368 460210 - ExecutionStragegy producer for SelectManager calls onOpen from produce method 
Further refactoring.   Handle the initial onDataAvailable and final onAllDataRead calls
specially, as they may need to be called without scheduling read interest.
 2015-02-25 10:47:09 +11:00
Greg Wilkins 5d6bb9f5d0 460210 - ExecutionStragegy producer for SelectManager calls onOpen from produce method 
Additional refactoring to better handle HttpInput state.   Moved the unready and read possible states into the HttpChannelState
 2015-02-23 23:06:23 +11:00
Greg Wilkins 4ed6069aa8 default to delayed dispatch 2015-02-05 14:54:13 +11:00
Greg Wilkins 7db7ef3020 Added test cases and improved isReady and isFinished handling 2015-02-05 14:26:34 +11:00
Greg Wilkins f6cfe07a69 added direct buffer configuration 2015-02-05 10:02:01 +11:00
Greg Wilkins 5e95caaf29 added test for async IO isNotReadyAtEOF 2015-02-04 13:15:01 +11:00
Greg Wilkins 47055dd2c8 added test for async IO isNotReadyAtEOF 2015-02-04 12:40:36 +11:00
Greg Wilkins 40ffac3339 Merge remote-tracking branch 'origin/jetty-9.2.x' 2015-02-04 12:35:34 +11:00
Greg Wilkins 44b3abc839 added test for async IO isNotReadyAtEOF 2015-02-04 12:35:04 +11:00
Greg Wilkins f5588c7ada Merge remote-tracking branch 'origin/jetty-9.2.x' 2015-02-04 11:44:43 +11:00
Greg Wilkins acbffecb60 added test for async IO isNotReadyAtEOF 2015-02-04 11:43:19 +11:00
Greg Wilkins 65b8872227 Merge remote-tracking branch 'origin/jetty-9.2.x' 2015-02-04 10:59:34 +11:00
Greg Wilkins be127ee0cf added test for async IO isNotReadyAtEOF 2015-02-04 10:58:57 +11:00
Greg Wilkins e1cc5fb487 Merge remote-tracking branch 'origin/master' into jetty-9.3-ewyk 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
	jetty-server/src/main/java/org/eclipse/jetty/server/QueuedHttpInput.java
	jetty-util/src/main/java/org/eclipse/jetty/util/thread/NonBlockingThread.java
 2015-01-08 15:21:01 +01:00
Joakim Erdfelt a3201a3c81 Happy New Year 2015 2015-01-07 17:06:59 -07:00
Joakim Erdfelt 6a0668b7a1 Happy New Year 2015 2015-01-07 17:03:30 -07:00
Greg Wilkins a4d2895400 removed unneeded execute for SslConnection onFillable 2015-01-02 15:24:14 +01:00
Greg Wilkins d161bdcb36 Merge remote-tracking branch 'origin/jetty-9.2.x' 
Conflicts:
	VERSION.txt
	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-server/pom.xml
	jetty-alpn/pom.xml
	jetty-annotations/pom.xml
	jetty-ant/pom.xml
	jetty-cdi/pom.xml
	jetty-client/pom.xml
	jetty-continuation/pom.xml
	jetty-deploy/pom.xml
	jetty-distribution/pom.xml
	jetty-fcgi/fcgi-client/pom.xml
	jetty-fcgi/fcgi-server/pom.xml
	jetty-fcgi/pom.xml
	jetty-http-spi/pom.xml
	jetty-http/pom.xml
	jetty-io/pom.xml
	jetty-jaas/pom.xml
	jetty-jaspi/pom.xml
	jetty-jmx/pom.xml
	jetty-jndi/pom.xml
	jetty-jsp/pom.xml
	jetty-jspc-maven-plugin/pom.xml
	jetty-maven-plugin/pom.xml
	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/jetty-osgi-npn/pom.xml
	jetty-osgi/pom.xml
	jetty-osgi/test-jetty-osgi-context/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-server/pom.xml
	jetty-servlet/pom.xml
	jetty-servlets/pom.xml
	jetty-spdy/pom.xml
	jetty-spdy/spdy-alpn-tests/pom.xml
	jetty-spdy/spdy-client/pom.xml
	jetty-spdy/spdy-core/pom.xml
	jetty-spdy/spdy-example-webapp/pom.xml
	jetty-spdy/spdy-http-client-transport/pom.xml
	jetty-spdy/spdy-http-common/pom.xml
	jetty-spdy/spdy-http-server/pom.xml
	jetty-spdy/spdy-npn-tests/pom.xml
	jetty-spdy/spdy-server/pom.xml
	jetty-spring/pom.xml
	jetty-start/pom.xml
	jetty-util-ajax/pom.xml
	jetty-util/pom.xml
	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-integration/pom.xml
	tests/test-loginservice/pom.xml
	tests/test-quickstart/pom.xml
	tests/test-sessions/pom.xml
	tests/test-sessions/test-hash-sessions/pom.xml
	tests/test-sessions/test-jdbc-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
 2014-12-11 13:50:21 +01:00
Simone Bordet d3763e0d1c 454157 - HttpInput.consumeAll spins if input is in async mode. 
Added additional check to test whether consumeAll() could actually
consume the content, and if not, abort the channel.
 2014-12-05 14:12:01 +01:00
Greg Wilkins 0f4a4cdac6 Merge remote-tracking branch 'origin/jetty-9.2.x' 
Conflicts:
	jetty-io/src/main/java/org/eclipse/jetty/io/FillInterest.java
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
 2014-12-05 08:11:54 +01:00
Greg Wilkins 07e87f0ecf 454157 abort to avoid spin in async HttpInput.consumeAll 2014-12-04 17:39:53 +01:00
Greg Wilkins a04a576c45 Merge remote-tracking branch 'origin/jetty-9.2.x' 2014-12-04 14:17:47 +01:00
Greg Wilkins 867feedca4 453629 Fixed big write test 2014-12-04 13:34:53 +01:00
Joakim Erdfelt d9d94ec1d2 Merge branch 'jetty-9.2.x' 
Conflicts:
	jetty-servlets/src/test/java/org/eclipse/jetty/server/handler/gzip/GzipContentLengthTest.java
	jetty-servlets/src/test/java/org/eclipse/jetty/server/handler/gzip/GzipTester.java
	jetty-servlets/src/test/resources/jetty-logging.properties
 2014-11-10 16:43:56 -07:00
Joakim Erdfelt b314bfcc94 446944 - ServletTester and HttpTester should be in <classifier>tests</classifier> 
Moving HttpTester to "tests" scoped jetty-http artifact.

 + HttpTester, a testing class, was used by jetty-servlets,
   embedded-jetty-examples, and test-integration, all from
   those testing scopes.  Moved the HttpTester into the
   pre-existing jetty-http "tests" classified artifact.

Moving ServletTester to "tests" scoped jetty-servlet artifact.

 + ServletTester, a testing class, was used by jetty-servlets,
   test-integration, and test-jetty-webapp.  This move puts
   this class in the pre-existing jetty-servlet "tests" classified
   artifact.
 2014-10-29 09:50:32 -07:00
Greg Wilkins 34a8da2ba2 445823 Moved RequestLog calling to HttpChannel 
Simplified the RequestLogHandler.  It no longer set's async listeners or tries to catch exeptions etc.
Instead it simply sets the RequestLog instance on the HttpChannel.   The HttpChannel#onCompleted method
then uses the log (if set) as the last thing before recycling the connection.  It uses the actual
bytes written (eg after compression) and the actual status sent (eg if sent from a bad message).
 2014-10-26 17:30:50 +11:00
Greg Wilkins 738c47bc55 447515 Remove GzipFilter 
Moved all usages of GzipFilter to GzipHandler
added support to ServerContextHandler to create a GzipHandler
 2014-10-24 08:17:05 +11:00
Greg Wilkins ec79a6f88e Improve HTTP header pre-encoding 
The HttpContent class has been reworked to store HttpField instances, we may be generated on
demand or instances of PreEncodedHttpField.

The encoding of HTTP2 fields has been generalized to handle both indexed and literal fields, selected
by header enum set.

Default servlet and response classes have been cleaned up in how they set response headers.
 2014-10-16 12:31:37 +11:00
Joakim Erdfelt dec984302a Merge branch 'jetty-9.2.x' 
Conflicts:
	jetty-server/src/test/java/org/eclipse/jetty/server/handler/RequestLogHandlerTest.java
 2014-10-10 16:14:06 -07:00
Joakim Erdfelt e7b86b99cb 445823 - RequestLogHandler at end of HandlerCollection doesn't work 
+ Adding more varieties of server side collection vs wrapper with error
  handlers
+ Adding servlet version of tests to demonstrate behavior in servlet
  context, when also using the mapped error handler
 2014-10-10 11:21:40 -07:00
Greg Wilkins bb2d77f00b Merge remote-tracking branch 'origin/jetty-9.2.x' 2014-10-10 14:20:30 +11:00
Greg Wilkins 6a0e220b9c 446506 getAsyncContext ISE before startAsync on async dispatches 2014-10-10 14:19:42 +11:00
Greg Wilkins d8e6331434 442477 Allow Symlink aliases by default 2014-08-27 17:33:27 +10:00
Greg Wilkins eaf374fa58 refactored Dispatcher for new HttpURI 2014-07-25 17:28:35 +10:00
Greg Wilkins fa3d7d0f7e Merge remote-tracking branch 'origin/master' into jetty-http2 
Conflicts:
	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextDispatchWithQueryStrings.java
 2014-07-23 16:53:13 +10:00
Greg Wilkins 3a6879d3e8 expanded tabs in indents 2014-07-23 16:49:05 +10:00
Greg Wilkins 7f62f2600b refactored URI handling 2014-07-20 10:23:47 +10:00
Greg Wilkins c72649e150 435653 encode async dispatched requestURI 2014-07-19 18:55:02 +10:00
Greg Wilkins a2a333ba53 435653 encode async dispatched requestURI 2014-07-17 15:51:22 +10:00
Jan Bartel 50f11bea09 439663 Allow mappings to be declared before servlet/filter 2014-07-16 15:53:07 +10:00
Greg Wilkins 55ca09a00e 438190 findbug improvements 2014-07-10 14:41:32 +10:00
Simone Bordet e4d6768901 434386 - Request Dispatcher extracts args and prevents asyncIO. 
Changed behavior of mergeQueryParameters() so that new query
parameters hide old query parameters, but they are accumulated for
getParameter() APIs.
 2014-05-12 13:08:28 +02:00
Simone Bordet ba4ed86e31 434386 - Request Dispatcher extracts args and prevents asyncIO. 
Avoid to read the content from within include() or forward(), therefore
making possible to proxy the content as-is to an upstream server.
 2014-05-12 10:57:13 +02:00
Greg Wilkins 1e8d8b8b3e 433572 default to sending date header 2014-04-28 14:50:58 +02:00
Joakim Erdfelt 718017af94 Minor tweak to throwable assertion to be more reliable 2014-04-25 12:36:08 -07:00
Greg Wilkins eade9a3d25 432901 ensure a single onError callback only in pending and unready states 2014-04-25 18:23:54 +02:00
Greg Wilkins 87c5b30d1c 432901 ensure a single onError callback only in pending and unready states 2014-04-25 17:26:43 +02:00
Greg Wilkins 8855b79be5 433431 Support ServletHandler fall through 2014-04-25 12:21:55 +02:00
Simone Bordet d90e6210bb 432777 - Async Write Loses Data with HTTPS Server. 
Fixed by properly flipping the aggregate buffer when copying bytes to it.
 2014-04-17 13:28:17 +02:00
Greg Wilkins 5c188e02b7 improved AsyncServletTest 2014-03-24 15:11:40 +11:00
Joakim Erdfelt c251d5789d Adding some getRequestURI tests to validate servlet behavior 2014-03-19 11:08:30 -07:00
Greg Wilkins af7dd4b99e increase large writes to try to always achieve !isReady 2014-03-13 10:53:00 +11:00
Joakim Erdfelt 0c8bdb650c cleaning up test 2014-03-10 12:31:44 -07:00
Greg Wilkins 84fa579ec7 429616 Use UTF-8 encoding for XML 2014-03-10 15:23:08 +11:00
Simone Bordet 5edf2799e9 Made test more robust. 
The response may arrive on client before the server notifies the
complete listeners, so the assert on client side was spuriously
failing to check the completion on server side.
 2014-02-06 11:27:22 +01:00
Greg Wilkins 7725056234 426750 isReady() returns true at EOF 2014-02-05 17:34:22 +11:00
Joakim Erdfelt a12fd9ea03 Happy New Year - 2014! 2014-01-02 14:50:14 -07:00
Jan Bartel dfe5889bc4 423361 Make all listeners injectable irrespective of method of declaration (descriptor, api, annotation) 2013-12-12 14:44:38 +11:00
Greg Wilkins 232ca134fc removed debug print from test 2013-12-02 18:49:23 +11:00
Greg Wilkins f1fc661a2c reenabled integration and RFC2616 tests 2013-11-29 17:33:05 +11:00
Greg Wilkins 51e82b4c5c 422807 fragment large written byte arrays to protect from JVM OOM bug 2013-11-29 14:28:07 +11:00
Greg Wilkins 8bda67b82d Merge remote-tracking branch 'origin/master' into jetty-9.1 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java
 2013-11-08 15:24:12 +11:00
Greg Wilkins 1d5635c76c 420776 complete error pages after startAsync 
handle complete and dispatch calls before the thrown exception

Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
	jetty-server/src/main/java/org/eclipse/jetty/server/AsyncContinuation.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextTest.java
 2013-11-08 15:08:01 +11:00
Greg Wilkins f567bddad9 global clean up imports 2013-11-04 13:48:03 +11:00
Greg Wilkins eb3bb660b5 Merge remote-tracking branch 'origin/master' into jetty-9.1 
Conflicts:
	jetty-client/src/main/java/org/eclipse/jetty/client/util/DigestAuthentication.java
	jetty-client/src/test/java/org/eclipse/jetty/client/HttpReceiverTest.java
	jetty-client/src/test/java/org/eclipse/jetty/client/HttpSenderTest.java
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpField.java
	jetty-server/src/test/java/org/eclipse/jetty/server/AbstractHttpTest.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/AbstractDoSFilterTest.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/HeadersBlockGenerator.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/HeadersBlockParser.java
	jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/ClientUpgradeRequest.java
	jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketFrame.java
	jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSession.java
	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/DeflateCompressionMethodTest.java
	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/PerMessageDeflateExtensionTest.java
 2013-11-03 18:22:09 +11:00
Mikhail Mazursky 6b0269a16d [Bug 420930] Use Charset to specify character encoding 
Signed-off-by: Mikhail Mazursky <mikhail.mazursky@gmail.com>
 2013-11-02 14:44:36 +06:00
Greg Wilkins 37ea88d299 fixed bad merge 2013-11-01 08:09:26 +11:00
Greg Wilkins c64dad6066 Merge remote-tracking branch 'origin/master' into jetty-9.1 
Conflicts:
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
 2013-10-31 14:40:54 +11:00
Greg Wilkins 466725e343 420776 complete error pages after startAsync 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextTest.java
 2013-10-31 14:16:34 +11:00
Greg Wilkins d6e301d7fd Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-10-24 16:02:35 +11:00
Greg Wilkins ac3787b167 420033 AsyncContext.onTimeout exceptions passed to onError 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
	jetty-server/src/main/java/org/eclipse/jetty/server/AsyncContinuation.java
	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextTest.java
 2013-10-24 15:33:08 +11:00
Greg Wilkins 353357e816 Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-10-23 11:28:55 +11:00
Greg Wilkins 55b279cc3d 420048 - DefaultServlet alias checks configured resourceBase 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
 2013-10-23 08:00:30 +11:00
Joakim Erdfelt d6d54e048b Merge branch 'master' into jetty-9.1 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ErrorPageErrorHandler.java
	jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/UpgradeConnection.java
	jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/WebSocketClientTest.java
	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/AnnotatedMaxMessageSizeTest.java
 2013-10-18 16:12:00 -07:00
Greg Wilkins b31466839a 419799 Async timeout dispatches to error page 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
	jetty-server/src/main/java/org/eclipse/jetty/server/AsyncContinuation.java
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ErrorHandler.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ErrorPageErrorHandler.java
	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextTest.java
 2013-10-18 14:50:01 +11:00
Greg Wilkins f3b393aa5d Refactored complexity out of HttpFields 
In preparation of merging Fields class and supporting HTTP/2.0 HPACK
 2013-10-17 21:35:11 +11:00
Greg Wilkins 7cb553557e 418636 Name anonymous filter and holders with classname-hashcode 
Conflicts:
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java
 2013-10-04 16:12:53 +10:00
Greg Wilkins 52752ae142 418636 Name anonymous filter and holders with classname-hashcode 
Conflicts:
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java
	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ErrorPageTest.java
 2013-10-04 16:10:47 +10:00
Joakim Erdfelt ac40e7ab6a Fixing various javadoc errors 2013-09-25 08:11:32 -07:00
Simone Bordet 0cdd884672 Merged branch 'master' into 'jetty-9.1'. 2013-08-21 22:20:11 +02:00
Simone Bordet 8951c4c773 Added tests for AsyncContext listeners behaviour. 2013-08-21 22:18:56 +02:00
Joakim Erdfelt 7fb7fe71ec Fixing malformed Javadoc warnings in jetty-servlet 2013-08-14 12:46:25 -07:00
Simone Bordet 0cc46e8beb 414891 - Errors thrown by ReadListener and WriteListener not handled correctly. 
Now correctly catching Throwable to handle all exception cases.
 2013-08-12 18:52:14 +02:00
Greg Wilkins d2c68bb4aa 412830 Error Page match ServletException then root cause 2013-08-08 12:22:28 +10:00
Greg Wilkins 8645849272 398467 Servlet 3.1 Non Blocking IO 
Added ByteBuffer write and improved test harnesses
 2013-07-18 12:53:07 +10:00
Greg Wilkins 4a49a5e3f0 398467 Servlet 3.1 Non Blocking IO 
Handle bad listeners
 2013-07-08 13:08:53 +10:00
Greg Wilkins 981102fda5 398467 Servlet 3.1 Non Blocking IO 
Asynchronous reads working.
 2013-07-05 18:11:09 +10:00
Greg Wilkins 965918d8f2 Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-07-04 17:28:57 +10:00
Greg Wilkins c33db24d94 Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/RequestLogHandler.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java
	tests/test-continuation/src/test/java/org/eclipse/jetty/continuation/ContinuationTest.java
 2013-07-04 15:00:47 +10:00
Jan Bartel d87df5d89e Merge remote-tracking branch 'origin/master' into servlet-3.1-api 2013-06-17 20:39:03 +10:00
Jan Bartel d47eb462e7 410693 ServletContextHandler.setHandler does not relink handlers 2013-06-17 16:53:22 +10:00
Greg Wilkins 4e4ffaa54c Merge remote-tracking branch 'origin/master' into servlet-3.1-api 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
 2013-06-17 16:29:39 +10:00
Jan Bartel 232eb4491a Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletContextHandler.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
	jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
 2013-06-17 13:13:59 +10:00
Greg Wilkins 2d661f18dd 410405 Avoid NPE for requestDispatcher(../) 
Test double encoded dot dot
 2013-06-11 15:30:40 +10:00
Greg Wilkins 2b1e6bf0de Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
	jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
	jetty-server/src/test/java/org/eclipse/jetty/server/HttpConnectionTest.java
 2013-06-11 15:11:23 +10:00
Greg Wilkins 9ec1378b73 fixed merge 2013-06-11 14:57:48 +10:00
Greg Wilkins ed04753111 410405 Avoid NPE for requestDispatcher(../) 2013-06-11 14:22:54 +10:00
Greg Wilkins f8e0764fa5 Merge remote-tracking branch 'origin/master' into servlet-3.1-api 2013-06-11 14:07:46 +10:00
Greg Wilkins 06d3fbe5aa Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-deploy/src/test/java/org/eclipse/jetty/deploy/providers/ScanningAppProviderRuntimeUpdatesTest.java
	tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/ReloadedSessionMissingClassTest.java
	tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/WebAppObjectInSessionTest.java
 2013-06-11 14:07:00 +10:00
Greg Wilkins d2794584e1 Merge remote-tracking branch 'origin/master' into servlet-3.1-api 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
	jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
 2013-06-07 15:48:22 +10:00
Simone Bordet e65e4e168d 409842 - Suspended request completed by a request thread does not set read interest. 
HttpConnection.completed() now performs the right check about the current connection.
 2013-06-05 11:34:12 +02:00
Joakim Erdfelt 3db9299369 Merge branch 'jetty-7' into jetty-8 2013-06-04 11:24:44 -07:00
Joakim Erdfelt 0c4a266d60 Fixing JDK5 test error with comparison of query string 2013-06-04 09:04:12 -07:00
Greg Wilkins ce662c7ddc 398467 Servlet 3.1 Non Blocking IO 
cleaned up test harness
 2013-05-28 23:29:38 +10:00
Greg Wilkins c7be106423 398467 Servlet 3.1 Non Blocking IO 
Working async writes after HttpChannelState refactor
 2013-05-25 15:45:16 +10:00
Greg Wilkins 94d1f4a020 398467 Servlet 3.1 Non Blocking IO 
Check point progress as I dispair at the insane complexity of servlet 3.1 specification
 2013-05-24 14:34:27 +10:00
Greg Wilkins 4dcc9b39fc 407614 added excludedMimeTypes to gzipFilter 2013-05-09 14:16:54 +10:00
Greg Wilkins 7955548d10 406390 Close if at END and content remaining 2013-04-29 14:01:11 +10:00
Greg Wilkins c3325e8b04 405530 Wrap AsyncContext to throw ISE after complete 2013-04-22 11:33:44 +10:00
Jan Bartel 0965ca62e2 404906 servlets with load-on-startup = 0 are not fired up on jetty 9 startup 2013-04-08 09:58:46 +10:00
Joakim Erdfelt 4d52c3ca8e 402984 - WebSocket Upgrade must honor case insensitive header fields in upgrade request 2013-03-19 11:28:23 -07:00
Greg Wilkins 11442814fa Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
 2013-03-11 17:23:54 +11:00
Greg Wilkins 97eec14651 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-03-11 12:47:10 +11:00
Greg Wilkins 59f8d375b9 402833 Test harness for global error page and hide exception message from reason string 2013-03-11 12:12:07 +11:00