Jan Bartel
ca2d37b31e
484822 Jetty ThreadMonitor memory leak
2015-12-23 14:15:25 +11:00
Simone Bordet
3fb354f884
Merged branch 'jetty-9.3.x' into 'master'.
2015-12-21 13:02:04 +01:00
Simone Bordet
8f4cc73613
484585 - Avoid sending request using a connection that is idle timing out.
...
Rewritten handling of idle timeouts in light of issue #484718 .
2015-12-21 11:47:05 +01:00
Simone Bordet
35c4c24099
484718 - Review idle timeout handling.
...
Introduced Connection.onIdleExpired().
2015-12-21 11:47:05 +01:00
Simone Bordet
bcd282a8dd
Updated javadocs and added missing removeListener() method.
2015-12-21 11:47:05 +01:00
Joakim Erdfelt
22f9c9826d
Javadoc fixes
2015-12-19 12:46:52 -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
Joakim Erdfelt
24b9d39c0f
Javadoc updates
2015-12-18 11:02:32 -07:00
Joakim Erdfelt
47eb7f02a9
437786 - SslContextFactory: Allow Password.getPassword to be overridden
...
+ Allowing password management in SslContextFactory to be overridden
with new methods .newPassword(String pw) and .getPassword(String realm)
2015-12-18 10:44:49 -07:00
Simone Bordet
aa46a51b33
Added factory method to create HTTP2Client.
2015-12-18 15:57:26 +01:00
Simone Bordet
988e596c71
484585 - Avoid sending request using a connection that is idle timing out.
...
Added guard to avoid that the idle timeout expires just before
sending the request.
Reworked the way idle timeouts are handled, to support the case where
the idle timeout just expired and the request can be tried on a
different connection/channel.
2015-12-18 15:56:31 +01:00
Simone Bordet
0713c17cfa
484683 - FastCGI request idle timeout is handled incorrectly.
...
Added required calls to notIdle() in request/response events, and
fixed the semantic of isOpen().
2015-12-18 15:56:31 +01:00
Simone Bordet
4eef2a347f
Added factory method to create the HttpChannel.
2015-12-18 15:56:31 +01:00
Greg Wilkins
cdfa515ca3
484624 Disable CachingWebAppClassLoader
2015-12-18 14:41:19 +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
Jan Bartel
316a2e8661
484603 HashLoginService does not stop its PropertyUserStore
2015-12-18 12:35:42 +11:00
Jan Bartel
ecbfe7c1d0
484603 HashLoginService does not stop its PropertyUserStore
2015-12-18 11:52:56 +11:00
Joakim Erdfelt
e0ea078db2
Merge branch 'jetty-9.3.x'
2015-12-17 16:16:04 -07:00
Joakim Erdfelt
88945478f7
Merge branch 'jetty-9.2.x' into jetty-9.3.x
2015-12-17 16:15:49 -07:00
Joakim Erdfelt
1543601968
484612 - Restore WebSocket Session.close() sending 1000/Normal status code
2015-12-17 16:15:06 -07:00
Joakim Erdfelt
60d09bc958
Merge branch 'jetty-9.3.x'
2015-12-17 15:32:59 -07:00
Joakim Erdfelt
9908910c3b
Merge branch 'jetty-9.2.x' into jetty-9.3.x
2015-12-17 15:32:43 -07:00
Joakim Erdfelt
5f27a62aae
484397 - Unavoidable NullPointerException in onMessage-Handler for PongMessages
2015-12-17 15:31:50 -07: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
3bec195d08
484440 - Swap WebSocket PathMappings for new jetty-http PathMappings
...
+ Deprecated jetty-server ServletPathSpec and RegexPathSpec
+ Moved all other code to using new jetty-http versions
2015-12-17 11:42:27 -07: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
e6901b2646
484349 - Promote WebSocket PathMappings / PathSpec to Jetty Http
...
+ More testing, more improvements
2015-12-16 11:06:17 -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
Greg Wilkins
96e4d720df
Merge remote-tracking branch 'origin/jetty-9.3.x'
2015-12-16 09:25:20 +11: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
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
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
Joakim Erdfelt
a52a182369
484349 - Promote WebSocket PathMappings / PathSpec to Jetty Http
...
+ Moving PathMappings from jetty-websocket to jetty-http
+ Renaming WebSocketPathSpec to UriTemplatePathSpec
+ Improving implementation with knowledge gained from PathMap
and PathMapTest cases.
2015-12-15 13:57:01 -07:00
Simone Bordet
ca6eaafdbf
Merged branch 'jetty-9.3.x' into 'master'.
2015-12-15 15:42:36 +01:00
Simone Bordet
717fc7819d
484262 - Race condition between GOAWAY disconnect and ability to make new request.
...
Fixed by making sure that when a peer received a GOAWAY frame, it
does not also notify the onFailure() callback.
2015-12-15 15:35:04 +01:00
Simone Bordet
d4d9ceea86
Improved toString().
2015-12-15 14:11:56 +01:00
Joakim Erdfelt
b6df9508c6
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
2015-12-14 14:58:12 -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
dddba5b004
484349 - Promote WebSocket PathMappings / PathSpec to Jetty Http
...
+ Moving PathMappings from jetty-websocket to jetty-http
+ Renaming WebSocketPathSpec to UriTemplatePathSpec
+ Improving implementation with knowledge gained from PathMap
and PathMapTest cases.
2015-12-14 11:17:31 -07:00
Simone Bordet
4ce3882ae2
Merged branch 'jetty-9.3.x' into 'master'.
2015-12-14 15:02:04 +01:00
Simone Bordet
bf9f39dc17
Improved exception reporting.
2015-12-14 15:00:19 +01:00
Simone Bordet
829bdd3d7c
Merged branch 'jetty-9.3.x' into 'master'.
2015-12-11 21:39:03 +01:00
Simone Bordet
8d28be5786
484210 - HttpClient over HTTP/2 should honor maxConcurrentStreams.
...
Fixed by sending queued requests in a loop up to maxConcurrentStreams.
Also updating the maxConcurrentStreams value when received from the
server.
2015-12-11 18:00:48 +01:00
Simone Bordet
e674d3ec5e
483878 - Parallel requests stuck via the http client transport over HTTP/2.
2015-12-11 17:58:31 +01:00