3300d54b5a
Merge remote-tracking branch 'origin/jetty-9.3.x'
2016-03-02 14:13:29 +01:00
3963309f62
Issue #379 Insufficient information on asyncNotSupported
...
Converted the boolean for asyncSupported to a String holding the source
of the async not supported.
2016-03-02 14:09:15 +01:00
dd4a72ce76
479903 - improve async onError handling
...
Work in progress towards clean build
2016-02-17 14:13:21 +01:00
2ac465a343
Merged branch 'jetty-9.3.x' into 'master'.
2016-02-09 18:14:07 +01:00
6306f06e2f
Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'.
2016-02-09 18:12:04 +01:00
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
cb79379b79
Merged branch 'jetty-9.3.x' into 'master'.
2016-02-05 18:14:56 +01:00
dd2e042ddf
Revert "486394 - Restore MultiPartFilter behavior with regards to temp file access"
...
This reverts commit 009fde2400
2016-02-04 08:41:14 +01:00
94a56f0802
Revert "Fixing license header formatting on new file"
...
This reverts commit c858bc126a
2016-02-04 08:41:00 +01:00
bb89e113a9
fixed merge
2016-02-04 07:00:39 +01:00
df79ad689a
Merge remote-tracking branch 'origin/jetty-9.3.x'
2016-02-04 07:00:13 +01:00
c858bc126a
Fixing license header formatting on new file
2016-02-03 08:31:08 -07:00
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
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
1aef09acc2
486604 - Add debug logging of ErrorPageErrorHandler logic
2016-01-27 11:55:00 -07:00
30308f2316
Javadoc updates
2016-01-13 07:25:15 -07:00
8dc6e25b89
Removed superfluous condition in ServletHandler.getFilterChain()
...
Signed-off-by: dreis2211 <christoph.dreis@freenet.de>
2016-01-09 15:49:44 +01:00
ac24196b0d
Happy New Year 2016
2016-01-04 14:34:20 -07:00
cd39fd84fe
Happy New Year 2016
2016-01-04 14:31:22 -07:00
b5db18378d
Happy New Year 2016
2016-01-04 14:21:26 -07:00
460e6e2ff3
Refactored DefaultServlet and ResourceHandler to use commong ResourceService
2015-12-27 16:17:11 +11:00
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
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
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
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
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
4f9d785b46
Revert "482042 - New API, Allow customization of ServletHandler path mapping"
...
This reverts commit 77d4b54082
2015-12-16 10:08:02 -07:00
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
50899ab212
Merge branch 'master' of git://github.com/mcgilman/jetty.project
2015-12-16 09:18:01 +11:00
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
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
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
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
ae9dc7922d
483427 - AsyncContext complete while pending async Reads/Writes
...
improved unit test
2015-12-04 10:10:12 +11:00
5afa348aaa
removed debug
2015-12-03 17:27:43 +11:00
97722aeea8
Merge branch 'jetty-9.3.x'
2015-12-02 12:20:06 -07:00
bae1138211
Fixing test expectations on Decorator counts
2015-12-02 12:19:52 -07:00
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
ddba6c20cd
483427 - AsyncContext complete while pending async Reads/Writes
2015-12-02 16:46:20 +11:00
4bbd060ca8
483427 - AsyncContext complete while pending async Reads/Writes
2015-12-02 16:07:59 +11:00
481102db30
483413 - Warn on @Deprecated servlet/filter use
2015-12-01 15:53:46 -07:00
cea05f17d9
483119 - CachingWebAppClassLoader breaks JSP
...
Cleaned up debugging and impl. No fix for JSP problem
2015-11-27 10:39:52 +11:00
33307730ea
482041 - Add ServletHandler.newCachedChain() to ease customization
2015-11-24 08:51:22 -07:00
b64b1d98e0
480898 - Introduce FilterMapping.getDispatcherTypes() method
2015-11-24 08:51:21 -07:00
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
4ed4fda173
Merge remote-tracking branch 'origin/jetty-9.3.x'
2015-11-18 15:53:36 +11:00
8ed34b3395
482243 GzipHandler include test
2015-11-18 15:52:32 +11:00
0d647fc95a
Merge remote-tracking branch 'origin/jetty-9.3.x'
2015-11-18 15:11:17 +11:00
12ec44894b
482272 Fixed relative symlink checking
2015-11-18 11:13:35 +11:00
ff0d1b4c14
481903 Module Descriptions
2015-11-12 10:48:04 +11:00
2235eab93c
Javadoc fix
2015-11-02 13:34:40 -07:00
b74a89bcb9
479865 IllegalStateException: Multiple servlets map to path: *.jsp: jsp,jsp
2015-10-28 16:53:26 +11:00
93da91743a
479865 IllegalStateException: Multiple servlets map to path: *.jsp: jsp,jsp
2015-10-28 16:52:45 +11:00
cfeee5cec7
479903 - improve async onError handling
2015-10-16 14:51:57 +11:00
65dc76e21f
Ensure ServletHolder new initialization state is reset after doStop
2015-10-08 10:57:26 +11:00
35cbe3308b
Add initialized boolean to ServletHolder
...
Signed-off-by: wouter.bancken@aca-it.be
2015-10-08 10:57:19 +11:00
ea9c2cc9d9
Ensure ServletHolder new initialization state is reset after doStop
2015-10-08 10:55:10 +11:00
ce6f55f9df
Add initialized boolean to ServletHolder
...
Signed-off-by: wouter.bancken@aca-it.be
2015-10-08 10:50:45 +11:00
29e64f5b1c
Fixed test.
2015-10-07 23:10:11 +02:00
5300f0c7f7
478757 - DebugHandler thread name is mangled
...
+ Added testcase, and fixed handler for threadname output.
2015-09-30 12:47:31 -07:00
038af01e8e
478105 prependFilterMapping check for null FilterHolder
2015-09-24 08:41:04 +10:00
67aee72bdd
477680 Encode merged query parameters
2015-09-18 13:19:00 +10:00
99f4ed7352
477737 Improve handling of etags with dynamic and static gzip
2015-09-18 12:30:02 +10:00
866edf68a9
Replaced string literal with the proper constant.
2015-09-18 01:46:46 +02:00
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
02c5ea30be
477123 - AsyncListener callbacks need context scope
...
Also added DebugListener and deprecated DebugHandler
2015-09-11 12:06:23 +10:00
2cc663685a
ContextHandler.ContextScopeListener
...
Added a listener that is called as any thread enters/exits a context/request scope. This is
both normal servlet dispatches and async callbacks.
2015-08-19 15:30:52 +10:00
087b4c94d7
474358 - DefaultServlet bad Content-Type on compressed content
2015-08-14 16:03:08 +10:00
108821aacb
474634 - AsyncListener.onError() handling.
...
Fixed more tests in jetty-servlets
2015-08-13 18:44:25 +10:00
8c0e4f53d3
474634 - AsyncListener.onError() handling.
...
Fixed AsyncContextTests
2015-08-13 18:12:38 +10:00
f21ea15725
474634 - AsyncListener.onError() handling.
...
Handle errors thrown from dispatch when async is started with onError
2015-08-13 18:06:14 +10:00
0f6a83f710
474634 - AsyncListener.onError() handling.
...
Fixed async blocking read test
2015-08-13 16:55:45 +10:00
d1aa9ce993
474634 - AsyncListener.onError() handling.
...
Removed special termination case handling. Unhandle can be avoided with a break loop.
Replaced actions COMPLETING and COMPLETED with COMPLETE (which is an action)
Refactored test harness to use a static history array rather than headers
2015-08-13 16:22:02 +10:00
79086f3fe3
474634 - AsyncListener.onError() handling.
...
Interim work on getting the right behavior for onError().
2015-08-13 01:33:28 +02:00
8837291393
474634 - Exception handling from AsyncContext handling inconsistent
...
+ Adding AsyncListenerTest examples of Exceptions during AsyncContext
scoped servlet requests.
2015-08-10 10:55:44 -07:00
ea7c0fed30
implemented ServletContext.getVersionServerName
2015-07-23 19:46:51 +10:00
24c31527cb
473243 Delay resource close for async default content
2015-07-22 13:44:46 +10:00
bcc976312d
473243 Delay resource close for async default content
2015-07-22 13:11:40 +10:00
04062a8383
Improved graceful shutdown and added tests
2015-07-02 16:57:56 +10:00
3ac6a727cf
470803 If a webapp is not fully started do not fully stop it
2015-06-25 18:29:51 +10:00
7c737a587b
Removing [version] sections in modules
2015-06-12 09:14:34 -07:00
916efd6aa7
469860 - Add module metadata versioning to support backwards compat
...
+ Adding [version] section to all existing jetty 9.3 distro modules
+ Updating testcases in jetty-start with new [version] sections too
+ Adding extra testcases for versioned modules
2015-06-10 10:59:18 -07:00
d5e868b645
less verbose unit tests
2015-04-30 10:58:01 +10:00
9eb2cb4c0f
446564 Refactored RequestLog Mechanism
...
reverted API
2015-04-22 10:37:39 +10:00
bcd4e5fc45
464727 - Update Javadoc for Java 8 DocLint
...
+ Fixing javadoc in jetty-servlet
2015-04-21 14:31:44 -07:00
09b5f680b7
464727 - Update Javadoc for Java 8 DocLint
...
Eliminate empty tag warnings
+ Changed <p/> to <p>
+ Changed <br/> to <br>
2015-04-15 14:38:35 -07:00
1cb0449be3
Organised imports
2015-03-26 12:32:15 +11:00
e92bcccc84
Using new Decorator
2015-03-12 10:09:53 -07:00
87246263b8
453834 - CDI Support for WebSocket
...
+ Verifying ServletContextHandler behavior of Decorators
+ Marking old ServletContextHandler methods as deprecated
+ Updates to DecoratedObjectFactory
+ Removing customized weld scopes/context (for now)
+ Deferring JSR356 ServerContainer endpoint init
till Container.doStart() to allow weld to init properly first
+ Removing JSR356 BasicServerEndpointConfigurator in favor
of ContainerDefaultEndpointConfigurator
+ Only decorating server endpoints if they were created by
ContainerDefaultEndpointConfigurator, all others are trusted
to be complete and injected already.
2015-03-12 10:09:52 -07:00
0c930c8640
Rename EnhancedInstantiator to DecoratedObjectFactory
2015-03-12 10:06:03 -07:00
5c3e30d136
453834 - CDI Support for WebSocket
...
+ Changing util.Decorators to util.EnhancedInstantiator to reflect true
usage
+ Adding EnhancedInstantiator to JSR-356
2015-03-12 10:04:50 -07:00
fb88bc4c19
Making ServletContextHandler use util.Decorators
...
+ Deprecating methods that are just awkward now.
ServletContextHandler.getDecorators() - as it expects the
ServletContextHandler.Decorator version
2015-03-12 10:04:13 -07:00
2b7b5ef495
Rethinking Decorators
2015-03-12 10:04:13 -07:00
130afb9535
Merge branch 'jetty-9.2.x'
...
Conflicts:
jetty-client/src/main/java/org/eclipse/jetty/client/LeakTrackingConnectionPool.java
jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientLoadTest.java
jetty-client/src/test/java/org/eclipse/jetty/client/HttpClientUploadDuringServerShutdown.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java
jetty-spdy/spdy-server/src/test/java/org/eclipse/jetty/spdy/server/SynDataReplyDataLoadTest.java
jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/TooFastClientTest.java
2015-03-06 15:57:52 -07:00
9edd7c4b30
461070 Handle setReadListener on request with no content
2015-03-07 08:44:51 +11:00
f44bf8e368
460210 - ExecutionStragegy producer for SelectManager calls onOpen from produce method
...
Further refactoring. Handle the initial onDataAvailable and final onAllDataRead calls
specially, as they may need to be called without scheduling read interest.
2015-02-25 10:47:09 +11:00
5d6bb9f5d0
460210 - ExecutionStragegy producer for SelectManager calls onOpen from produce method
...
Additional refactoring to better handle HttpInput state. Moved the unready and read possible states into the HttpChannelState
2015-02-23 23:06:23 +11:00
c22d79f673
Merge remote-tracking branch 'origin/jetty-9.2.x'
...
Conflicts:
VERSION.txt
aggregates/jetty-all/pom.xml
apache-jsp/pom.xml
apache-jstl/pom.xml
examples/async-rest/async-rest-jar/pom.xml
examples/async-rest/async-rest-webapp/pom.xml
examples/async-rest/pom.xml
examples/embedded/pom.xml
examples/pom.xml
jetty-alpn/jetty-alpn-client/pom.xml
jetty-alpn/jetty-alpn-server/pom.xml
jetty-alpn/pom.xml
jetty-annotations/pom.xml
jetty-ant/pom.xml
jetty-cdi/pom.xml
jetty-client/pom.xml
jetty-continuation/pom.xml
jetty-deploy/pom.xml
jetty-distribution/pom.xml
jetty-fcgi/fcgi-client/pom.xml
jetty-fcgi/fcgi-server/pom.xml
jetty-fcgi/pom.xml
jetty-http-spi/pom.xml
jetty-http/pom.xml
jetty-io/pom.xml
jetty-jaas/pom.xml
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp/pom.xml
jetty-jspc-maven-plugin/pom.xml
jetty-maven-plugin/pom.xml
jetty-monitor/pom.xml
jetty-nosql/pom.xml
jetty-osgi/jetty-osgi-alpn/pom.xml
jetty-osgi/jetty-osgi-boot-jsp/pom.xml
jetty-osgi/jetty-osgi-boot-warurl/pom.xml
jetty-osgi/jetty-osgi-boot/pom.xml
jetty-osgi/jetty-osgi-httpservice/pom.xml
jetty-osgi/jetty-osgi-npn/pom.xml
jetty-osgi/pom.xml
jetty-osgi/test-jetty-osgi-context/pom.xml
jetty-osgi/test-jetty-osgi-webapp/pom.xml
jetty-osgi/test-jetty-osgi/pom.xml
jetty-plus/pom.xml
jetty-proxy/pom.xml
jetty-quickstart/pom.xml
jetty-rewrite/pom.xml
jetty-runner/pom.xml
jetty-security/pom.xml
jetty-server/pom.xml
jetty-servlet/pom.xml
jetty-servlets/pom.xml
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/AsyncGzipFilter.java
jetty-spdy/pom.xml
jetty-spdy/spdy-alpn-tests/pom.xml
jetty-spdy/spdy-client/pom.xml
jetty-spdy/spdy-core/pom.xml
jetty-spdy/spdy-example-webapp/pom.xml
jetty-spdy/spdy-http-client-transport/pom.xml
jetty-spdy/spdy-http-common/pom.xml
jetty-spdy/spdy-http-server/pom.xml
jetty-spdy/spdy-npn-tests/pom.xml
jetty-spdy/spdy-server/pom.xml
jetty-spring/pom.xml
jetty-start/pom.xml
jetty-util-ajax/pom.xml
jetty-util/pom.xml
jetty-webapp/pom.xml
jetty-websocket/javax-websocket-client-impl/pom.xml
jetty-websocket/javax-websocket-server-impl/pom.xml
jetty-websocket/pom.xml
jetty-websocket/websocket-api/pom.xml
jetty-websocket/websocket-client/pom.xml
jetty-websocket/websocket-common/pom.xml
jetty-websocket/websocket-server/pom.xml
jetty-websocket/websocket-servlet/pom.xml
jetty-xml/pom.xml
pom.xml
tests/pom.xml
tests/test-continuation/pom.xml
tests/test-integration/pom.xml
tests/test-jmx/jmx-webapp-it/pom.xml
tests/test-jmx/jmx-webapp/pom.xml
tests/test-jmx/pom.xml
tests/test-loginservice/pom.xml
tests/test-quickstart/pom.xml
tests/test-sessions/pom.xml
tests/test-sessions/test-hash-sessions/pom.xml
tests/test-sessions/test-jdbc-sessions/pom.xml
tests/test-sessions/test-mongodb-sessions/pom.xml
tests/test-sessions/test-sessions-common/pom.xml
tests/test-webapps/pom.xml
tests/test-webapps/test-jaas-webapp/pom.xml
tests/test-webapps/test-jetty-webapp/pom.xml
tests/test-webapps/test-jndi-webapp/pom.xml
tests/test-webapps/test-mock-resources/pom.xml
tests/test-webapps/test-proxy-webapp/pom.xml
tests/test-webapps/test-servlet-spec/pom.xml
tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
2015-02-19 14:05:00 +11:00
b494fc36c5
459681 Remove dead code after removal of glassfish jasper support
2015-02-19 10:50:40 +11:00
6097123af6
460176 When checking for precompiled jsp, ensure classname is present
2015-02-18 11:05:54 +11:00
Greg Wilkins
Simone Bordet
Jan Bartel
Joakim Erdfelt
dreis2211
Matt Gilman
Wouter Bancken
Greg Wilkins
Jan Bartel