Commit Graph

1001 Commits

Author SHA1 Message Date
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
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
Jan Bartel 83a4bb71a3 374475 Response.sendRedirect does not encode UTF-8 characters properly 2012-04-03 17:03:26 +10:00
Greg Wilkins cc1bef6f2e 375594 fixed SSL tests so they are not order dependent 2012-04-02 18:18:39 +10:00
Jan Bartel 45050ebac9 Merge remote-tracking branch 'origin/master' into jetty-8 2012-04-02 17:49:33 +10:00
Jan Bartel 28de69760a JETTY-1504 HttpServletResponseWrapper ignored when using asyncContext? 2012-04-02 12:35:12 +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
Jan Bartel 17269583fb Merge remote-tracking branch 'origin/master' into jetty-8 2012-03-30 12:05:46 +11:00
Greg Wilkins fe8b5a6cb3 374505: ignore , as a cookie separator as per RFC6265 2012-03-29 16:58:56 +11:00
Jan Bartel 6a2c5fc9fd 375009 Filter initialization error will throw MultiException 2012-03-22 13:50:36 +11:00
Jan Bartel 9d54ea4cde JETTY-1500 form parameters from multipart request not available via request.getParameter 2012-03-20 18:35:21 +11:00
Greg Wilkins d8b1d80e4e Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
	jetty-spdy/spdy-jetty-http-webapp/pom.xml
	jetty-spdy/spdy-jetty-http/pom.xml
	jetty-spdy/spdy-jetty/pom.xml
2012-03-19 17:22:02 +11:00
Greg Wilkins 25213b83fa 374158: improved test harness 2012-03-16 09:07:20 +11:00
Simone Bordet 90ef835825 Reverted changes to SuspendHandler to make tests pass again. 2012-03-15 15:01:24 +01:00
Simone Bordet 13f0ae732d Test fixes. 2012-03-15 12:12:22 +01:00
Simone Bordet 5624a5721e Merged from master. 2012-03-14 18:24:57 +01:00
Greg Wilkins 708f8ccaeb 374158: do not asyncDispatch from SSL if suspended 2012-03-14 11:48:06 +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
Jesse McConnell 2086937a09 Merge branch 'master' into jetty-8 2012-03-08 05:35:14 -06:00
Simone Bordet c66f3d2a9d Removed @Override in interface methods to compile with JDK5. 2012-03-08 10:16:47 +01:00
Jesse McConnell 381615f52d merge from master 2012-03-07 16:44:31 -06:00
Jesse McConnell 1e941cac32 Merge "373572: fix jdk7/macos ssl issue leading to ConnectHandlerSSLTest failures" 2012-03-07 13:12:57 -05:00
Thomas Becker 511f4ea957 373572: fix jdk7/macos ssl issue leading to ConnectHandlerSSLTest failures
Change-Id: I4056d686edffe073443bb40d6f0078d9aa7a7fa6
2012-03-07 19:09:29 +01:00
Thomas Becker 3c0c010690 373569: fix jdk7/macos ssl issue leading to SSLClostTest failures
Change-Id: I7af7e71581e1e56f308a5e1ca1f8e84fcbad7413
2012-03-07 18:58:12 +01: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
Greg Wilkins de8a1b3fe4 373272: maintain the start order of aggregate beans when adding a thread pool 2012-03-06 11:47:18 +11:00
Greg Wilkins 62f36a7093 jdk-7 skip available tests for SSL 2012-03-06 10:58:13 +11:00
Jesse McConnell d8d4f727c9 Merge "369214: HotSwapHandler uses AggregateLifeCycles.addBean()" 2012-03-05 08:55:12 -05:00
Jesse McConnell b6acc24121 Merge "369214: HotSwapHandler code format" 2012-03-05 08:51:29 -05:00
Jesse McConnell e1fdbb17a5 Merge "372115: Cleanup of AsyncContextTest.java" 2012-03-05 08:41:52 -05:00
Jan Bartel 35a0386df0 373037 jetty.server.Response.setContentLength(int) should not close a Writer when length=0 2012-03-05 15:19:34 +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
Jan Bartel 959a4a2743 Merge remote-tracking branch 'origin/master' into jetty-8 2012-03-02 10:39:17 +11:00
Thomas Becker 9f68c6e6bf 369214: HotSwapHandler uses AggregateLifeCycles.addBean() 2012-03-01 15:32:22 +01:00
Thomas Becker ab5592daf0 369214: HotSwapHandler code format 2012-03-01 15:32:22 +01:00