Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-02-21 06:05:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,824 Commits 80 Branches 466 Tags
Commit Graph

1105 Commits

Author SHA1 Message Date
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
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
Simone Bordet
cb79379b79 Merged branch 'jetty-9.3.x' into 'master'. 2016-02-05 18:14:56 +01:00
Jan Bartel
dd2e042ddf Revert "486394 - Restore MultiPartFilter behavior with regards to temp file access" 
This reverts commit 009fde2400a746b1ce24ba04bd4fcd001378516b.
 2016-02-04 08:41:14 +01:00
Jan Bartel
94a56f0802 Revert "Fixing license header formatting on new file" 
This reverts commit c858bc126a16b79346d608452341f575de8590e2.
 2016-02-04 08:41:00 +01:00
Greg Wilkins
bb89e113a9 fixed merge 2016-02-04 07:00:39 +01:00
Greg Wilkins
df79ad689a Merge remote-tracking branch 'origin/jetty-9.3.x' 2016-02-04 07:00:13 +01:00
Joakim Erdfelt
c858bc126a Fixing license header formatting on new file 2016-02-03 08:31:08 -07:00
Joakim Erdfelt
009fde2400 486394 - Restore MultiPartFilter behavior with regards to temp file access 
+ Adding HttpServletRequest.getParts() demonstration of duplicate name="" entries
+ Adding 2 new testcases in MultipartFilterTest demonstrating
  location/temp file access issue (currently @Ignored)
 2016-02-03 08:19:37 -07: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
1aef09acc2 486604 - Add debug logging of ErrorPageErrorHandler logic 2016-01-27 11:55:00 -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
b7f9c9aca9 Updating to version 9.3.7-SNAPSHOT 2016-01-13 08:21:01 -07:00
Joakim Erdfelt
21ca3f6690 Updating to version 9.3.7.RC1 2016-01-13 07:30:24 -07:00
Joakim Erdfelt
30308f2316 Javadoc updates 2016-01-13 07:25:15 -07:00
dreis2211
8dc6e25b89 Removed superfluous condition in ServletHandler.getFilterChain() 
Signed-off-by: dreis2211 <christoph.dreis@freenet.de>
 2016-01-09 15:49:44 +01: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
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
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
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
4f9d785b46 Revert "482042 - New API, Allow customization of ServletHandler path mapping" 
This reverts commit 77d4b54082f6789168ea7ef1523e8e1b924bb560.
 2015-12-16 10:08:02 -07: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
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
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
e2a20e0465 Using Map interface to get around ConcurrentHashMap.keySet() bug with Java 8 
See https://gist.github.com/AlainODea/1375759b8720a3f9f094
for details

Conflicts:
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/listener/ELContextCleaner.java
 2015-12-08 14:55:45 -07:00
Greg Wilkins
ae9dc7922d 483427 - AsyncContext complete while pending async Reads/Writes 
improved unit test
 2015-12-04 10:10:12 +11:00
Greg Wilkins
5afa348aaa removed debug 2015-12-03 17:27:43 +11:00
Joakim Erdfelt
97722aeea8 Merge branch 'jetty-9.3.x' 2015-12-02 12:20:06 -07:00
Joakim Erdfelt
bae1138211 Fixing test expectations on Decorator counts 2015-12-02 12:19:52 -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
ddba6c20cd 483427 - AsyncContext complete while pending async Reads/Writes 2015-12-02 16:46:20 +11:00
Greg Wilkins
4bbd060ca8 483427 - AsyncContext complete while pending async Reads/Writes 2015-12-02 16:07:59 +11:00
Joakim Erdfelt
481102db30 483413 - Warn on @Deprecated servlet/filter use 2015-12-01 15:53:46 -07:00
Greg Wilkins
cea05f17d9 483119 - CachingWebAppClassLoader breaks JSP 
Cleaned up debugging and impl.  No fix for JSP problem
 2015-11-27 10:39:52 +11:00
Joakim Erdfelt
33307730ea 482041 - Add ServletHandler.newCachedChain() to ease customization 2015-11-24 08:51:22 -07:00
Joakim Erdfelt
b64b1d98e0 480898 - Introduce FilterMapping.getDispatcherTypes() method 2015-11-24 08:51:21 -07: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
Joakim Erdfelt
4e773c16e2 Merge branch 'release-9.3.6' into jetty-9.3.x 2015-11-18 11:24:04 -07:00
Greg Wilkins
4ed4fda173 Merge remote-tracking branch 'origin/jetty-9.3.x' 2015-11-18 15:53:36 +11:00
Greg Wilkins
8ed34b3395 482243 GzipHandler include test 2015-11-18 15:52:32 +11:00
Greg Wilkins
0d647fc95a Merge remote-tracking branch 'origin/jetty-9.3.x' 2015-11-18 15:11:17 +11:00