Commit Graph

1808 Commits

Author SHA1 Message Date
Simone Bordet cec3694355 Consistently using BufferUtil, especially clearToFill() and
flipToFlush().
2016-02-29 16:31:38 +01:00
Jan Bartel 11d3448e28 Issue #81 Exception not always thrown in Jetty to application when upload part is too big
Issue #82 Request.getPart() that results in Exception still allows other parts to be fetched
2016-02-16 17:43:56 +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
Jan Bartel 1b7045babd 486394 Make old behaviour of MultiPartInputStreamParser configurable 2016-02-03 14:15:15 +01:00
Jan Bartel d151143556 Revert "486394 - MultipartConfig.fileSizeThreshold default of 0 should always create a file"
This reverts commit 734d18fb93.
2016-02-03 14:15:15 +01:00
Greg Wilkins 7ec6e2e899 486930 - Selector does not correctly handle rejected execution exception
Improved comments and unit test
2016-02-01 17:18:42 +01:00
Greg Wilkins c81dcfc790 486930 - Selector does not correctly handle rejected execution exception
This fix work in two ways:

1) Both the PEC and EPC strategies when confronted with a
RejectedExecutionException will continue to Produce rather than consume.

2) If a produced Runnable cannot be consumed and it supports the new Rejectable interface,
then it's reject() method is called by the producer thread.    Typically this is implemented
to close the connection - with the risk being that the close might block, but that is
probably better than leaking the connection?
2016-02-01 17:10:24 +01:00
Joakim Erdfelt 734d18fb93 486394 - MultipartConfig.fileSizeThreshold default of 0 should always create a file
+ Refactored fileSizeThreshold logic so that a configuration value of
   0 is always create file
   (negative) is never create file
   positive is tested against filesize
2016-01-22 14:07:51 -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 0a1b0b2bc6 485714 - Update SSL configuration to mitigate SLOTH vulnerability 2016-01-13 15:00:16 -07:00
Greg Wilkins 41329dccc4 Revert "485714 - Update SSL configuration to mitigate SLOTH vulnerability"
This reverts commit 46ed803023.
The fix broke several unit tests.
2016-01-13 15:38:27 +11:00
Greg Wilkins 46ed803023 485714 - Update SSL configuration to mitigate SLOTH vulnerability 2016-01-13 15:18:13 +11:00
Greg Wilkins e2a0794d91 485712 - Quickstart web.xml is absolute 2016-01-13 12:47:25 +11:00
Jan Bartel 75b84374e0 485031 two PathWatcher threads running after automatically restarting webapp 2016-01-09 10:27:33 +11:00
Simone Bordet f519aa28fb Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2016-01-05 11:40:57 +01:00
Simone Bordet 50100ca86d Fixed copyright blurbs. 2016-01-05 11:30:38 +01: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
Joakim Erdfelt 71150a939c javadoc fixes 2015-12-18 14:21:10 -07:00
Joakim Erdfelt 4a07503a09 Javadoc updates
Conflicts:
	jetty-util/src/main/java/org/eclipse/jetty/util/Loader.java
	jetty-util/src/main/java/org/eclipse/jetty/util/Promise.java
2015-12-18 11:06:15 -07: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 7c5bec1b48 Using Java 8 Predicate Function
+ Removing jetty-util (java 7) holdover Predicate.java
+ Converting use to (java 8) java.util.function.Predicate
2015-12-17 10:15: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 6e0ad429d9 484350 - Allow GzipHandler path include/exclude to use regex
+ Overhauled IncludeExclude to use java 8 predicate
+ Introduced PathSpecSet to standardize path IncludeExclude
+ GzipHandler now uses PathSpecSet for paths

Conflicts:
	jetty-http/src/main/java/org/eclipse/jetty/http/PathMap.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
2015-12-15 15:23:29 -07:00
Joakim Erdfelt 5e3fbbccd0 Backporting GzipHandler's IncludeExclude configs 2015-12-08 15:51:25 -07:00
Joakim Erdfelt 7cdc58e6b9 Merge branch 'jetty-9.2.x' into feature/gziphandler-config 2015-12-08 14:56:26 -07:00
Greg Wilkins 3527c6a71b StringUtil.csvSplit(String)
Conflicts:
	jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/AbstractJettyMojo.java
	jetty-security/src/main/java/org/eclipse/jetty/security/PropertyUserStore.java
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/PushCacheFilter.java
	jetty-util/src/main/java/org/eclipse/jetty/util/StringUtil.java
	jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java
2015-12-08 14:54:33 -07:00
Simone Bordet 8d6206b8c7 Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2015-12-08 22:20:05 +01:00
Simone Bordet 1693dd135d 483857 - jetty-client onComplete isn't called in case of exception in GZIPContentDecoder.
Fixed by catching the exceptions and failing the callbacks.

Also using return values from HttpReceiver to compute what to
return to the parser.
2015-12-08 22:10:27 +01:00
Joakim Erdfelt 6d3d912b0b 483413 - Warn on @Deprecated servlet/filter use 2015-12-01 16:18:00 -07:00
Joakim Erdfelt 481102db30 483413 - Warn on @Deprecated servlet/filter use 2015-12-01 15:53:46 -07:00
Joakim Erdfelt edf686fe0a Updating to version 9.3.7-SNAPSHOT 2015-11-06 12:13:00 -07:00
Joakim Erdfelt d737e1c638 Updating to version 9.3.6.v20151106 2015-11-06 11:09:32 -07:00
Joakim Erdfelt ec8f8d3e4f Updating to version 9.2.15-SNAPSHOT 2015-11-06 11:06:48 -07:00
Joakim Erdfelt ecba378f5c Updating to version 9.2.14.v20151106 2015-11-06 10:32:14 -07:00
Simone Bordet 487d0f2d5c 480764 - Error parsing empty multipart.
Fixed by checking the presence of the last boundary as the first line.
2015-10-27 15:29:56 +01:00
Greg Wilkins 570c751ec8 479179 Fixed NPE from debug 2015-10-17 09:37:43 +11:00
Joakim Erdfelt dde32787c4 Updating to version 9.3.6-SNAPSHOT 2015-10-12 15:47:37 -07:00
Joakim Erdfelt 29722bd880 Updating to version 9.3.5.v20151012 2015-10-12 15:10:39 -07:00
Joakim Erdfelt 2cce7510e1 Updating to 9.3.5-SNAPSHOT 2015-10-08 17:49:09 -07:00
Joakim Erdfelt 37296bec3c Updating to version 9.3.4.v20151007 2015-10-07 14:58:38 -07:00
Greg Wilkins 540b33e64c 478372 - JavaUtilLog setSourceClass and setSourceMethod
Log ignored only if log level is all
turn off java util logging in embedded examples
2015-09-30 16:24:11 +10:00
Jan Bartel 697b0cccf2 477895 Prevent leak of handles to deleted files after redeploy 2015-09-30 13:39:31 +10:00
Simone Bordet 3dcdb9f802 Merged branch '477878' into 'master'. 2015-09-25 19:34:45 +02:00
Simone Bordet 6544af8ce7 Improved IllegalStateException message. 2015-09-25 19:24:32 +02:00
Greg Wilkins 007ac4a9dd 478372 - JavaUtilLog setSourceClass and setSourceMethod
Added some additional features to configure the java.util.logging mechansim
2015-09-25 14:08:31 +10:00
Greg Wilkins dcb4c0d0a8 478372 - JavaUtilLog setSourceClass and setSourceMethod 2015-09-25 12:45:46 +10:00
Greg Wilkins 46a611caac 476720 getTrustStoreResource fixed 2015-09-24 17:26:01 +10:00