Commit Graph

561 Commits

Author SHA1 Message Date
Greg Wilkins d436400db1 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2012-05-22 14:44:17 +02:00
Greg Wilkins 077b220cf8 380212 Clear buffer if parsing fails due to full buffer 2012-05-22 14:23:40 +02:00
Greg Wilkins 40ed3a013a jetty-9 some progress on HTTP error handling but more work needed. See SelectChannelServerTest 2012-05-18 13:12:38 +02:00
Greg Wilkins 74e0063f3c jetty-9 fixed error handling state 2012-05-18 09:27:26 +02:00
Greg Wilkins b9a2661a4e jetty-9 removed HttpException 2012-05-17 15:12:45 +02:00
Greg Wilkins 6502370426 jetty-9 continue clean up of HttpConnector. Removed idle check 2012-05-17 14:14:56 +02:00
Greg Wilkins 1c319703b9 jetty-9 converted parser to consume all 2012-05-15 16:03:07 +02:00
Greg Wilkins 68f8e073db jetty-9 progress on unit tests and LocalConnector 2012-05-14 19:58:09 +02:00
Greg Wilkins 835961dca8 jetty-9 updated http tests for NEED_COMMIT changes 2012-05-11 18:18:34 +02:00
Greg Wilkins cc0266f733 jetty-9 more HttpChannel refactoring 2012-05-11 16:51:24 +02:00
Greg Wilkins d7729422f6 jetty-9 first HTTP requests handled and served 2012-05-11 10:38:57 +02:00
Greg Wilkins e348f2d4f5 jetty-9 progress on jetty-server 2012-05-10 12:19:16 +02:00
Simone Bordet 2b0cbac192 Added HttpScheme.asString(). 2012-05-09 17:09:25 +02:00
Greg Wilkins 0c81b36e04 jetty-9 work in progress on jetty-server 2012-05-09 08:30:09 +02:00
Greg Wilkins af2fe73f33 jetty-9 fixed test for compressed content 2012-05-08 17:39:27 +02:00
Greg Wilkins 6d64bcd38a jetty-9 more removal of AsyncConnection 2012-05-08 15:30:32 +02:00
Jan Bartel 2131a40559 Merge remote-tracking branch 'origin/master' into jetty-8 2012-05-07 13:54:30 +02:00
Greg Wilkins ad108c42c9 jetty-9 refactored common IOFuture pattern 2012-05-04 08:52:27 +02:00
Greg Wilkins a1d8c640ce jetty-9 removed onInputShutdown 2012-05-03 22:11:58 +02:00
Greg Wilkins c61497327a jetty-9 new jetty-io NIO.2 inspired design, mostly working but more work needed on SSL 2012-05-02 17:22:55 +02:00
Greg Wilkins c7f25b0928 jetty-9 work in progress 2012-04-26 10:03:21 +10:00
Thomas Becker 8e4f2bb412 New test for GzipFilter that tests writing a text message to the outputstream and setting the status code afterwards
Change-Id: I867b05f2e5d60cebe8a66ed373c28aaf80f5765f
2012-04-25 13:08:47 +02:00
Greg Wilkins 5e83df20c8 various sonar/findbug code cleanups 2012-04-25 00:00:54 +10:00
Jesse McConnell b64909900c [maven-release-plugin] prepare for next development iteration 2012-04-13 15:31:47 -05:00
Jesse McConnell 2c0a35d430 [maven-release-plugin] prepare release jetty-8.1.3.v20120413 2012-04-13 15:31:38 -05:00
Jesse McConnell b963840d40 [maven-release-plugin] prepare for next development iteration 2012-04-13 15:29:14 -05:00
Jesse McConnell a652ee7396 [maven-release-plugin] prepare release jetty-7.6.3.v20120413 2012-04-13 15:29:05 -05:00
Simone Bordet 72040202d4 Reverted release back to 8.1.3-SNAPSHOT. 2012-04-13 17:27:37 +02:00
Simone Bordet 85710fb9ea Reverted release back to 7.6.3-SNAPSHOT. 2012-04-13 16:59:06 +02:00
Greg Wilkins adb1d86ab8 jetty-9 work in progress 2012-04-13 12:08:46 +10:00
Jesse McConnell 3b87e91cbe [maven-release-plugin] prepare for next development iteration 2012-04-12 10:29:30 -05:00
Jesse McConnell 308b010744 [maven-release-plugin] prepare release jetty-8.1.3.v20120412 2012-04-12 10:29:20 -05:00
Jesse McConnell cdcc0922c3 [maven-release-plugin] prepare for next development iteration 2012-04-12 09:49:52 -05:00
Jesse McConnell 5966c86571 [maven-release-plugin] prepare release jetty-7.6.3.v20120412 2012-04-12 09:49:46 -05:00
Greg Wilkins f144b6562e Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java
2012-04-12 22:20:01 +10:00
Greg Wilkins f9a75984f0 374504: updated cookies for rfc6265 2012-04-12 20:24:50 +10:00
Greg Wilkins ee2d289f63 Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
	jetty-npn/pom.xml
	jetty-osgi/jetty-osgi-boot-jsp/META-INF/MANIFEST.MF
	jetty-osgi/jetty-osgi-boot-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jasper/WebappRegistrationCustomizerImpl.java
	jetty-osgi/jetty-osgi-boot-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jsp/FragmentActivator.java
	jetty-osgi/jetty-osgi-boot-logback/META-INF/MANIFEST.MF
	jetty-osgi/jetty-osgi-boot-warurl/META-INF/MANIFEST.MF
	jetty-osgi/jetty-osgi-boot/META-INF/MANIFEST.MF
	jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/WebBundleDeployerHelper.java
	jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/WebBundleTrackerCustomizer.java
	jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/utils/internal/DefaultFileLocatorHelper.java
	jetty-osgi/jetty-osgi-equinoxtools/META-INF/MANIFEST.MF
	jetty-osgi/jetty-osgi-httpservice/META-INF/MANIFEST.MF
	jetty-spdy/spdy-jetty-http-webapp/pom.xml
	jetty-spdy/spdy-jetty-http/pom.xml
	jetty-spdy/spdy-jetty/pom.xml
2012-04-12 16:02:34 +10:00
Greg Wilkins 20a3d3c12e 376424: do not recycle buffers before content consumed asynchronously 2012-04-11 18:21:39 +10:00
Thomas Becker 2b83d9d954 375692: cosmetic changes to get rid of warnings, etc.
Change-Id: Id4d76a7f6e5bd989505e5233af73d5526b8e7c1f
2012-04-02 13:41:36 +02:00
Jan Bartel 45050ebac9 Merge remote-tracking branch 'origin/master' into jetty-8 2012-04-02 17:49:33 +10:00
Greg Wilkins 9244292fca 375692: simplified gzipfilter 2012-04-02 12:09:03 +10:00
Thomas Becker 2278d27235 375692: GzipFilter support for deflate
Change-Id: I4a42d750cfbbb61078adafa1e2bcbc1973198dca
2012-03-30 11:02:44 +02:00
Greg Wilkins feca0aa672 jetty-9 rename to controller and processor 2012-03-30 02:04:12 +11:00
Greg Wilkins b267511f8f jetty-9 sketched out httpchannel blocking read 2012-03-28 23:31:39 +11:00
Greg Wilkins 2bcf611e5e jetty-9 work in progress. Further simplification of jetty-io 2012-03-27 00:19:43 +11:00
Greg Wilkins e77f4344ac jetty-9 work in progress on HttpConnection to HttpChannel split 2012-03-23 16:29:38 +11:00
Greg Wilkins dc29d73d0b jetty-9 work in progress. developing ServerConnection abstraction 2012-03-21 14:42:33 +11:00
Greg Wilkins c04a195256 jetty-9 work in progress on remaking connection contracts 2012-03-16 10:06:23 +11:00
Simone Bordet fef74963af Forgotten modifications from Jetty7 2012-03-14 19:39:21 +01:00
Simone Bordet 5624a5721e Merged from master. 2012-03-14 18:24:57 +01:00
Greg Wilkins 10cc4ca498 jetty-9 refactored jetty-http to support injected state 2012-03-13 13:35:48 +11:00
Jesse McConnell b4985ad0d5 [maven-release-plugin] prepare for next development iteration 2012-03-08 23:53:50 -06:00
Jesse McConnell 7a99af4ffe [maven-release-plugin] prepare release jetty-8.1.2.v20120308 2012-03-08 23:53:42 -06:00
Jesse McConnell 246e3ed756 [maven-release-plugin] prepare for next development iteration 2012-03-08 21:09:46 -06:00
Jesse McConnell a63b3fdc5e [maven-release-plugin] prepare release jetty-7.6.2.v20120308 2012-03-08 21:09:37 -06:00
Greg Wilkins e757e5e54d jetty-9 work in progress jetty-server 2012-03-08 21:37:03 +11:00
Greg Wilkins 40c9dd77bf jetty-9 javadoc and code cleanups 2012-03-08 15:23:45 +11:00
Greg Wilkins 03525bfe46 jetty-9 javadoc and code cleanups 2012-03-08 15:18:17 +11:00
Greg Wilkins 8c25941e04 jetty-9 jetty-http passing unit tests 2012-03-08 14:13:40 +11:00
Jesse McConnell 381615f52d merge from master 2012-03-07 16:44:31 -06:00
Greg Wilkins 3d12ef7075 jetty-9 work in progress 2012-03-07 17:26:33 +11:00
Jesse McConnell 50d92ec8ef reset versions 2012-03-06 17:07:53 -06:00
Jesse McConnell f12e3c390c reset versions 2012-03-06 17:06:10 -06:00
Jan Bartel 0c4450dc5d JETTY-1409 GzipFilter will double-compress application/x-gzip content 2012-03-05 14:10:47 +11:00
Jesse McConnell d1c8c477ea [maven-release-plugin] prepare for next development iteration 2012-03-02 08:57:43 -06:00
Jesse McConnell b75868e84f [maven-release-plugin] prepare release jetty-8.1.2.v20120302 2012-03-02 08:57:19 -06:00
Jesse McConnell 51311d050e [maven-release-plugin] prepare for next development iteration 2012-03-02 08:37:46 -06:00
Jesse McConnell a8296ec3d5 [maven-release-plugin] prepare release jetty-7.6.2.v20120302 2012-03-02 08:37:38 -06:00
Jesse McConnell 72330dc5f3 Merge branch 'master' into jetty-8 2012-03-02 08:08:29 -06:00
Greg Wilkins 3892549202 370285: chunk content if merged with new content 2012-03-02 16:48:48 +11:00
Greg Wilkins a4bee5b12d jetty-9 work in progress on new HttpGenerator 2012-03-02 11:39:42 +11:00
Jesse McConnell 0731cbe64d Merge branch 'master' into jetty-8 2012-02-22 14:42:39 -06:00
Thomas Becker 19fae56d6d 372190: HttpContent.getIndirectBuffer() close InputStream null check 2012-02-22 09:26:17 -06:00
Thomas Becker 94c979f2b2 372190: HttpContent.getIndirectBuffer() close InputStream 2012-02-22 07:55:19 -06:00
Jesse McConnell ac79497dee [maven-release-plugin] prepare for next development iteration 2012-02-15 14:29:36 -06:00
Jesse McConnell 3705b424c8 [maven-release-plugin] prepare release jetty-8.1.1.v20120215 2012-02-15 14:29:28 -06:00
Jesse McConnell efb6883cf0 [maven-release-plugin] prepare for next development iteration 2012-02-15 14:22:19 -06:00
Jesse McConnell baf2b94f77 [maven-release-plugin] prepare release jetty-7.6.1.v20120215 2012-02-15 14:22:12 -06:00
Jesse McConnell 098428dd37 Merge branch 'master' into jetty-8 2012-02-15 13:49:23 -06:00
Simone Bordet adeb18093b Made _bypass field protected.
This is needed because the _content field is also protected, and subclasses
may need to know if the generator is in bypass mode (and therefore access
the _content buffer directly).
2012-02-14 23:05:41 +01:00
Greg Wilkins 1fa6c998db jetty-9 committed to taking the IO out of the generator as well now. This is currently a total work in progress... with a lot of work to do 2012-02-10 17:15:04 +11:00
Greg Wilkins 5c725d4e42 jetty-9 committed to taking the IO out of the generator as well now. This is currently a total work in progress... with a lot of work to do 2012-02-10 16:37:46 +11:00
Greg Wilkins 824509b0fb jetty-9 removed plurals from enum type names 2012-02-10 00:42:44 +11:00
Greg Wilkins efb6f84503 jetty-9 more compile fixes 2012-02-09 23:55:22 +11:00
Greg Wilkins 2659d87868 jetty-9 HttpParser tests passing 2012-02-09 23:27:49 +11:00
Greg Wilkins 1137eea51d jetty-9 more parser tests working 2012-02-09 10:55:36 +11:00
Greg Wilkins 60bb4a415e jetty-9 used enums instead of cached strings. Refactor of parser in progress to IO independent style. passes 1 test 2012-02-09 01:37:03 +11:00
Greg Wilkins c1bcec61d5 jetty-9 jetty-io mostly working with all NIO buffers. Occassional failure in SSL stress test 2012-02-07 11:32:00 +11:00
Jesse McConnell 6b079ae3d8 merge from master 2012-02-01 17:25:08 -06:00
Joakim Erdfelt fdaad62b63 Migrating old javax.* deps to new org.eclipse.jetty.orbit deps
+ Removed old deps in javax.*, geronimo, and asm in favor of
  new org.eclipse.jetty.orbit deps
+ Added enforcer rule to prevent reintroducing the old deps.
2012-01-31 15:21:58 -07:00
Jesse McConnell 6e44f4db5f [maven-release-plugin] prepare for next development iteration 2012-01-27 08:15:45 -06:00
Jesse McConnell 9d1ca3593e [maven-release-plugin] prepare release jetty-8.1.0.v20120127 2012-01-27 08:15:38 -06:00
Jesse McConnell ad6126553b [maven-release-plugin] prepare for next development iteration 2012-01-27 08:13:06 -06:00
Jesse McConnell 4e25f7bb05 [maven-release-plugin] prepare release jetty-7.6.0.v20120127 2012-01-27 08:13:00 -06:00
Jesse McConnell f2d0fd3cc8 revert back to 8.1.0-SNAPSHOT 2012-01-26 10:45:06 -06:00
Jesse McConnell 7ac9eb585f revert back to 7.6.0-SNAPSHOT 2012-01-26 10:42:11 -06:00
Jesse McConnell e98ae91ca6 [maven-release-plugin] prepare for next development iteration 2012-01-25 11:16:11 -06:00
Jesse McConnell fb30166a7f [maven-release-plugin] prepare release jetty-8.1.0.v20120125 2012-01-25 11:16:05 -06:00
Jesse McConnell 0c96fc40ea [maven-release-plugin] prepare for next development iteration 2012-01-25 09:31:06 -06:00
Jesse McConnell b455b7d94e [maven-release-plugin] prepare release jetty-7.6.0.v20120125 2012-01-25 09:30:55 -06:00