Commit Graph

2138 Commits

Author SHA1 Message Date
Greg Wilkins c6436c34ad Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-11-03 16:56:21 +11:00
Greg Wilkins 3dc2637d21 Issue #1063 Accept empty host 2016-11-03 15:06:32 +11:00
Jan Bartel 7790234589 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-11-02 15:42:03 +11:00
Jan Bartel ca882c8dee Issue #240
No error if no parts because input stream already consumed.
2016-11-02 15:40:59 +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
Jan Bartel da853574f6 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-10-28 14:41:37 +11:00
Jan Bartel 6f6ccdf061 480764 Add extra tests for empty multipart. 2016-10-28 14:41:05 +11:00
Simone Bordet c6ad87c3f9 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-10-27 16:55:12 +02:00
Simone Bordet 8cefaba2a4 Allow process() to throw Throwable, which we catch anyway. 2016-10-27 15:43:12 +02:00
Greg Wilkins 726fcd814c fixed simple-impl naming #1023 2016-10-22 10:56:50 +11:00
Greg Wilkins 9569ff64c9 removed unnecessary dependency #1020 2016-10-22 10:34:14 +11:00
Greg Wilkins 97470c4736 Overlay directories for modules #1013
Implemented overlay directories for modules.
Implemented by extending the basehome initializer to be able to handle
directory to directory copies, with a default of jetty.base if no location
is specified.
2016-10-20 17:44:39 +11:00
Greg Wilkins d7b781574d Improve logging modules and listing #984
All logging modules log to stderr
2016-10-20 10:57:56 +11:00
Greg Wilkins 1706c6d9ed Improve logging modules and listing #984
Do not support JCL as a logging mechanism.  Only support jcl-slf4j binding
2016-10-20 10:57:56 +11:00
Greg Wilkins 6bc8717053 Improve logging modules and listing #984
Trim provider list and accept as default if only 1 available
2016-10-20 10:06:52 +11:00
Joakim Erdfelt 4dfd3fad73 Fixing log4j.properties -> log4j.xml 2016-10-19 14:24:54 -07:00
Joakim Erdfelt 15d00767a5 Using ${jetty.logging.dir} consistently 2016-10-19 14:23:54 -07:00
Joakim Erdfelt d9054d24b3 Issue #984 - minor cleanup, consistency across all modules
+ Also correcting filename jcl-simple-impl.mod
2016-10-19 10:25:44 -07:00
Simone Bordet d07d78066e Moved console-capture.xml from modules/console-capture/ to etc/.
This is needed to ease migrations from Jetty 9.3.x, that otherwise
won't be able to find that file.
Furthermore, it's a file that will be rarely modified, since it can
be tuned via properties in start.ini.
Finally, it needs to be in etc/ if it is to be referenced by jetty.conf.
2016-10-19 16:01:16 +02:00
Simone Bordet ae240b9c17 Fixed properties in *.mod and *.xml for module console-capture. 2016-10-19 11:44:13 +02:00
Greg Wilkins 631437060b Improve logging modules and listing #984
Improved logging dependencies
2016-10-19 17:29:39 +11:00
Greg Wilkins a32923b66e Improve logging modules and listing #984
added jul-slf4j
updated logging dependencies
2016-10-19 16:25:18 +11:00
Greg Wilkins 08be6aca91 Improve logging modules and listing #984
renamed simple implementation modules.
2016-10-19 16:25:18 +11:00
Greg Wilkins 7bbfd618e3 Improve logging modules and listing #984
Used the term 'logging binding' instead of 'logging bridge'
2016-10-19 16:25:18 +11:00
Greg Wilkins 9cdfdf34a7 Improve logging modules and listing #984
renamed stderout-capture to console-capture
2016-10-19 16:25:18 +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
Greg Wilkins b11757a1e2 Issue #984 Improve module listing
Fixed cycle in logging from gcloud datastore
2016-10-14 15:42:12 +11:00
Greg Wilkins d9c2352966 Issue #984 Improve module listing
improved logging of file copies
renamed stderrout-logging to stderrout-capture
2016-10-14 10:17:39 +11:00
Greg Wilkins 91f708b9f6 Issue #984 Improve module listing
Use stderrout-logging for jcl-impl
2016-10-14 08:26:41 +11:00
Greg Wilkins cfed44fa7d Issue #984 Improve module listing
Made jul-impl a dependency of logging-jul
2016-10-14 08:18:15 +11:00
Greg Wilkins fa3603a739 Issue #984 Improve module listing
Logback file handler
2016-10-13 16:37:24 +11:00
Greg Wilkins 0966036fbc Issue #984 Improve module listing
Fixed server classes property
2016-10-13 16:37:24 +11:00
Greg Wilkins d5a4f0f6d4 Issue #984 Improve module listing
Simplified start.jar ini mechanism
updated logging modules to have file handlers
2016-10-13 16:37:24 +11:00
Greg Wilkins 0142bcde8f Issue #984 Improve module listing
renamed verbose to internal module tag
2016-10-07 20:27:38 +11:00
Greg Wilkins d8b1c88abc Issue #984 Improve module listing
Reworked logging modules
added support for ,= and += properties
2016-10-07 12:48:47 +11:00
Greg Wilkins 539a209bef Issue #984 Improve module listing
added verbose tags
2016-10-06 19:16:23 +11:00
Greg Wilkins 91e9e7b76a Issue #984 Improve module listing 2016-10-06 17:01:08 +11:00
Greg Wilkins afb750515e Issue #963 Location based classpath pattern (#978)
Issue #963 location based white/black classpath lists
- removed outdated annotations/ClassNameResolver
- implemented loadedFrom in TypeUtil
- created a growable Trie
- reimplemented classpathpattern
- simplified OSGi classloading
2016-10-06 10:47:09 +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 285f283e5b Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-09-30 18:09:58 +02:00
Simone Bordet 38d48395b0 Issue #918 - Support certificates hot reload.
Introduced SslContextFactory.reload(Consumer) to perform atomic
reload of SslContextFactory.
2016-09-30 17:48:09 +02:00
Simone Bordet 7471f5c8f2 Code cleanup. 2016-09-30 17:47:52 +02:00
Simone Bordet 7e376fd9da Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-09-28 11:53:54 +02:00
Simone Bordet 0f97c3df5d Fixes #966 - Remove usages of ConcurrentArrayQueue. 2016-09-28 11:40:39 +02:00
Simone Bordet efe339e246 Code cleanup. 2016-09-28 11:40:39 +02:00
Joakim Erdfelt b0880f617a Merge branch 'release-9.3.12' into jetty-9.3.x 2016-09-20 14:39:08 -07: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 1f4bb58ef4 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-09-15 12:17:33 +02:00
Simone Bordet 01e29aa45a Fixes #870 - TLS protocol exclusion broken for SslContextFactory(String).
Introduced a private constructor that performs the correct
initialization, and have the other constructors delegate to it.
2016-09-15 12:11:11 +02:00
Simone Bordet 9e01565344 Code cleanups. 2016-09-15 12:11:11 +02:00
Simone Bordet 5ec60a30ed Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-09-14 16:44:39 +02:00
Simone Bordet 571b0c74c5 Implemented PromiseWrapper's succeeded() and failed() methods. 2016-09-14 14:01:30 +02:00
Greg Wilkins 3cd52fda04 Issue #572 Javadoc 2016-09-09 14:11:16 +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 f703d2ad38 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-09-08 10:39:27 +10:00
Greg Wilkins 3a42455411 Merge remote-tracking branch 'origin/jetty-9.2.x' into jetty-9.3.x 2016-09-08 10:38:54 +10:00
Greg Wilkins ada58ea65a javadoc 2016-09-08 10:35:57 +10:00
Greg Wilkins 28ca70378e Issue #844 Thread Limit Handler (#857)
* Issue #844 DoS Handler

First cut at implementation of Thread limiting handler for #844

* Added modules, simplified API, added IP exemptions

* fixed xml

* fixed preallocation

* simplified code
2016-09-08 08:49:03 +10:00
Simone Bordet e21ad09e3a Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-09-05 23:09:12 +02:00
Simone Bordet 89b20b4692 Merged branch 'jetty-9.3.x-845'. 2016-09-05 21:36:04 +02:00
Simone Bordet 705a68dfc4 Issue #845 - Improve blocking IO for data rate limiting.
Moved tests to run HTTP and HTTP/2 tests, and added more test cases.
2016-09-05 19:13:05 +02:00
Jan Bartel 0d6667dc9f Issue #894 2016-09-02 13:50:25 +10:00
Greg Wilkins 095a71f11d Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-09-01 17:39:08 +10:00
Greg Wilkins aeeab8d5bb Merge remote-tracking branch 'origin/jetty-9.2.x' into jetty-9.3.x 2016-09-01 17:38:40 +10:00
Greg Wilkins d43b9af428 fix javadoc 2016-09-01 17:38:09 +10:00
Greg Wilkins 718c8e2444 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-09-01 16:44:03 +10:00
Greg Wilkins a799b21eb3 fixed merge 2016-09-01 16:41:49 +10:00
Greg Wilkins c2621bcad6 Merge remote-tracking branch 'origin/jetty-9.2.x' into jetty-9.3.x 2016-09-01 16:29:00 +10:00
Greg Wilkins f7c32c5fc7 Issue #882 IPv6 map
The new IPv6 capable InetAddressSet has been added as an alternative for IPAddressMap
The IncludeExclude class has been generalized to IncludeExcludeSet that can have a different
Predicate type to the set type and this works well with InetAddressSet.

However for #881 and #883, this may not be enough and Map semantics may need to be added.

The IPAccessHandler also has path mappings supported, which could need the map semantics, so for now a new InetAccessHandler has been
added that just uses an IncludeExcludeSet<InetAddressSet>, but this has yet to be tested.

The AbstractProxyServlet uses a host:port combinations, so IncludeExcludeSet<InetAddressSet> is not directly applicable.
2016-09-01 16:12:35 +10:00
Greg Wilkins 5ab9846ac5 Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-08-31 20:32:54 +10:00
Simone Bordet e0c83757aa Fixes #889 - ConstantThrowable.name can be removed. 2016-08-31 12:25:19 +02:00
Greg Wilkins f856107301 Merge remote-tracking branch 'origin/jetty-9.2.x' into jetty-9.3.x 2016-08-31 19:05:57 +10:00
Greg Wilkins 0155ae761c Issue #880 Improve IPv6 support
For #880 added the HostPort class, which was used to fix #878, #879, #884 and #886
2016-08-31 16:46:11 +10:00
Jan Bartel 088f19704a Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-08-31 16:30:00 +10:00
Jan Bartel 34d465555b Merge remote-tracking branch 'origin/jetty-9.2.x' into jetty-9.3.x 2016-08-31 16:23:06 +10:00
Grzegorz Grzybek b70f0fdf15 Issue #868 - Use static Throwables without backtrace/stackTrace
Signed-off-by: Grzegorz Grzybek <gr.grzybek@gmail.com>
2016-08-26 10:44:23 +02:00
Simone Bordet 8de4751c6f Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-08-19 01:47:41 +02:00
Simone Bordet b316148625 Fixed test failure. 2016-08-19 01:44:14 +02:00
Joakim Erdfelt 196f5eeb96 Merge branch 'jetty-9.3.x' into jetty-9.4.x 2016-08-18 14:30:48 -07:00
Joakim Erdfelt 24b4aeb147 Fixes #854 - other testcase triggers ISE on .destroy() -> .start() as well 2016-08-18 14:30:11 -07:00
Simone Bordet 66c3603050 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2016-08-18 15:47:41 +02:00
Simone Bordet 10f994a0a2 Fixes #854 - If container.destroy() is called, calling container.start() again should throw an IllegalStateException. 2016-08-18 15:47:06 +02:00
Simone Bordet 7a7d5e2f1e Code cleanup. 2016-08-18 15:47:06 +02:00
Simone Bordet deef53467d Fixes #855 - JMXify MBeanContainer. 2016-08-17 21:44:35 +02:00
Simone Bordet 00a065b064 Fixes #855 - JMXify MBeanContainer. 2016-08-17 21:28:19 +02:00
Simone Bordet 1a88dfa8c0 Code cleanups. 2016-08-08 23:22:51 +02:00
Greg Wilkins 5cb50e5f5d ignore PathResource test 2016-08-04 14:02:16 +10:00
Greg Wilkins d0101dc81a Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-08-03 18:01:42 +10:00
Greg Wilkins a1885afff8 fix #804 by removing old javadoc reference to org.eclipse.jetty.util.URI.charset 2016-08-03 09:17:15 +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 1f949d509b Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2016-07-28 18:18:11 +10:00
Greg Wilkins 35c21d7ced Utility improvements
Add Arrays
XML config get class
2016-07-28 16:50:12 +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