Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
12,018 Commits 68 Branches 465 Tags 359 MiB
Commit Graph

2941 Commits

Author SHA1 Message Date
Jan Bartel 21fdaf500e Merge remote-tracking branch 'origin/jetty-9.3.x' 
Conflicts:
	jetty-nosql/src/main/java/org/eclipse/jetty/nosql/NoSqlSession.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
	tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/MongoTestServer.java
 2016-02-23 14:04:06 +01:00
Jan Bartel 750b74ad49 Add comments to session implemention code 2016-02-23 13:47:56 +01:00
Simone Bordet 76689dd303 Issue #354 (Spin loop in case of exception thrown during accept()). 
Fixed by introducing an overridable method that performs an arbitrary
sleep to avoid the spin loop. Subclasses may customize.
 2016-02-23 11:37:08 +01:00
Simone Bordet 51009208d4 Merged branch 'jetty-9.3.x' into 'master'. 2016-02-19 13:23:34 +01:00
Greg Wilkins 55eb54799f Issue #346 HttpParser RFC2616 Compliance mode 
Added HttpParser.Compliance field to HttpConnectionFactory
 2016-02-19 11:41:07 +01:00
Jan Bartel 9a554af480 Ensure infinispan timed-out sessions handled correctly 2016-02-19 10:57:04 +01:00
Joakim Erdfelt 4a6602d007 Issue #342 - Reintroducing Request to logExtended 
+ the old/bad AbstractNCSARequestLog.logExtended is now
  deprecated
+ the corrected logExtended is the appropriate one to use
 2016-02-18 11:31:55 -07:00
Greg Wilkins dd4a72ce76 479903 - improve async onError handling 
Work in progress towards clean build
 2016-02-17 14:13:21 +01:00
Greg Wilkins 92c339e669 Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-02-17 12:09:00 +01:00
Greg Wilkins 8068aeead9 Fixed unit test race 
Test was assuming that receiving completed response on client
always happened before server processing had completed.
Added a spin test.
 2016-02-17 11:11:52 +01:00
Jan Bartel ca0193b28e Merge pull request #71 from pethers/master 
Added nullchecks and test for getters using _metadata to avoid throwing
 2016-02-17 10:02:01 +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
Greg Wilkins 779317dc30 Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-02-16 16:03:34 +01:00
Jan Bartel 6c1bd97ad1 Add extra getters to DatabaseAdaptor 2016-02-16 15:31:33 +01:00
Jan Bartel c965dc905c Update jdbc module for new session architecture 2016-02-16 15:12:23 +01:00
Jan Bartel 9b5aa6f90d 478918 Change javax.servlet.error,forward,include literals to RequestDispatcher constants 2016-02-16 11:52:29 +01:00
Jan Bartel f10f32c080 478918 Change javax.servlet.error,forward,include literals to RequestDispatcher constants 2016-02-16 10:48:20 +01:00
Greg Wilkins d0541e58da Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-02-16 10:11:47 +01:00
Greg Wilkins fd5b3a8062 487714 - Avoid NPE in close race for async write 
The race has not been solved, as with lock-free style it is difficult to prevent a
close racing with a write in progress. Instead, the code has been made more
resiliant to such state changes and exceptions thrown are converted to IOExceptions.
 2016-02-16 10:06:25 +01:00
pether.sorling@gmail.com 5f8253a8cd Added nullchecks and test for getters using _metadata to avoid throwing 
nullpointer exception.

Signed-off-by: pether.sorling@gmail.com <pether.sorling@gmail.com>
 2016-02-15 22:51:15 +01:00
Simone Bordet e91d93b85c Merged branch 'jetty-9.3.x' into 'master'. 2016-02-15 20:56:01 +01:00
Simone Bordet 261bea7bc7 Clarified Request.isPushSupported(). 
Now isPushSupported() returns true only if the request is not
a synthentic request generated by a push.
 2016-02-15 20:55:47 +01:00
Simone Bordet 26b6c848f3 Issue #80 (Spin loop in case of HTTP/2 prefaces without H2C). 
Fixed by changing the state of the parser before calling the parser
handler callbacks, and by closing the parser if the upgrade to HTTP/2
is not successful.
 2016-02-15 20:50:22 +01:00
Greg Wilkins 6a9002991a Issue #79 Parse HTTP request target starting with // 
Added a new parseRequestTarget method
 2016-02-15 19:40:10 +01:00
annorax 5167c52ab0 Add missing property configuration to jetty.xml 
Signed-off-by: Ido <ido.dovrat@gmail.com>
 2016-02-13 07:32:42 -07:00
Joakim Erdfelt 134d44cc6f Merge pull request #78 from annorax/patch-3 
Add missing property configuration to jetty.xml
 2016-02-13 07:27:08 -07:00
Joakim Erdfelt f98dde5e5b Updating to version 9.2.16-SNAPSHOT 2016-02-10 15:36:41 -07:00
Joakim Erdfelt 9b6890d3c1 Updating to version 9.2.15.v20160210 2016-02-10 14:49:12 -07:00
Simone Bordet 2ac465a343 Merged branch 'jetty-9.3.x' into 'master'. 2016-02-09 18:14:07 +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 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
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
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
Joakim Erdfelt efecc0c8cf 482056 - Compact path before using it in getRequestDispatcher() 2015-11-24 08:51:22 -07:00
Jan Bartel b249789535 Refactor api to use session id as string, and class for context id; mostly port mongo sessions. 2015-11-20 10:48:50 +11:00
Greg Wilkins a311c8bde1 480904 - jetty-util Loader simplification 
The Loader has been simplified to now just be a switch between loading from the context loader,
the same loader as another class or the system loader.    Multiple loaders will never be tried.

A new runWithServerClassAccess(PriviledgedAction) method has been added to WebAppClassLoader, that
is now used during configuration for actions that need access to both the WEB-INF/lib classes and
the server classes (eg jetty-web.xml and env.xml).

The JMX MBean mechanism has also been modified to look for an MBean class in the same loader that
object came from before attempting the context loader (only if different).
 2015-11-19 12:14:05 +11:00
Simone Bordet 65d33f8b49 Merged branch 'jetty-9.3.x' into 'master'. 2015-11-18 21:40:51 +01:00