Commit Graph

2381 Commits

Author SHA1 Message Date
Jan Bartel 1cc075cf98 [maven-release-plugin] prepare release jetty-9.2.6.v20141205 2014-12-05 16:45:01 +01:00
Simone Bordet d3763e0d1c 454157 - HttpInput.consumeAll spins if input is in async mode.
Added additional check to test whether consumeAll() could actually
consume the content, and if not, abort the channel.
2014-12-05 14:12:01 +01:00
Greg Wilkins 07e87f0ecf 454157 abort to avoid spin in async HttpInput.consumeAll 2014-12-04 17:39:53 +01:00
Jesse McConnell 127b48c932 [maven-release-plugin] prepare for next development iteration 2014-12-03 09:00:57 -06:00
Jesse McConnell 028f4b9610 [maven-release-plugin] prepare release jetty-9.2.6.v20141203 2014-12-03 09:00:46 -06:00
Jesse McConnell 1263d1f3c8 [maven-release-plugin] prepare for next development iteration 2014-12-03 08:26:47 -06:00
Jesse McConnell 5c7f706496 [maven-release-plugin] prepare release jetty-9.2.6.v20141203 2014-12-03 08:26:35 -06:00
Greg Wilkins bd0cd80b58 Merge branch 'jetty-9.2.x' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9.2.x 2014-11-26 15:35:55 +11:00
Greg Wilkins 44ab3ba134 better debug 2014-11-26 15:35:42 +11:00
Joakim Erdfelt 07647e8a5f 443652 - Remove dependency on java.lang.management classes
* Created safer Uptime singleton for use
* Removed direct references to java.lang.management from
   - Server.java
   - Log.java
   - AbstractLifeCycle.java
2014-11-25 08:25:35 -07:00
Greg Wilkins 121a8b6ee8 improved debugging 2014-11-21 10:00:18 +11:00
Simone Bordet f7df8f9244 452516 - Make HttpOutput aggregation size configurable.
Introduced new property "outputAggregationSize" in HttpConfiguration,
and correspondent property in XML file.
2014-11-20 17:06:10 +01:00
Simone Bordet 8330fa73e0 452188 Delay dispatch until content optimisation.
Renamed property "delayDispatchUntilContent".
2014-11-20 17:06:10 +01:00
Greg Wilkins 1915e592b5 452424 Do not add Date header if already set 2014-11-20 15:33:22 +11:00
Greg Wilkins 46a5ef861d 447472 Clear async context timeout on async static content 2014-11-20 11:41:11 +11:00
Greg Wilkins c334e81416 452188 Delay dispatch until content optimisation
Added module and xml support
2014-11-19 11:26:07 +11:00
Greg Wilkins 04f74f73a5 452188 Delay dispatch until content optimisation 2014-11-19 11:11:48 +11:00
Jesse McConnell 09846e324d [maven-release-plugin] prepare for next development iteration 2014-11-12 17:13:19 -06:00
Jesse McConnell 97d2bd95a6 [maven-release-plugin] prepare release jetty-9.2.5.v20141112 2014-11-12 17:13:14 -06:00
Simone Bordet 9320e9e24a 450484 - Missing parameterization of etc/jetty-http[s].xml. 2014-11-07 11:56:58 +01:00
Joakim Erdfelt 04e7be7383 Adding overall test timeout 2014-11-05 11:11:57 -07:00
Jesse McConnell 5d0595cabd [maven-release-plugin] prepare for next development iteration 2014-11-03 13:46:58 -06:00
Jesse McConnell 772ff0bfd4 [maven-release-plugin] prepare release jetty-9.2.4.v20141103 2014-11-03 13:46:52 -06:00
Jesse McConnell 1c4a08b35b [maven-release-plugin] prepare for next development iteration 2014-10-31 09:58:16 -05:00
Jesse McConnell a4ff7bf841 [maven-release-plugin] prepare release jetty-9.2.4.v20141031 2014-10-31 09:58:10 -05:00
Jesse McConnell e1b73a64eb [maven-release-plugin] prepare for next development iteration 2014-10-30 11:28:41 -05:00
Jesse McConnell 5770cc1179 [maven-release-plugin] prepare release jetty-9.2.4.v20141030 2014-10-30 11:28:35 -05:00
Greg Wilkins 2332b4f734 449175 Removed extra space in NCSA log 2014-10-30 16:42:31 +11:00
Greg Wilkins 4b0193247b 448841 Clarified selectors==0 javadoc
448840 Clarified ServerConnector javadoc
448839 Fixed javadoc typo in ServerConnector
2014-10-30 15:50:54 +11:00
Greg Wilkins 414479795e 443550 improved FileResource encoded alias checking
removed extra debug
2014-10-30 14:29:00 +11:00
Greg Wilkins 8eab088a35 443550 improved FileResource encoded alias checking 2014-10-30 14:12:43 +11:00
Greg Wilkins 9189c934d9 444722 Fixed order of setReuseAddress call 2014-10-30 11:28:45 +11:00
Joakim Erdfelt b132b90b03 Simplifying warning message 2014-10-29 15:49:23 -07:00
Joakim Erdfelt 733cc71791 Reworking jetty.home warning to be a module instead.
+ This will cause it to be logged using the configured logger as well.
2014-10-29 15:31:14 -07:00
Jesse McConnell 58eb6740ec [maven-release-plugin] prepare for next development iteration 2014-10-28 14:20:30 -05:00
Jesse McConnell 19a44846cf [maven-release-plugin] prepare release jetty-9.2.4.v20141028 2014-10-28 14:20:24 -05:00
Joakim Erdfelt 607a560ebd Merge branch 'jetty-9.2.x' into cdi-testing 2014-10-28 09:36:34 -07:00
Simone Bordet 7cdcd69f44 Reverted version to 9.2.4-SNAPSHOT. 2014-10-28 11:52:00 +01:00
Jesse McConnell 3b745f06df [maven-release-plugin] prepare for next development iteration 2014-10-27 16:16:24 -05:00
Jesse McConnell 4f0d78c91b [maven-release-plugin] prepare release jetty-9.2.4.v20141027 2014-10-27 16:16:18 -05:00
Jesse McConnell d17613982b [448761] ContextHandler returns incorrect servlet minor version 2014-10-27 15:43:30 -05:00
Joakim Erdfelt 6ff43a0af1 Merge branch 'jetty-9.2.x' into cdi-testing 2014-10-27 13:42:30 -07:00
Simone Bordet c66963126f 446563 - Null HttpChannel.getCurrentHttpChannel() in ServletHandler.doFilter().
Moved the finally block that resets the current HttpChannel and the
thread name after the handling of the COMPLETE action.
This is necessary because AsyncListener.onComplete() (triggered by
the handling of the COMPLETE action) may perform a
RequestDispatcher.forward() that requires the current HttpChannel
thread local to be set.
2014-10-24 14:03:06 +02:00
Greg Wilkins 627ba945f1 Added AsyncDelayHandler example 2014-10-23 09:11:27 +11:00
Greg Wilkins dc33bb84a4 447472 test harness for slow large writes 2014-10-17 11:04:23 +11:00
Joakim Erdfelt e7b86b99cb 445823 - RequestLogHandler at end of HandlerCollection doesn't work
+ Adding more varieties of server side collection vs wrapper with error
  handlers
+ Adding servlet version of tests to demonstrate behavior in servlet
  context, when also using the mapped error handler
2014-10-10 11:21:40 -07:00
Jan Bartel e292b572f1 446425 Oracle Sql error on JettySessions table when this table do not exist already 2014-10-10 17:36:36 +11:00
Greg Wilkins 6a0e220b9c 446506 getAsyncContext ISE before startAsync on async dispatches 2014-10-10 14:19:42 +11:00
Jan Bartel f07387c703 442942 Content sent with status 204 (No Content) 2014-10-10 12:58:45 +11:00
Joakim Erdfelt 17aa2eaf7a Adding note about weld requirement on .getServerInfo() 2014-10-09 15:11:07 -07:00
Joakim Erdfelt 086bea097d Using StandardCharset where appropriate 2014-10-08 11:02:13 -07:00
Joakim Erdfelt 61dd2c9620 Fixing encoding tests (that actually didn't validate results) 2014-10-02 15:12:32 -07:00
Joakim Erdfelt 43d2c59394 445821 - Error 400 should be logged with RequestLog
+ Adding BadRequestLogHandlerTest to demonstrate error 400 not being
captured by RequestLogHandler
2014-10-02 13:55:14 -07:00
Joakim Erdfelt e93e024166 445823 - RequestLogHandler at end of HandlerCollection doesn't work
+ Adding example of RequestLogHandler use in HandlerCollection
2014-10-02 13:54:22 -07:00
Joakim Erdfelt 3636bd6894 Moving hardcoded ports to ephemeral range suitable for more environments 2014-10-02 10:31:32 -07:00
Jan Bartel 149ee01047 445157 First redeployed servlet leaks WebAppContext 2014-10-01 13:03:39 +10:00
Joakim Erdfelt d0fa66ddf0 445542 - Add SecuredRedirectHandler for embedded jetty use to redirect to secure port/scheme
+ Adding SecuredRedirectHandler as option for those jetty embedded folks
  to have a simple http -> https solution (can even be setup and bound
  to specific connectors via the named virtualhosts concepts)
2014-09-30 12:54:42 -07:00
Jan Bartel 059f5e2396 444547 Format exception in ResourceCache.Content.toString() 2014-09-19 10:28:33 +10:00
Greg Wilkins 1e3e3d9de0 do not throw when callback passed 2014-09-17 21:06:12 +10:00
Joakim Erdfelt 9249ebb6ef Using 9.2.4-SNAPSHOT for branch 2014-09-11 06:10:44 -07:00
Jesse McConnell 9bfeb2221f [maven-release-plugin] prepare release jetty-9.2.3.v20140905 2014-09-05 09:19:23 -05:00
Jan Bartel 51715dbcdb 443231 java.lang.NullPointerException on scavenge scheduling when session id manager declared before shared scheduler 2014-09-04 11:31:08 +10:00
Greg Wilkins c3647f9d9f 443158 Fixed HttpOutput spin 2014-09-03 15:01:10 +10:00
Simone Bordet ca2a23c35d Improved Javadocs and code cleanup. 2014-09-01 11:28:59 +02:00
Greg Wilkins 69390954dc 435322 acceptor and selector configuration/priority 2014-08-29 15:36:19 +10:00
Greg Wilkins eee2ba206e 435322 Added a idleTimeout to the SharedBlockerCallback 2014-08-29 11:55:06 +10:00
Greg Wilkins 1a0eb64a1f 442383 Improved insufficient threads message 2014-08-27 12:40:54 +10:00
Greg Wilkins 9a52d92f03 442048 fixed sendRedirect %2F encoding 2014-08-27 12:34:15 +10:00
Greg Wilkins caaa7c508c 440255 ensure 500 is logged on thrown Errors 2014-08-20 11:36:58 +10:00
Greg Wilkins e15a87f499 440255 ensure 500 is logged on thrown Errors 2014-08-20 10:27:27 +10:00
Greg Wilkins 2af613a28b improved debugging output 2014-08-13 15:56:02 +10:00
Greg Wilkins 1d5998f02e 441073 isEarlyEOF on HttpInput 2014-08-07 15:05:22 +10:00
Jan Bartel 75c92bf76a 438500 Odd NoClassDef errors when shutting down the jetty-maven-plugin via the stop goal 2014-08-01 12:44:30 +10:00
Greg Wilkins f970ffc0ac Misc cleanups done whilst fixing 435322 2014-08-01 09:02:44 +10:00
Joakim Erdfelt cb42ef2167 [maven-release-plugin] prepare for next development iteration 2014-07-23 11:18:01 -07:00
Joakim Erdfelt dc62cb5ac7 [maven-release-plugin] prepare release jetty-9.2.2.v20140723 2014-07-23 11:17:55 -07:00
Greg Wilkins 3a6879d3e8 expanded tabs in indents 2014-07-23 16:49:05 +10:00
Greg Wilkins e199b671bb 440020 Abort bad proxy responses with sendError(-1) 2014-07-23 16:31:19 +10:00
Greg Wilkins 564ffca5dc 440114 ContextHandlerCollection does not skip context wrappers 2014-07-23 15:23:35 +10:00
Simone Bordet 4daba1ba79 Restored IteratingCallback APIs (in particular the completed()
method) to keep compatibility over micro versions of Jetty.

Removed getState() - can't return a private class from a protected
method, plus it was only used in a toString() with the wrong
formatting string, that was already printing the state.

Removed also final modifiers to keep compatibility.
2014-07-22 19:32:13 +02:00
Simone Bordet cae4204150 440020 - ProxyServlet does not handle correctly failure after committed response to client.
Fixed by introducing a request attribute "org.eclipse.jetty.server
.Response.failure" used by HttpChannel to immediately close the
connection when it sees it.
2014-07-21 16:48:21 +02:00
Greg Wilkins c72649e150 435653 encode async dispatched requestURI 2014-07-19 18:55:02 +10:00
Greg Wilkins b38a978eac 439067 Improved graceful stop timeout handling 2014-07-19 00:46:55 +10:00
Greg Wilkins 30fcce1cdc 434536 Improved Customizer javadoc 2014-07-18 12:18:29 +10:00
Greg Wilkins a89419fd3f 434536 Improved Customizer javadoc 2014-07-17 16:09:42 +10:00
Greg Wilkins a2a333ba53 435653 encode async dispatched requestURI 2014-07-17 15:51:22 +10:00
Greg Wilkins 2d52280179 436987 limited range of default acceptors and selectors 2014-07-17 14:29:58 +10:00
Greg Wilkins b13be9cfa6 438327 Remove hard coded Allow from OPTIONS * 2014-07-17 13:40:21 +10:00
Greg Wilkins 6bc08000c7 439066 javadoc setStopAtShutdown 2014-07-17 13:29:54 +10:00
Greg Wilkins 94ac37f8c2 439067 Javadoc for graceful server stop 2014-07-17 13:29:54 +10:00
Greg Wilkins 3a5e67ce9e Making ShutdownThread actually stop 2014-07-17 10:50:54 +10:00
Greg Wilkins 591eedcb59 [FindBugs] Include explicit typing whereever possible
+ No cleanup regarding unchecked types (yet)
2014-07-17 10:47:49 +10:00
Greg Wilkins 0c66f3a68e [FindBugs] Ensure resources are closed/freed properly
Removing dumb connector.close during server.getURI()
2014-07-17 10:00:26 +10:00
Greg Wilkins ec310dca90 Fixes to Hash Sessions for 'Stream Closed' errors 2014-07-17 09:45:12 +10:00
Greg Wilkins c19a14a4a2 [FindBugs] Ensure proper lazy-initialization even if this costs some performance 2014-07-17 08:35:40 +10:00
Greg Wilkins 5f033b48d5 438204 leave IPv6 addresses [] wrapped in getServerName 2014-07-16 16:39:02 +10:00
Joakim Erdfelt dd5cdab54c 439540 - setReuseAddress() in ServerConnector.java is not coded properly
+ Adding unit test to confirm existing behavior of
  ServerConnector.setReuseAddress(boolean) and ServerConnector.open()
2014-07-15 17:02:51 -07:00
Greg Wilkins 55ca09a00e 438190 findbug improvements 2014-07-10 14:41:32 +10:00
Greg Wilkins 0f70f28839 avoid race test failures 2014-07-03 15:10:48 +10:00
Greg Wilkins 78b03c5b8e More debug for intermittent failures 2014-07-02 16:01:00 +10:00
Greg Wilkins 0751256559 438434 ResourceHandler checks aliases 2014-06-27 21:46:59 +02:00
Greg Wilkins 9b764ef3fa 435322 Fixed Iterating Callback close 2014-06-27 20:43:12 +02:00
Simone Bordet 17895f8256 438079 - Review garbage creation in 9.2.x series. 2014-06-26 13:16:08 +02:00
Simone Bordet 299d390dae Removed unnecessary reset of fields from onCompleteSuccess() and
onCompleteFailure().
They are not needed because these are methods that move the
IteratingCallback in a final state, so it won't be used anymore. And
if it is reset(), then those fields are already properly reset there.
2014-06-26 10:48:38 +02:00
Simone Bordet 4af586770e Cannot throw exceptions from reset(), must fail the callback instead. 2014-06-26 10:46:43 +02:00
Simone Bordet 2e57fb6fad Removed unnecessary volatile declaration.
Calls to reset() are always followed by iterate() that provides a memory barrier by changing its state, which is an AtomicReference.
2014-06-26 10:45:00 +02:00
Greg Wilkins a746d78951 438079 435322 Fixed Iterating Callback fail handling and removed per send instance 2014-06-25 19:20:03 +02:00
Simone Bordet 3ff4195dbc Guarded calls to LOG.debug() with if (LOG.isDebugEnabled()) to reduce allocation of varargs Object[]. 2014-06-25 12:26:45 +02:00
Greg Wilkins 28ad689bcb 437996 avoid async status race by not setting 200 on handled 2014-06-24 12:27:03 +02:00
Jesse McConnell c3ee0711ca [maven-release-plugin] prepare for next development iteration 2014-06-09 13:37:54 -05:00
Jesse McConnell 06b494eeac [maven-release-plugin] prepare release jetty-9.2.1.v20140609 2014-06-09 13:37:49 -05:00
Jesse McConnell 10b6c574ae Merge branch 'master' into release-9 2014-06-09 13:07:22 -05:00
Joakim Erdfelt 05575774a1 436524 - Start / Downloadable [files] references in modules cannot use ":" themselves
+ Switching out support for ":" to "|"
2014-06-04 11:14:35 -07:00
Joakim Erdfelt d62f45dbd2 436405 - ${jetty.base}/resources not on classpath with default configuration
+ Adding missing '/'
2014-06-02 13:56:54 -07:00
Jan Bartel b09e7d33e2 436345 Refactor AbstractSession to minimize burden on subclasses to implement behaviour 2014-06-02 15:01:49 +02:00
Jan Bartel 1b00888739 436345 Refactor AbstractSession to ease customization 2014-06-02 11:48:28 +02:00
Jesse McConnell 2e859e4ae2 [maven-release-plugin] prepare for next development iteration 2014-05-26 12:04:15 -05:00
Jesse McConnell 71ad2114c5 [maven-release-plugin] prepare release jetty-9.2.0.v20140526 2014-05-26 12:04:08 -05:00
Jesse McConnell 7e71c42bc5 Merge branch 'master' into release-9 2014-05-26 11:36:41 -05:00
Jesse McConnell 5e3e0930e0 Revert "434810 better handling of bad messages"
This reverts commit 1e524f378e.
2014-05-26 11:20:07 -05:00
Jesse McConnell aa3c9322a6 Revert "434810 better handling of bad messages"
This reverts commit 3f4a8abf9e.
2014-05-26 11:20:00 -05:00
Jesse McConnell 8936b160c2 Merge branch 'master' into release-9 2014-05-26 10:46:39 -05:00
Jesse McConnell d59dbe936b [maven-release-plugin] prepare for next development iteration 2014-05-23 09:59:19 -05:00
Jesse McConnell edc7646a4c [maven-release-plugin] prepare release jetty-9.2.0.v20140523 2014-05-23 09:59:13 -05:00
Greg Wilkins 3f4a8abf9e 434810 better handling of bad messages 2014-05-21 22:01:28 +02:00
Greg Wilkins 1e524f378e 434810 better handling of bad messages 2014-05-21 20:13:21 +02:00
Jan Bartel 58ea1dd386 435412 Make AbstractSession.access() more amenable to customization 2014-05-21 18:43:02 +02:00
Simone Bordet e4d6768901 434386 - Request Dispatcher extracts args and prevents asyncIO.
Changed behavior of mergeQueryParameters() so that new query
parameters hide old query parameters, but they are accumulated for
getParameter() APIs.
2014-05-12 13:08:28 +02:00
Jan Bartel ca5a086877 434447 Able to create a session after a response.sendRedirect 2014-05-12 11:23:59 +02:00
Simone Bordet ba4ed86e31 434386 - Request Dispatcher extracts args and prevents asyncIO.
Avoid to read the content from within include() or forward(), therefore
making possible to proxy the content as-is to an upstream server.
2014-05-12 10:57:13 +02:00
Greg Wilkins eecd986058 RequestBuffer handling code and javadoc cleanup 2014-05-07 12:18:33 +02:00
Greg Wilkins 0abda0f35a 434074 Avoid double dispatch by returning false from messageComplete 2014-05-05 19:49:58 +02:00
Jan Bartel 943fb64176 433841 Resource.newResource() declares an exception it does not throw 2014-05-05 15:45:30 +02:00
Greg Wilkins 51c5a4c833 425421 ContainerLifeCycle does not start added beans in started state 2014-05-05 14:53:53 +02:00
Greg Wilkins c6f394ab14 434009 Improved javadoc for accessing HttpChannel and HttpConnection 2014-05-05 10:04:15 +02:00
Greg Wilkins 11096e8a0d Added ASYNC_WOKEN state to HttpChannelState 2014-05-03 10:29:20 +02:00
Joakim Erdfelt 1956ceffde Setting up junit Assume on OS Alias / Alternate Filename Reference support.
+ Windows 8 no longer supports the 8.3 alternate filename reference techniques, rendering the test cases for this behavior no longer valid.
2014-05-03 10:29:20 +02:00
Simone Bordet 976d86b375 434027 - ReadListener.onError() not invoked in case of read failures. 2014-05-02 23:01:33 +02:00
Greg Wilkins d17547cf96 Added ASYNC_WOKEN state to HttpChannelState 2014-04-30 14:04:28 +02:00
Greg Wilkins 95343c3535 Added ASYNC_WOKEN state to HttpChannelState 2014-04-30 13:55:50 +02:00
Joakim Erdfelt f65e40f8e7 Fixing bad EOL assumptions based on running OS (should be based on git checkout state) 2014-04-29 15:44:00 -07:00
Greg Wilkins 2e261b75d6 433692 improved buffer resizing 2014-04-29 20:36:13 +02:00
Greg Wilkins 1e8d8b8b3e 433572 default to sending date header 2014-04-28 14:50:58 +02:00
Greg Wilkins eade9a3d25 432901 ensure a single onError callback only in pending and unready states 2014-04-25 18:23:54 +02:00
Greg Wilkins 87c5b30d1c 432901 ensure a single onError callback only in pending and unready states 2014-04-25 17:26:43 +02:00
Greg Wilkins bdecc7bd89 433479 Improved resource javadoc 2014-04-25 14:36:59 +02:00
Greg Wilkins b764a1d136 433244 Security manager lifecycle cleanup 2014-04-24 15:46:08 +02:00
Greg Wilkins 4b26faf897 433244 Session manager lifecycle cleanup 2014-04-24 13:31:00 +02:00
Simone Bordet d90e6210bb 432777 - Async Write Loses Data with HTTPS Server.
Fixed by properly flipping the aggregate buffer when copying bytes to it.
2014-04-17 13:28:17 +02:00
Greg Wilkins ef400675aa 431519 Fixed NetworkTrafficListener 2014-04-10 16:20:10 +10:00