Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-02-24 16:35:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,458 Commits 55 Branches 466 Tags
Commit Graph

2571 Commits

Author SHA1 Message Date
Simone Bordet
6306f06e2f Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2016-02-09 18:12:04 +01:00
Simone Bordet
cb79379b79 Merged branch 'jetty-9.3.x' into 'master'. 2016-02-05 18:14:56 +01:00
Greg Wilkins
7b5d12b338 Added HttpInput prepend content 
Allows content to be reread
 2016-02-05 14:54:39 +01:00
Greg Wilkins
90efbe62c8 487277 - Introduce http-forwarded module for X-Forwarded support 2016-02-04 11:58:23 -07:00
Jan Bartel
980ab316ca 487198 ContextScopeListener should be called on context start and stop 2016-02-04 10:45:33 +01:00
Greg Wilkins
df79ad689a Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-02-04 07:00:13 +01:00
annorax
aa6d7d6dc7 Add missing property configuration to jetty.xml 
Signed-off-by: Ido <ido.dovrat@gmail.com>
 2016-02-03 20:10:20 +02:00
Jan Bartel
459ba4ae5a Fix FileSessionManagerTest to put tmp file in target dir 2016-02-03 14:52:39 +01:00
Greg Wilkins
6c9a444b6c 486530 - Handler added to WebAppContext prevents ServletContext initialization 
Added warnings for loops and inappropriate handlers.
Used insertHandler in more XML files
 2016-02-03 10:54:39 +01:00
Joakim Erdfelt
79a7863ac8 486877 - Google Chrome flagging 'obsolete cipher suite' in Jetty and will soon issue broken padlock 
+ Rely on SslContextFactory defaults for Includes/Excludes of Cipher
  Suites
+ Reference documentation for advice on setting up custom includes
  and excludes
 2016-02-02 12:48:17 -07:00
Jan Bartel
599696bfc5 Merge branch 'master' into session-refactor 2016-02-01 16:57:35 +01:00
Jan Bartel
4f9abc279b Changes after merge 2016-02-01 13:59:51 +01:00
Jan Bartel
a8c29334ca Merge branch 'master' into session-refactor 
Conflicts:
	jetty-nosql/src/main/java/org/eclipse/jetty/nosql/NoSqlSession.java
	jetty-nosql/src/main/java/org/eclipse/jetty/nosql/NoSqlSessionManager.java
	jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSession.java
	jetty-server/src/main/java/org/eclipse/jetty/server/session/HashSessionManager.java
	jetty-server/src/main/java/org/eclipse/jetty/server/session/HashedSession.java
	jetty-server/src/main/java/org/eclipse/jetty/server/session/MemSession.java
	jetty-server/src/test/java/org/eclipse/jetty/server/session/FileSessionManagerTest.java
	tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/StopSessionManagerDeleteSessionTest.java
	tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/StopSessionManagerPreserveSessionTest.java
 2016-02-01 13:59:12 +01:00
Joakim Erdfelt
1aef09acc2 486604 - Add debug logging of ErrorPageErrorHandler logic 2016-01-27 11:55:00 -07:00
Joakim Erdfelt
e3dd0cb83b 486511 - Server.getURI() returns wrong scheme on SSL/HTTPS 2016-01-25 13:23:41 -07:00
Simone Bordet
56c0bc768c Merged branch 'jetty9.3.x' into 'master'. 2016-01-21 17:52:37 +01: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