Commit Graph

1475 Commits

Author SHA1 Message Date
Simone Bordet f5af05f0cc jetty-9: added license headers. 2012-09-21 09:19:42 +02:00
Greg Wilkins 879cdf4b82 jetty-9 further lifecycle improvements 2012-09-21 16:17:00 +10:00
Greg Wilkins 68ee346b8a jetty-9 combined the Container and AggregateLifeCycle into ContainerLifeCycle 2012-09-21 11:45:51 +10:00
Simone Bordet a0de190367 Merge branch 'jetty-9' into jetty-9-open-close 2012-09-20 19:36:34 +02:00
Simone Bordet be865fa191 jetty-9: reverted JUnit to 4.8.1; trying to upgrade it breaks the whole build. 2012-09-20 19:09:33 +02:00
Simone Bordet 37a7e5977d Merged branch 'jetty-9' into jetty-9-open-close. 2012-09-20 18:46:16 +02:00
Simone Bordet ebdab22a63 jetty-9 - Cleanup. 2012-09-20 18:44:12 +02:00
Simone Bordet 40382bad3a jetty-9 - Removed references to JUnit 3.x. 2012-09-20 18:23:02 +02:00
Simone Bordet df699cde27 jetty-9 - Cleanup and JDK7-ification. 2012-09-20 17:48:05 +02:00
Greg Wilkins 0d2627b6e9 jetty-9 improved onOpen onclose handling 2012-09-20 11:05:20 +10:00
Simone Bordet 851de69d9d jetty-9 - Third take at open/close refactoring. 2012-09-19 18:04:15 +02:00
Simone Bordet 44b3bb067c jetty-9 - Second take at open/close refactoring. 2012-09-19 13:37:47 +02:00
Simone Bordet f257f4b2bb jetty-9 - First take at open/close refactoring. 2012-09-19 13:37:47 +02:00
Simone Bordet 1f99d9dd64 jetty-9 - Cleaned up test that was still using JUnit 3.x. 2012-09-19 13:27:48 +02:00
Greg Wilkins f1d5fd1f9d jetty-9 rename ServerConnectorManager 2012-09-18 17:13:24 +10:00
Simone Bordet bc35807525 jetty-9 - Fixed test. 2012-09-17 16:21:53 +02:00
Simone Bordet 89852e0bc8 jetty-9 - Removed dead code. 2012-09-17 16:21:32 +02:00
Greg Wilkins fc49783275 jetty-9 improved test 2012-09-17 17:42:55 +10:00
Greg Wilkins 129583679a jetty-9 javadoc improvements and renamed SelectChannelConnector to ServerConnector 2012-09-17 17:37:56 +10:00
Greg Wilkins 22ba57b8d2 jetty-9 refactored onOpen and onClose 2012-09-14 17:38:47 +10:00
Joakim Erdfelt 44b963e7b8 Fixing typo 2012-09-13 10:17:30 -07:00
Greg Wilkins 9940796a32 jetty-9 xml configurations 2012-09-13 14:43:03 +10:00
Jan Bartel e1e321a243 Merge remote-tracking branch 'origin/master' into jetty-8 2012-09-13 14:10:01 +10:00
Jan Bartel 0035343af3 388675 Non utf8 encoded query strings not decoded to parameter map using queryEncoding 2012-09-13 13:35:27 +10:00
Greg Wilkins c709981aa5 jetty-9 finished refactor for oneconnector and configuration pluggability 2012-09-13 10:00:44 +10:00
Jesse McConnell a8994178f5 [maven-release-plugin] prepare for next development iteration 2012-09-10 14:18:11 -05:00
Jesse McConnell 92180a9700 [maven-release-plugin] prepare release jetty-7.6.7.v20120910 2012-09-10 14:18:01 -05:00
Jesse McConnell 10e4027579 [maven-release-plugin] prepare for next development iteration 2012-09-10 13:59:34 -05:00
Jesse McConnell 57a6258f96 [maven-release-plugin] prepare release jetty-8.1.7.v20120910 2012-09-10 13:59:10 -05:00
Jesse McConnell 1ec8b2621b [maven-release-plugin] prepare release jetty-7.6.7.v20120910 2012-09-10 13:47:05 -05:00
Jesse McConnell 62322beaa9 merge from master 2012-09-10 13:14:24 -05:00
Jesse McConnell 4180d7e1f5 prepare for release 2012-09-10 12:59:04 -05:00
Simone Bordet 18539cd903 Reverted log call at info level back to debug level. 2012-09-10 18:05:18 +02:00
Greg Wilkins 73ebe89019 jetty-9 refactored configuration 2012-09-10 20:26:14 +10:00
Greg Wilkins a15d71932f jetty-9 protection from double onFillable calls 2012-09-09 08:31:31 +10:00
Greg Wilkins 2bb425d0b2 jetty-9 improved buffer recycling 2012-09-09 07:42:03 +10:00
Simone Bordet 1c306ad89c Jetty9 - Removed code duplication for calculating the jetty version. 2012-09-06 09:16:34 +02:00
Simone Bordet 7231c82b69 Merged branch 'jetty-9' into jetty-9-client. 2012-09-06 08:41:48 +02:00
Jan Bartel 29b4418876 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-09-06 16:25:24 +10:00
Jan Bartel 605df36577 Add changeSessionId() method in preparation for servlet-3.1 2012-09-06 16:23:46 +10:00
Greg Wilkins 2dfcebfc04 jetty-9 distribution working 2012-09-06 14:54:55 +10:00
Greg Wilkins 3acf2e65ed jetty-9 moved servlet dependencies out of jetty-http 2012-09-06 09:13:17 +10:00
Greg Wilkins 0b3865d749 jetty-9 removed unused schedulers 2012-09-06 09:12:31 +10:00
Simone Bordet b18ab0e76a Jetty9 - First take at HTTP client implementation. 2012-09-04 19:20:29 +02:00
Jesse McConnell d37deeea74 [maven-release-plugin] prepare for next development iteration 2012-09-03 13:33:18 -05:00
Jesse McConnell b418b0dd57 [maven-release-plugin] prepare for next development iteration 2012-09-03 13:33:16 -05:00
Jesse McConnell 41e9b1f6e2 [maven-release-plugin] prepare release jetty-7.6.6.v20120903 2012-09-03 13:33:10 -05:00
Jesse McConnell 6c0b0af2fe [maven-release-plugin] prepare release jetty-8.1.6.v20120903 2012-09-03 13:33:08 -05:00
Jesse McConnell 6d2c793edc Merge branch 'master' into jetty-8 2012-09-03 12:48:21 -05:00
Greg Wilkins fd01a1b496 JETTY-1541 fixed different behaviour for single byte writes 2012-09-03 17:57:37 +10:00
Greg Wilkins c3776764f4 jetty-9 ConcurrentScheduler refinements 2012-09-03 15:24:36 +10:00
Greg Wilkins a922d44ce0 388652 Do not flush on handle return if request is suspended 2012-09-03 13:48:17 +10:00
Thomas Becker 842f30fb87 Additional test to make sure that jetty sends a 500 response code when an exception is thrown. 2012-08-31 15:23:47 +02:00
Greg Wilkins c3844a43c9 388502 handle earlyEOF with 500 2012-08-31 19:00:42 +10:00
Greg Wilkins 83dbca6553 jetty-9 reworked the schedulers 2012-08-31 13:22:58 +10:00
Simone Bordet 4de5b0ad63 Merged branch 'jetty-9' into jetty-9-client. 2012-08-30 17:24:49 +02:00
Thomas Becker b710701d13 HttpServerTestBase small assertion text fix 2012-08-30 16:38:43 +02:00
Thomas Becker f10729c3f8 HttpServerTestBase small assertion text fix 2012-08-30 16:13:27 +02:00
Jesse McConnell 3a0e9e1733 Merge branch 'master' into jetty-8 2012-08-30 09:09:44 -05:00
Jan Bartel c7b9081a52 Merge remote-tracking branch 'origin/master' into jetty-8 2012-08-30 16:16:44 +10:00
Simone Bordet 8920cd16b6 Jetty9 - Ported the HTTP SPDY Proxy code. 2012-08-29 18:12:28 +02:00
Simone Bordet 4180db6fae Jetty9 - Removed unnecessary _server field. 2012-08-29 18:09:18 +02:00
Thomas Becker 8fbe6c59d5 jetty-9 merge 2012-08-29 17:27:26 +02:00
Thomas Becker fe88df1def jetty-9 move SimpleHttpParser and SimpleHttpResponse to jetty-test-helper 2012-08-29 15:53:51 +02:00
Simone Bordet 1191f5ab5d Jetty9 - Added copyright header. 2012-08-28 21:57:09 +02:00
Simone Bordet d84eee0b46 Jetty9 - Reverted AbstractConnector to use MappedByteBufferPool, as ArrayByteBufferPool is leaking buffers. 2012-08-28 18:14:22 +02:00
Thomas Becker 3c952da6ed Merge branch 'master' of ssh://git.eclipse.org:29418/jetty/org.eclipse.jetty.project 2012-08-28 13:58:05 +02:00
Simone Bordet 7bbd9675cc Jetty9 - Fixed test making it more reliable. 2012-08-28 12:48:37 +02:00
Simone Bordet 34ee7101cc Jetty9 - Added calls to notify() also when calling shutdown() and earlyEOF(), to wake up threads waiting in blockForContent().
Also improved the blockForContent() loop condition, to exit when a shutdown or earlyEOF happens.
2012-08-28 09:31:30 +02:00
Simone Bordet 0acf2f9650 Jetty9 - Generified HttpChannel and HttpParser listeners to follow the generification of HttpInput. 2012-08-28 09:29:08 +02:00
Jesse McConnell cf1337264b [Bug 388073] null session id from cookie causes NPE fixed 2012-08-27 11:32:12 -05:00
Simone Bordet 5e4a2508b1 Jetty9 - Removed System.err.println(). 2012-08-27 17:34:46 +02:00
Simone Bordet c2095d7170 Jetty9 - Moved wiring of SslConnection out of HttpServerConnectionFactory.
The wiring of SslConnection in HttpServerConnectionFactory was not the
right place because a ConnectionFactory should just create the Connection
instances, not also wiring them up.
It is responsibility of the connector to wire the SslConnection in.
Moving the wiring outside HttpServerConnectionFactory fixed also a few
SPDY tests, where the wiring was already done outside (and therefore
was done twice).
2012-08-27 17:07:00 +02:00
Thomas Becker 77c03ad45f 388079: AbstractHttpConnection. Flush the buffer before shutting output down on error condition 2012-08-27 12:02:50 +02:00
Greg Wilkins 9a1a020f0e jetty-9 renamed HttpTransport.{commit|write} to send 2012-08-27 14:43:29 +10:00
Greg Wilkins d8b287134f jetty-9 improved range request processing and tests 2012-08-27 12:17:40 +10:00
Greg Wilkins 353978726b jetty-9 reverted isHead change 2012-08-27 11:14:19 +10:00
Greg Wilkins cb5dd493fb jetty-9 merged jetty-9-aggregation 2012-08-27 10:24:34 +10:00
Simone Bordet c743bf4081 Jetty9 - Using the correct length when copying bytes, otherwise BufferUnderflowExceptions are thrown. 2012-08-25 10:43:39 +02:00
Simone Bordet cda0528625 Jetty9 - Second draft of SPDY wiring: more test cases pass, still work to do. 2012-08-24 19:36:10 +02:00
Greg Wilkins 1d654a08cf jetty-9 restructured graceful shutdown 2012-08-24 20:16:23 +10:00
Simone Bordet 06b2de17d5 Merge branch 'jetty-9-aggregation' into jetty-9-spdy-http 2012-08-24 11:52:29 +02:00
Greg Wilkins e92006390e jetty-9 avoid SSL close issues with bad request responses 2012-08-24 18:06:32 +10:00
Greg Wilkins 112ee65dcc jetty-9 improved SSL shutdown input 2012-08-24 17:58:52 +10:00
Greg Wilkins c707ba11d1 jetty-9 improved SSL shutdown input 2012-08-24 17:56:22 +10:00
Greg Wilkins fac03a306b jetty-9 more server test fixes 2012-08-24 16:53:36 +10:00
Greg Wilkins 42f998fa1a jetty-9 fixed RFC2616 tests 2012-08-24 10:13:53 +10:00
Jesse McConnell fd1ab0ed55 merge from master 2012-08-23 16:44:30 -05:00
Simone Bordet 8c9d4089ed Jetty9 - Fixed and cleaned up tests to make them pass. 2012-08-23 20:36:54 +02:00
Thomas Becker 9173751438 387919: throw EOFException on early eof from client on http requests 2012-08-23 19:36:49 +02:00
Simone Bordet 5672a31432 Jetty9 - Fixed tests. 2012-08-23 18:37:55 +02:00
Simone Bordet 90029a14eb Jetty9 - Added and used shortcut method getByteBufferPool() in place of getConnector().getByteBufferPool(), also used by tests. 2012-08-23 18:36:28 +02:00
Simone Bordet c009cef661 Jetty9 - Improved tests to make them pass. 2012-08-23 18:05:43 +02:00
Simone Bordet 7a5997df9d Jetty9 - Fixed a couple of tests (bad copy/paste) and ignored 2 tests due to pending considerations about how to properly handle 100-Continue. 2012-08-23 17:18:29 +02:00
Simone Bordet f118c77f90 Jetty9 - Resetting the commit status when sending 1xx responses. 2012-08-23 17:17:13 +02:00
Simone Bordet f48f98b4d4 Jetty9 - Improved tests. 2012-08-23 16:10:58 +02:00
Simone Bordet 1ecc3c19f2 Jetty9 - Calling response.sendError() in case of application exceptions only if not committed already. 2012-08-23 16:10:35 +02:00
Simone Bordet 3b9baad1f0 Jetty9 - Improved exception message. 2012-08-23 16:09:10 +02:00
Simone Bordet 85ffa8807e Jetty9 - Cleaned up and fixed the failing tests. 2012-08-23 15:09:09 +02:00
Simone Bordet e74a5cd105 Jetty9 - Remembering the content written also in case of aggregation. 2012-08-23 15:08:36 +02:00
Simone Bordet f4fd02975d Jetty9 - The output type should be set _after_ calling setCharacterEncoding(). 2012-08-23 14:51:54 +02:00
Greg Wilkins c50e7ff742 jetty-9 moved connection:close handling to HttpChannelOverHttp 2012-08-23 19:58:42 +10:00
Greg Wilkins aaa7bf08b6 jetty-9 handle generator IOErrors 2012-08-23 18:32:34 +10:00
Greg Wilkins d59a47d376 jetty-9 simplified error handling 2012-08-23 17:32:10 +10:00
Greg Wilkins cd719bf979 jetty-9 cleanups and fixes after refactor 2012-08-23 14:07:10 +10:00
Greg Wilkins 74e632cd34 jetty-9 fixed some test fails after refactor 2012-08-23 08:39:05 +10:00
Simone Bordet ab5c8ee508 Jetty9 - More work on parser reentrancy, but more work needed. 2012-08-22 16:46:52 +02:00
Simone Bordet c6094c2398 Jetty9 - Small cleanups. 2012-08-22 11:58:21 +02:00
Simone Bordet 783a296bc5 Jetty9 - Removed redundant field and cleaned up code. 2012-08-22 10:29:41 +02:00
Simone Bordet fa06ae9762 Jetty9 - Removed old code not used anymore, greatly simplifying the implementation. 2012-08-22 09:39:03 +02:00
Simone Bordet 71e7f519c7 Jetty9 - Refactored error handling logic. 2012-08-21 23:40:08 +02:00
Simone Bordet dc140f85b7 Jetty9 - Refactored HttpChannel: moved connection logic back to HttpConnection. 2012-08-21 15:09:54 +02:00
Simone Bordet 21494f97bb Jetty9 - Refactored commit logic into HttpChannel. 2012-08-20 18:32:41 +02:00
Greg Wilkins df5e09df71 removed debugging 2012-08-20 23:32:26 +10:00
Greg Wilkins 325bfc290d jetty-9 work in progress on moving aggregation out of HttpChannel 2012-08-20 20:43:10 +10:00
Greg Wilkins 9080882900 jetty-9 do not recyle Response Writers 2012-08-20 20:35:15 +10:00
Thomas Becker 593209529b jetty-9 make TestHttpResponse inner class of SimpleHttpParser 2012-08-20 10:40:49 +02:00
Jan Bartel e0276a8f65 JETTY-1515 Include cookies on 304 responses from DefaultServlet. 2012-08-20 14:52:33 +10:00
Greg Wilkins 570bf6c580 jetty-9 added some @Overrides 2012-08-20 10:49:41 +10:00
Greg Wilkins 70b2a3f88e jetty-9 cleaned up and unit test for ContextHandler lifecycle 2012-08-20 10:45:33 +10:00
Greg Wilkins 1d89bef7a2 jetty-9 fixed context restart for constraint test 2012-08-20 10:21:07 +10:00
Greg Wilkins 4ff7ae6106 jetty-9 removed redirect race from form auth 2012-08-20 09:22:03 +10:00
Greg Wilkins 2900b4df02 jetty-9 some post merge fixes 2012-08-18 10:37:09 +10:00
Jesse McConnell 6ffaa478c4 standardize license headers 2012-08-17 16:09:49 -05:00
Joakim Erdfelt 3d1d76d214 Merge from jetty-8 to jetty-9 (license header standarization) 2012-08-17 13:44:22 -07:00
Jesse McConnell 5de0cee1eb merge from master + license block standardization 2012-08-17 14:50:43 -05:00
Thomas Becker ce6820b67b jetty-9: extract common stuff from HttpManyWaysToCommitTest and HttpManyWaysToAsyncCommitTest into abstract class 2012-08-17 21:29:13 +02:00
Thomas Becker 095a15f9e8 Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9 2012-08-17 17:35:33 +02:00
Thomas Becker be73cf1972 jetty-9: HttpManyWaysToAsyncCommitTest added 2012-08-17 17:34:53 +02:00
Greg Wilkins 086e74bed8 jetty-9 merged jetty-8
Merge remote-tracking branch 'origin/jetty-8' into jetty-9

Conflicts:
	jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
	jetty-server/src/test/java/org/eclipse/jetty/server/HttpConnectionTest.java
	jetty-util/src/main/java/org/eclipse/jetty/util/log/StdErrLog.java
	jetty-util/src/main/java/org/eclipse/jetty/util/resource/JarFileResource.java
	jetty-util/src/test/java/org/eclipse/jetty/util/log/StdErrLogTest.java
2012-08-17 23:35:42 +10:00
Greg Wilkins 7c94fd5f3c jetty-9 removed HttpParser.isPersistent 2012-08-17 22:06:55 +10:00
Thomas Becker b0537707e3 jetty-9: Small HttpManyWaysToCommitTest fixes 2012-08-17 12:45:55 +02:00
Greg Wilkins e7cad67ace jetty-9 moved more fields out of HttpChannel 2012-08-17 16:41:53 +10:00
Greg Wilkins 78a529fc9d jetty-9 moved more fields out of HttpChannel 2012-08-17 16:32:36 +10:00
Greg Wilkins 2a66567a5b jetty-9 improved handling of half close 2012-08-17 15:34:53 +10:00
Jesse McConnell 00ed549898 standardize license header blocks 2012-08-16 19:11:27 -05:00
Thomas Becker f8950b64bd merge with jetty-9 2012-08-16 09:56:51 +02:00
Thomas Becker aa22952368 interims commit 2012-08-16 09:47:33 +02:00
Greg Wilkins 6d2da78aac jetty-9 more commit fixes 2012-08-16 15:25:08 +10:00
Greg Wilkins ff76201050 jetty-9 setContentLength smaller than content written is an IllegalArgumentException 2012-08-16 14:00:14 +10:00
Greg Wilkins 4907498886 jetty-9 added Commit tests and some fixes 2012-08-16 13:27:23 +10:00
Greg Wilkins ed76d97049 jetty-9 added commit test from tbecker. Fixed issue in HttpConnection, started commenting other tests that need some changes 2012-08-16 09:02:34 +10:00
Jesse McConnell c6805c3059 smoke remaining mbean files 2012-08-15 14:22:36 -05:00
Jesse McConnell 5c3a1cfe8c removed the wrapper element from the ManagedObject annotation, rejiggered object mbean to not need wrapper, also smoking the convert concept in objectMbean in favor of dynamically discovering it where needed since its easy with annotations 2012-08-14 16:52:17 -05:00
Jesse McConnell aae7c4da68 removed managed=true from ManagedOperation and ManagedAttribute 2012-08-13 17:19:59 -05:00
Jesse McConnell 11dbce81c8 wire up way to remove the need for managed=true on ManagedAttribute 2012-08-13 16:48:52 -05:00
Jesse McConnell efce7e8421 more mbean -> annotation conversion 2012-08-13 12:41:02 -05:00
Jesse McConnell 51eac5ddf7 more mbean -> annotation conversion 2012-08-13 11:56:25 -05:00
Jesse McConnell 9f4375d1e5 add typing to context handler mbean and remove import from xmlconfiguration 2012-08-13 07:10:07 -05:00
Simone Bordet 279f24faaa Jetty9 - Removed duplicate logger definitions. 2012-08-13 11:48:32 +02:00