Commit Graph

3788 Commits

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

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

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

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

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-04-17 19:07:20 +10:00
Simone Bordet 7629a8f98f
Fixes #2425 - Review BufferUtil.isMappedBuffer(). (#2432)
Now explicitly using a _mappedBuffer field in
CachedContentFactory.CachedHttpContent.
Deprecated BufferUtil.isMappedBuffer().

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-04-12 10:36:57 +02:00
Simone Bordet b09760ca9a Code cleanups.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-04-11 15:05:58 +02:00
Steve Bolton 6abf026440 Issue #1785 If only connector in vhost and not connector in request then fail to match
Signed-off-by: Steve Bolton <steve@boltn.com>
2018-04-07 17:25:40 -04:00
Steve Bolton c79b0f4e2a Issue #1785 Update Javadoc
Signed-off-by: Steve Bolton <steve@boltn.com>
2018-04-07 14:51:28 -04:00
Steve Bolton a30ed56ac1 Issue #1785 Added vhost@connectorname format for AND behaviour
Signed-off-by: Steve Bolton <steve@boltn.com>
2018-04-07 13:56:45 -04:00
Lachlan Roberts 92f44389b9 fixed value of public static String __MULTIPARTS
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-04-04 12:00:11 +10:00
Lachlan Roberts 4a0e4294b9 fixed path of MultiPartFormDataCompliance in jetty.xml
added some debug info
changes to jetty test webapp to display parts from multi-part forms

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-04-04 11:18:57 +10:00
Greg Wilkins 9397ae2d77 revert ResourceHandlerTest changes
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-04-04 09:10:57 +10:00
Lachlan Roberts 81ff77108c Moved the MultiParts interface and implementations from Request into new file MultiParts.java
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-04-03 23:55:08 +10:00
Lachlan Roberts 1eec234336 Minor changes after review by gregw.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-04-03 21:22:16 +10:00
Lachlan Roberts b3d5333d42 Implemented switch between LEGACY and RFC7578 modes. Added tests to check this worked correctly.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-04-03 16:13:19 +10:00
Lachlan Roberts 95cd6e0614 Merge remote-tracking branch 'eclipse/jetty-9.4.x-1027-Multipart' into jetty-9.4.x-1027-Multipart
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-04-03 15:33:56 +10:00
Lachlan Roberts 13b15e3566 Resolved Charset Issues and Reworked Request.MultiPartInputStream
Changed Request.MultiPartInputStream to an interface called MultiParts where there is an implementation for both the HTTP and UTIL parsers.

Resolved some issues with default charsets in regards to request.setCharacterEncoding and the _charset_ part for issue #2398.

Changed HTTP parser to operate the same as UTIL parser in situtions with parts not of type form-data or without name field. HTTP parser was ignoring these parts, UTIL parser was throwing exceptions.

Replaced the context attribute with a field in MultiParts.

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-04-03 15:24:54 +10:00
Greg Wilkins 48edc7305b Merge remote-tracking branch 'lachlan/jetty-9.4.x-1027-Multipart' into jetty-9.4.x-1027-Multipart 2018-04-03 14:12:19 +10:00
Lachlan Roberts be2d6ebb29 Merge remote-tracking branch 'eclipse/jetty-9.4.x' into jetty-9.4.x-1027-Multipart 2018-04-03 12:36:54 +10:00
Greg Wilkins 87498220bc Added a multipart form-data compliance configuration
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-04-03 10:49:03 +10:00
Lachlan Roberts b196596055 Replaced usages of MultiPartInputStreamParser to Request.MultiPartInputStream which provides runtime switching between old and new parser.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-03-30 19:16:59 +11:00
Lachlan Roberts c418297db6 Minor cleanups
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2018-03-29 18:04:42 +11:00
Simone Bordet d68c286499 Fixes #2145 - Enabled h2, http/1.1 + https failed with invalid preface.
Now using HttpVersion.HTTP_1_1::is, which is case insensitive,
to find the default protocol among the negotiated protocols.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-03-28 19:55:58 +02:00
Joakim Erdfelt 464b74ed60
Merge pull request #2385 from eclipse/jetty-9.4.x-issue-987-gzipcheck-disable
Issue #987 - move checkGzExists default to false
2018-03-28 07:13:41 -05:00
Jan Bartel b4e400f236 Jetty 9.4.x 2231 refactor session tests (#2382)
* Issue #2231 WIP

* Issue #2231 Add tests for FileSessionDataStore and MongoSessionDataStore.

* Issue #2231 create unit tests for every SessionDataStore

Signed-off-by: Jan Bartel <janb@webtide.com>

* Issue #2231 Refactor session tests

Signed-off-by: Jan Bartel <janb@webtide.com>

* Issue #2231 Refactor and cleanup session tests.

Signed-off-by: Jan Bartel <janb@webtide.com>

* hazelcast tests faster

Signed-off-by: olivier lamy <olamy@webtide.com>

* make hazelcasts tests even faster

Signed-off-by: olivier lamy <olamy@webtide.com>

* cleanup comments

Signed-off-by: olivier lamy <olamy@webtide.com>

* run mongodb test in embdedded mode

Signed-off-by: olivier lamy <olamy@webtide.com>

* mongodb embedded test enabled per default

Signed-off-by: olivier lamy <olamy@webtide.com>

* Issue #2231 more session tests

Signed-off-by: Jan Bartel <janb@webtide.com>

* fix mongodb embedded tests

Signed-off-by: olivier lamy <olamy@webtide.com>

* cleanup code

Signed-off-by: olivier lamy <olamy@webtide.com>

* use Logger rather than System.err.println

Signed-off-by: olivier lamy <olamy@webtide.com>

* Issue #2231 Add test for DefaultSessionCache

Signed-off-by: Jan Bartel <janb@webtide.com>

* Issue #2231 Redisable mongo tests by default.

Signed-off-by: Jan Bartel <janb@webtide.com>

* fix issue with empty local repo build

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

* jenkins should run mongodb tests

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

* build this plugin last so we should not hit the maven invoker plugin

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

* build test first for this one

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

* use invoker plugin 3.0.2-SNAPSHOT as there is a fix for https://issues.apache.org/jira/browse/MINVOKER-191

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

* temporary use of apache snapshots repository because of maven-invoker-plugin 3.0.2-SNAPSHOT

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2018-03-28 20:14:15 +10:00
Joakim Erdfelt 23788dba65 Issue #987 - move checkGzExists default to false
+ Flag existing methods / fields as deprecated
+ Indicate removal in Jetty 10.x

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-03-27 12:37:12 -05:00
Greg Wilkins 2cc26f0e71 Merge branch 'jetty-9.4.x' into jetty-9.4.x-1027-Multipart 2018-03-23 09:34:52 +11:00
Joakim Erdfelt c0dcf9a0a2 Issue #1027 - multipart testing examples
Adding raw/binary gitattributes

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-03-21 18:07:30 -05:00
Joakim Erdfelt c3cc138a3b Updating to version 9.4.10-SNAPSHOT 2018-03-20 08:25:59 -05:00
Joakim Erdfelt 1f8159b1e4 Updating to version 9.4.9.v20180320 2018-03-20 07:18:24 -05:00
Joakim Erdfelt 44d718417a Fixing #2346 - missing exception stacktrace
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-03-16 15:27:37 -05:00
Joakim Erdfelt e7b411b90d Fixing #361 - javadoc update/cleanup for GzipHandler
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-03-16 14:55:03 -05:00
WalkerWatch 534b8ea38b Add edit warning for .mod files. Resolves #173 2018-03-15 13:23:42 -04:00
Greg Wilkins 1da19dc2fd
[WIP!] HTTP Close #1832 (#2338)
* Only close if parser closed and output is shutdown

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

* a better possible fix

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

* after review

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-03-15 23:12:58 +11:00
Greg Wilkins 4ce7e9591b Safer simpler version parsing #2284
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-03-15 22:49:20 +11:00
Greg Wilkins ed907f8ed9 more generous test times
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-03-14 16:05:16 +11:00
Joakim Erdfelt f34f23f20f
Merge pull request #2320 from eclipse/jetty-9.4.x-issue-2307-null-charencoding
Issue #2307 - On sendError() the response character encoding is null
2018-03-13 18:56:18 -05:00
Greg Wilkins a634b571b3 Improved include handling of trailing / #2275
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2018-03-14 08:42:21 +11:00
Simone Bordet 9338aa171d
Merge pull request #2321 from eclipse/jetty-9.4.x-2318-bad_message_handling
Fixes #2318 - HttpParser.Listener.onBadMessage() should take BadMessageException
2018-03-13 09:36:36 +01: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
Joakim Erdfelt dcfa6f0f38 Issue #2307 - applying changes from review
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-03-12 17:34:12 -05:00
Joakim Erdfelt d3120ee212 Issue #2307 - On sendError() the response character encoding is null
+ Added testcase to replicate
+ Making character encoding from unset during sendError

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2018-03-12 14:29:36 -05:00
Simone Bordet 8b391a88dd Fixes #2318 - HttpParser.Listener.onBadMessage() should take BadMessageException.
Changed the signature of HttpParser.Listener.onBadMessage()
to take a BadMessageException and updated dependent code.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2018-03-12 19:51:57 +01:00