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

11193 Commits

Author SHA1 Message Date
Greg Wilkins d44ba7e24a Improved Context pluggability 2015-08-19 16:28:36 +10:00
Greg Wilkins 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
Jan Bartel 4743c19a8c 474961 Close input stream for classes in AnnotationParser after scanning 2015-08-19 11:12:40 +10:00
Jan Bartel 3de7fc77c7 474558 Debug log ServletContainerInitializer @HandlesTypes contents 2015-08-19 10:25:36 +10:00
Greg Wilkins 22babda3f9 472411 PathResource.checkAliasPath() typo 2015-08-19 09:54:04 +10:00
Greg Wilkins afda638dd9 474685 - GzipHandler configuration supports csv paths and mimetypes. 
readded for backward compatibility, but with a warning it will be removed.
 2015-08-19 09:39:38 +10:00
Simone Bordet 805ec9554c 475195 - SNI matching fails when keystore does not contain wild certificates. 
Fixed condition in SslContextFactory.getKeyManagers() that installs
the SniX509ExtendedKeyManager.

Miscellaneous code cleanups.
 2015-08-17 20:55:20 +02:00
Joakim Erdfelt 8e2b32173d Turning down logging 2015-08-14 14:48:51 -07:00
Joakim Erdfelt 6ea5b03e23 474634 - AsyncListener.onError() handling. 
+ Reworking test-continuations to (hopefully) be a bit more reliable
  in its working with history assertions on slower hardware.
  Namely, the server is started, and stopped, for each testcase
  *before* the assertions of success are tested.
 2015-08-14 14:48:51 -07:00
Joakim Erdfelt d1fa4583b3 Adding some output to testcase to help track down behavior seen on ci 2015-08-14 14:48:51 -07:00
Simone Bordet b96f2f5b24 474634 - AsyncListener.onError() handling. 
Simplified exception handling, making sure that we terminate the
handling even in case the state was COMPLETING but the container
could not write the response.
 2015-08-14 14:48:51 -07:00
Simone Bordet 94df04e57b Fixed unnecessary double dispatch. 2015-08-14 14:48:51 -07:00
Simone Bordet b819273c7b 474634 - AsyncListener.onError() handling. 
Refactored continuation tests.
 2015-08-14 14:48:51 -07:00
Joakim Erdfelt 2f4f4a2247 Minor improvements in WebSocketConnection.toString() 2015-08-14 14:48:51 -07:00
Greg Wilkins 087b4c94d7 474358 - DefaultServlet bad Content-Type on compressed content 2015-08-14 16:03:08 +10:00
Greg Wilkins 6274522787 Merge branch 'master' into async_onError 2015-08-14 12:27:19 +10:00
Greg Wilkins 946b1476f8 474634 - AsyncListener.onError() handling. 
reverted onComplete behaviour
 2015-08-14 12:24:06 +10:00
Greg Wilkins d780839bec 474634 - AsyncListener.onError() handling. 
Added HttpConfiguration.maxErrorDispatches to detect error loops
Fixed ManyWays... unit test to handle error dispatch.
 2015-08-14 10:06:57 +10:00
Joakim Erdfelt 173f6d8b3b Tweaking test-continuation testing to be more clear on the failure 2015-08-13 16:40:00 -07:00
Simone Bordet 69b90ef59b 474888 - HttpClient JMX support. 2015-08-13 15:16:14 +02:00
Greg Wilkins 9b9b9524dc 474634 - AsyncListener.onError() handling. 
Allow IOException from complete flush to goto an onError call.
 2015-08-13 19:09:57 +10:00
Greg Wilkins 108821aacb 474634 - AsyncListener.onError() handling. 
Fixed more tests in jetty-servlets
 2015-08-13 18:44:25 +10:00
Greg Wilkins 8c0e4f53d3 474634 - AsyncListener.onError() handling. 
Fixed AsyncContextTests
 2015-08-13 18:12:38 +10:00
Greg Wilkins f21ea15725 474634 - AsyncListener.onError() handling. 
Handle errors thrown from dispatch when async is started with onError
 2015-08-13 18:06:14 +10:00
Greg Wilkins 0f6a83f710 474634 - AsyncListener.onError() handling. 
Fixed async blocking read test
 2015-08-13 16:55:45 +10:00
Greg Wilkins 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
Simone Bordet 79086f3fe3 474634 - AsyncListener.onError() handling. 
Interim work on getting the right behavior for onError().
 2015-08-13 01:33:28 +02:00
Simone Bordet 4c7d5f661e Fixed import error. 2015-08-11 12:32:27 +02:00
Simone Bordet aa684a5dcc 470311 - Introduce a proxy-protocol module. 
Support for the PROXY protocol is now enabled via 2 new modules:
proxy-protocol and proxy-protocol-ssl, respectively for the HTTP
connector and the SSL connector.
 2015-08-11 12:17:24 +02:00
Joakim Erdfelt 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
Joakim Erdfelt 9ca235beca Revert "474618 - AsyncListener.onComplete not called when error occurs" 
This reverts commit 60f409e4ff.
 2015-08-10 09:38:40 -07:00
Joakim Erdfelt 60f409e4ff 474618 - AsyncListener.onComplete not called when error occurs 2015-08-10 07:56:14 -07:00
Joakim Erdfelt b522dd7fe2 474617 - AsyncListener.onError not called for errors 
+ Making onError call correctly
 2015-08-10 07:53:56 -07:00
Joakim Erdfelt 25b692046f Merge branch 'jetty-9.2.x' 2015-08-07 09:40:11 -07:00
Joakim Erdfelt 55862e229e 471055 - Restore legacy/experimental WebSocket extensions (deflate-frame) 2015-08-07 09:39:12 -07:00
Joakim Erdfelt a71c543a7e Revert "Removing old websocket extensions x-webkit-deflate-frame and deflate-frame" 
This reverts commit ec9504aab8.
 2015-08-07 07:37:06 -07:00
Joakim Erdfelt 1b33ded784 Merge branch 'jetty-9.2.x' 
Conflicts:
	jetty-cdi/cdi-servlet/src/test/java/org/eclipse/jetty/cdi/servlet/LocaleTimeFormatter.java
 2015-08-06 15:56:53 -07:00
Joakim Erdfelt 5c0906ed6c 474454 - Backport permessage-deflate from Jetty 9.3.x to 9.2.x 
+ post cherry-pick merge cleanup
 2015-08-06 15:55:24 -07:00
Joakim Erdfelt c424b58153 474453 - Tiny buffers (under 7 bytes) fail to compress in permessage-deflate 
+ Ensure compress() is sanely using Deflater.deflate()
+ Ensure output buffer in .deflate() is always a minimum
  of 256 bytes
 2015-08-06 15:16:32 -07:00
Joakim Erdfelt ffcedde60a 474068 - Update WebSocket Extension for permessage-deflate draft-22 
+ Copying inflated byte buffers
+ Simplifying Accumulator of buffer/chunks
+ Removing references to frame compression extensions
 2015-08-06 15:16:32 -07:00
Joakim Erdfelt aac9568a30 Work on permessage-deflate continues 
Conflicts:
	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/FrameCompressionExtensionTest.java
 2015-08-06 15:16:30 -07:00
Joakim Erdfelt 39f9f3ad44 Removing old websocket extensions x-webkit-deflate-frame and deflate-frame 
Conflicts:
	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/DeflateFrameExtensionTest.java
 2015-08-06 15:16:11 -07:00
Joakim Erdfelt 2a1e0659d1 474453 - Tiny buffers (under 7 bytes) fail to compress in permessage-deflate 
+ Ensure compress() is sanely using Deflater.deflate()
+ Ensure output buffer in .deflate() is always a minimum
  of 256 bytes
 2015-08-06 15:10:55 -07:00
Joakim Erdfelt 47d81db015 474455 - Enable permessage-deflate WebSocket extension 2015-08-06 15:10:55 -07:00
Simone Bordet 5324d367c5 Merged branch 'jetty-9.2.x' into 'master'. 2015-08-06 17:33:30 +02:00
Simone Bordet 020cbe1172 Removed redundant logging statement. 2015-08-06 17:31:23 +02:00
Joakim Erdfelt d02a5c3c8b 474361 - Handle JVM version extensions like -internal 
+ Refreshed Version.java to handle parsing alternate syntaxes
+ Introduced Version.toShortString() for the non-suffixed versions
+ Using updated Version obj in StartArgs.setProperty("java.version")
  to allow both normal System property access and arbitrary property
  setting on command line to work in a consistent fashion.
 2015-08-05 17:08:40 -07:00
Jan Bartel 7fd7c914e5 474344 apache-jstl includes test dependencies 2015-08-06 08:44:15 +10:00
Simone Bordet 542ef22ba8 Merged branch 'jetty-9.2.x' into 'master'. 2015-08-05 17:50:25 +02:00
Simone Bordet e0039a95e8 474321 - Allow synchronous address resolution. 
Refactored SocketAddressResolver into interface and one sync and one
async implementations. Added getter/setter methods to HttpClient.
 2015-08-05 16:51:16 +02:00