Commit Graph

1074 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 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
Jan Bartel dd2e042ddf Revert "486394 - Restore MultiPartFilter behavior with regards to temp file access"
This reverts commit 009fde2400.
2016-02-04 08:41:14 +01:00
Jan Bartel 94a56f0802 Revert "Fixing license header formatting on new file"
This reverts commit c858bc126a.
2016-02-04 08:41:00 +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
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 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 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 77d4b54082.
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
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 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
Joakim Erdfelt bae1138211 Fixing test expectations on Decorator counts 2015-12-02 12:19:52 -07:00
Joakim Erdfelt 481102db30 483413 - Warn on @Deprecated servlet/filter use 2015-12-01 15:53:46 -07: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 8ed34b3395 482243 GzipHandler include test 2015-11-18 15:52:32 +11:00
Greg Wilkins 12ec44894b 482272 Fixed relative symlink checking 2015-11-18 11:13:35 +11:00
Joakim Erdfelt edf686fe0a Updating to version 9.3.7-SNAPSHOT 2015-11-06 12:13:00 -07:00
Joakim Erdfelt d737e1c638 Updating to version 9.3.6.v20151106 2015-11-06 11:09:32 -07:00
Joakim Erdfelt ec8f8d3e4f Updating to version 9.2.15-SNAPSHOT 2015-11-06 11:06:48 -07:00
Joakim Erdfelt ecba378f5c Updating to version 9.2.14.v20151106 2015-11-06 10:32:14 -07:00
Jan Bartel b74a89bcb9 479865 IllegalStateException: Multiple servlets map to path: *.jsp: jsp,jsp 2015-10-28 16:53:26 +11:00
Joakim Erdfelt dde32787c4 Updating to version 9.3.6-SNAPSHOT 2015-10-12 15:47:37 -07:00
Joakim Erdfelt 29722bd880 Updating to version 9.3.5.v20151012 2015-10-12 15:10:39 -07:00
Jan Bartel 73de40921c Merge branch 'jetty-9.3.x' into gcloud-session-manager 2015-10-13 08:35:50 +11:00
Joakim Erdfelt 2cce7510e1 Updating to 9.3.5-SNAPSHOT 2015-10-08 17:49:09 -07:00
Jan Bartel 65dc76e21f Ensure ServletHolder new initialization state is reset after doStop 2015-10-08 10:57:26 +11:00
Wouter Bancken 35cbe3308b Add initialized boolean to ServletHolder
Signed-off-by: wouter.bancken@aca-it.be
2015-10-08 10:57:19 +11:00
Jan Bartel ea9c2cc9d9 Ensure ServletHolder new initialization state is reset after doStop 2015-10-08 10:55:10 +11:00
Wouter Bancken ce6f55f9df Add initialized boolean to ServletHolder
Signed-off-by: wouter.bancken@aca-it.be
2015-10-08 10:50:45 +11:00
Joakim Erdfelt 37296bec3c Updating to version 9.3.4.v20151007 2015-10-07 14:58:38 -07:00
Simone Bordet 29e64f5b1c Fixed test. 2015-10-07 23:10:11 +02:00
Joakim Erdfelt 5300f0c7f7 478757 - DebugHandler thread name is mangled
+ Added testcase, and fixed handler for threadname output.
2015-09-30 12:47:31 -07:00
Greg Wilkins 038af01e8e 478105 prependFilterMapping check for null FilterHolder 2015-09-24 08:41:04 +10:00
Greg Wilkins 67aee72bdd 477680 Encode merged query parameters 2015-09-18 13:19:00 +10:00
Greg Wilkins 99f4ed7352 477737 Improve handling of etags with dynamic and static gzip 2015-09-18 12:30:02 +10:00
Simone Bordet 866edf68a9 Replaced string literal with the proper constant. 2015-09-18 01:46:46 +02:00
Greg Wilkins 2d88fdf386 477278 Refactored DefaultServlet for cached Gzip & Etags
Refactored the DefaultServlet to better handle static gzipped files with etags in the cache.
Required a simplification of always having a HttpContent rather than the prior situation of
having either a Resource or a HttpContent.  So introduced a HttpContent.Factory, of which
the ResourceCache is the normal implementation, but there is also now a ResourceContentFactory
that creates content when there is no cache.

The Gzip resource is now associated with the normal resource, so less lookups are needed.
This also give scope for caching dynamic gzipping in the future.

The GzipHttpContent class has been introduced to send content with the headers of the
uncompress, but content of the compressed resource.
2015-09-17 18:19:58 +10:00
Jan Bartel 03a601f2b2 477385 Make jetty osgi manifests only resolve jetty packages against a single distro version 2015-09-16 19:13:47 +10:00
Greg Wilkins 02c5ea30be 477123 - AsyncListener callbacks need context scope
Also added DebugListener and deprecated DebugHandler
2015-09-11 12:06:23 +10:00
Jesse McConnell 6409366499 [maven-release-plugin] prepare for next development iteration 2015-08-27 10:11:29 -05:00