3095 Commits

Author SHA1 Message Date
Joakim Erdfelt
c0b191119b Updating to version 9.3.7.v20160115 2016-01-15 16:40:15 -07:00
Greg Wilkins
d41c0bba65 471171 - Support SYNC_FLUSH in GzipHandler 2016-01-15 14:27:09 +11:00
Greg Wilkins
c5cbc64e77 Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-01-14 11:00:06 +11:00
Joakim Erdfelt
0a1b0b2bc6 485714 - Update SSL configuration to mitigate SLOTH vulnerability 2016-01-13 15:00:16 -07:00
Joakim Erdfelt
30308f2316 Javadoc updates 2016-01-13 07:25:15 -07:00
Greg Wilkins
b26a390ee1 Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-01-08 11:39:43 +11:00
Greg Wilkins
35134e2d05 485376 unit test 2016-01-08 11:38:06 +11:00
Jan Bartel
aa932d2b96 485064 HashSessionManager leaks ScheduledExecutorScheduler with reference to un-deployed webapp 2016-01-06 11:23:15 +11:00
Jan Bartel
913ef1a39a 485064 HashSessionManager leaks ScheduledExecutorScheduler with reference to un-deployed webapp 2016-01-06 11:22:18 +11:00
Joakim Erdfelt
4032b8579a Happy New Year 2016 (take #2) 2016-01-04 15:14:27 -07: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
172c8f314e Merge remote-tracking branch 'origin/jetty-9.3.x' 2015-12-24 15:17:56 +11:00
Greg Wilkins
30557429cf 484801 Avoid non-cached memory mapped files 2015-12-24 15:13:46 +11:00
Greg Wilkins
3b49ed6d0a 484657 - Support HSTS rfc6797 2015-12-24 08:42:59 +11:00
Simone Bordet
802948259e Merged branch 'jetty-9.3.x' into 'master'. 2015-12-23 11:26:11 +01:00
Simone Bordet
b7ab9e0a22 484818 - Expose interesting HTTP/2 attributes and operations via JMX.
Initial work to expose already existing attributes on the server.
2015-12-23 11:08:25 +01:00
Greg Wilkins
50ff7ac7ce Merge remote-tracking branch 'origin/jetty-9.3.x' 2015-12-23 18:07:08 +11:00
Greg Wilkins
19d6e36ab9 484657 - Support HSTS rfc6797 2015-12-23 17:15:24 +11:00
Greg Wilkins
2d2c321845 Merge remote-tracking branch 'origin/jetty-9.3.x' 2015-12-23 16:38:54 +11:00
Greg Wilkins
f65a7db8c5 458745 Async ISE in async Echo
The HttpOutput class was throwing an ISE if it was dispatched when PENDING
or UNREADY.  However this can occur when it has been dispatched, but a prior call
to onDataAvailable() does output after calling isReady().

The HttpOutput now does not enforce that part of the state machine and defers to
the application correctly calling isReady()
2015-12-23 15:09:56 +11:00
Simone Bordet
3fb354f884 Merged branch 'jetty-9.3.x' into 'master'. 2015-12-21 13:02:04 +01:00
Joakim Erdfelt
22f9c9826d Javadoc fixes 2015-12-19 12:46:52 -07:00
Jan Bartel
c122569d75 Invalidate session if load finds it is expired; ensure locks reentrant 2015-12-18 17:45:10 +11:00
Jan Bartel
163a59a18c Merge branch 'master' into session-refactor 2015-12-18 14:26:14 +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
4ce2104a70 Resolve threading issues for simultaneous session invalidate. 2015-12-18 12:10:50 +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
Jan Bartel
68f27bbb40 Ensure SessionData attributes are cast to ConcurrentHashMap on deserialization. 2015-12-16 12:16:05 +11:00
Jan Bartel
fe5cc7a336 Merge branch 'master' into session-refactor 2015-12-16 09:04:30 +11: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
Jan Bartel
b1707ef228 Ensure session loading runs in scope of context classloader. 2015-12-11 16:04:39 +11:00
Jan Bartel
31ea1704a1 Make calling passivate/active depend on type of session data store; fix tests 2015-12-11 11:42:29 +11: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
Jan Bartel
b0b03cfa45 Merge branch 'master' into session-refactor 2015-12-03 16:59:28 +11:00
Jan Bartel
9ff55cb301 Merge branch 'master' into session-refactor
Conflicts:
	jetty-infinispan/src/main/java/org/eclipse/jetty/session/infinispan/InfinispanSessionManager.java
	jetty-nosql/src/main/java/org/eclipse/jetty/nosql/NoSqlSessionManager.java
	jetty-nosql/src/main/java/org/eclipse/jetty/nosql/mongodb/MongoSessionIdManager.java
	jetty-nosql/src/main/java/org/eclipse/jetty/nosql/mongodb/MongoSessionManager.java
	jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionIdManager.java
	jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionManager.java
	tests/test-sessions/test-jdbc-sessions/src/test/java/org/eclipse/jetty/server/session/JdbcTestServer.java
	tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/MongoTestServer.java
	tests/test-sessions/test-sessions-common/src/main/java/org/eclipse/jetty/server/session/AbstractInvalidationSessionTest.java
2015-12-03 16:57:51 +11:00
Greg Wilkins
384caf02c1 483427 - AsyncContext complete while pending async Reads/Writes 2015-12-03 14:20:09 +11:00
Joakim Erdfelt
3e3fd07c96 fixing imports 2015-12-02 13:04:40 -07:00
Joakim Erdfelt
1e6b940942 Merge branch 'jetty-9.3.x'
Conflicts:
	jetty-server/src/test/java/org/eclipse/jetty/server/AbstractHttpTest.java
2015-12-02 11:39:52 -07:00
Greg Wilkins
4bbd060ca8 483427 - AsyncContext complete while pending async Reads/Writes 2015-12-02 16:07:59 +11:00
Greg Wilkins
6978eeb5c4 483422 - Empty chunked body in 304 Response
test harness only
2015-12-02 12:41:51 +11:00
Jan Bartel
82ffc4f355 Made mongo session tests work. 2015-11-27 16:01:54 +11:00
Greg Wilkins
ac124094dd Merge remote-tracking branch 'origin/jetty-9.3.x' 2015-11-26 07:08:06 +11:00
Greg Wilkins
a2c057892e 483039 - HTTP2 Upgrade case sensitivity on Connection header 2015-11-26 07:06:38 +11:00
Simone Bordet
50041395f9 Merged branch 'jetty-9.3.x' into 'master'. 2015-11-25 14:00:19 +01:00
Greg Wilkins
204591ce82 482855 - Content-Length omitted for POST requests with empty body
Removed HTTP 0.9 support
A few code simplifications
Fixed clients relying on Content-Length headers being ignored
2015-11-25 20:50:59 +11:00