Commit Graph

1118 Commits

Author SHA1 Message Date
Jesse McConnell 9ccd059375 [maven-release-plugin] prepare release jetty-7.6.4.v20120522 2012-05-22 14:33:59 -05:00
Jan Bartel 34954bc617 Merge remote-tracking branch 'origin/master' into jetty-8 2012-05-22 17:28:40 +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 e002fc4a5e 367608 - ignore the aysncrequestreadtest as it is known to fail and is waiting for a fix 2012-05-22 12:01:09 +02:00
Jan Bartel 2131a40559 Merge remote-tracking branch 'origin/master' into jetty-8 2012-05-07 13:54:30 +02:00
Jan Bartel 50ebafb286 378487 Null out contextPath on Request.recycle 2012-05-04 15:58:38 +02:00
Jan Bartel 1ca8eb030d 377610 New session not timed out if an old session is invalidated in scope of same request 2012-05-02 16:41:32 +02:00
Thomas Becker 011ae1f447 377587: UnitTest for ConnectHandler.write() with partial writes and non full buffer.
Change-Id: I8a8a3d57cba7a9c3502d1b6af6ff6eb5ac4e4ef5

377587: UnitTest for ConnectHandler.write() with partial writes and non full buffer.

Change-Id: I8d104d54de55e22325d14e69b474b245fe9d126c
2012-04-27 11:13:44 +02:00
Greg Wilkins 925340c72b handle setting null charset 2012-04-26 08:03:29 +10:00
Greg Wilkins b5d377ab26 377587 ConnectHandler write will block on partial write 2012-04-25 11:19:43 +10:00
Jan Bartel 7da85a2719 377323 Request#getParts() throws ServletException when it should be throwing IllegalStateException 2012-04-24 17:25:08 +10:00
Simone Bordet 107d3a4492 Removed duplicate logger. 2012-04-23 16:25:21 +02:00
Simone Bordet ef7057a4f1 Made testCONNECTAndPOSTWithBigBody() send a bigger body to exercise SelectChannelEndPoint.blockWritable(). 2012-04-20 15:07:36 +02: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
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
Thomas Becker 3a94e45050 372115: Cleanup of AsyncContextTest.java 2012-03-01 15:14:56 +01:00
Jan Bartel 97c37f68ba 372487 JDBCSessionManager does not work with Oracle 2012-03-01 17:05:54 +11:00
Jan Bartel c7b42cdb06 Merge remote-tracking branch 'origin/master' into jetty-8 2012-02-29 20:07:33 +11:00
Greg Wilkins 4530cf9e0c 372115: set pathInContext for suspend with request (without debug) 2012-02-28 13:28:58 +11:00
Greg Wilkins 763bd6b190 372115: set pathInContext for suspend with request 2012-02-28 13:25:45 +11:00
Greg Wilkins 8e1b863deb 371903: modified patch for jetty-7 2012-02-27 18:45:19 +11:00
Thomas Becker 265d35324a 371903: Implement servlet 3.0 spec change (spec section 9.4) to not commit response in Dispatcher.forward() when request.isAysncStarted()
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2012-02-27 16:46:15 +11:00
Greg Wilkins 7a58f3408e 371635: set all async attributes when the request is suspended 2012-02-27 16:32:50 +11:00
Jesse McConnell 8b20316efc Merge branch 'master' into jetty-8 2012-02-24 06:48:50 -06:00
Simone Bordet c9c5bd3b47 372457 - Big response + slow clients + pipelined requests cause Jetty spinning and eventually closing connections. 2012-02-24 10:40:22 +01:00
Jesse McConnell eed2a2a0f7 Merge from master 2012-02-21 11:38:28 -06:00
Jesse McConnell a90c3201e8 [Bug #371635] and [Bug #371649] add missing attributes (non-optimal) and resolve async flow issue with scoping 2012-02-21 10:34:11 -06:00
Jesse McConnell 92fc45a77f fix version string in snapshot running of jetty8 2012-02-17 11:46:01 -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
Jan Bartel b949fb7622 JETTY-1484 Add option for HashSessionManager to delete session files if it can't restore them 2012-02-09 19:21:10 +11:00
Simone Bordet c7814d88d7 Added factory method for HttpGenerator. 2012-02-08 18:45:24 +01:00
Simone Bordet 74faad2ef6 Merge branch 'spdy' 2012-02-07 14:06:25 +01:00
Simone Bordet b0119e4d62 Forwarded HttpParser.EventHandler methods from the inner class to the outer class (AbstractHttpConnection itself)
to allow other protocols such as SPDY to fake the emission of HTTP events by calling the EventHandler methods.
2012-02-07 14:05:40 +01:00
Joakim Erdfelt 9207423ca0 Fixing JDK5 build abort due to bad javadocs 2012-02-06 10:01:44 -07:00
Jesse McConnell 6b079ae3d8 merge from master 2012-02-01 17:25:08 -06:00
Jesse McConnell f98aa75b8f a couple more pom tweaks 2012-02-01 15:27:33 -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 c918bb4e3c Merge branch 'master' into jetty-8 2012-01-25 10:31:44 -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
Greg Wilkins 067e3f17cb avoid NPE with jdk 7u4ea8 changed behaviour of SslContext init 2012-01-23 16:58:29 +11:00
Greg Wilkins e1b12a633b Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
	jetty-distribution/pom.xml
	jetty-osgi/test-jetty-osgi/pom.xml
2012-01-20 13:00:32 +11:00
Greg Wilkins 8e69edaf9e 368992 avoid non-blocking flush when writing to avoid setting !_writable without _writeblocked 2012-01-20 12:40:34 +11:00
Jan Bartel 98684397fd Merge remote-tracking branch 'origin/master' into jetty-8 2012-01-18 14:17:41 +11:00
Greg Wilkins 3e04cac272 JETTY-1475 made output state fields volatile to provide memory barrier for non dispatched thread IO 2012-01-18 14:16:09 +11:00
Greg Wilkins 9ff8633554 368821 SslConnection.handle always calls wrapped Connection.handle, so state can be processed 2012-01-18 13:39:24 +11:00
Jan Bartel 1ac71de645 368632 Remove superfluous removal of org.apache.catalina.jsp_file 2012-01-18 07:41:16 +11:00
Jesse McConnell 90184ab3c3 Latest merge from master 2012-01-17 13:36:44 -06:00
Greg Wilkins c1b2eedadc 368773 process data constraints without realm 2012-01-17 22:53:53 +11:00
Greg Wilkins 50fe23882a 368787 always set token view to new header buffers in httpparser 2012-01-17 15:24:52 +11:00
Greg Wilkins ef9ac7760d 368635 moved lifecycle state reporting from toString to dump 2012-01-16 15:24:31 +11:00
Jan Bartel cd1e2ba88b 368113 Support servlet mapping to "" 2012-01-13 08:58:38 +11:00
Greg Wilkins b8e0258faf Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
	jetty-server/src/test/java/org/eclipse/jetty/server/SelectChannelTimeoutTest.java
2012-01-12 11:01:03 +11:00
Thomas Becker f81a8a3d9c 367716: Enhance maxIdleTests for SelectChannelTimeout
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2012-01-11 17:07:50 +01:00
Jan Bartel 691efcc7ca Merge remote-tracking branch 'origin/master' into jetty-8 2012-01-11 16:35:57 +11:00
Greg Wilkins 1697fcfa5a 368060 do not encode sendRedirect URLs 2012-01-11 12:23:04 +11:00
Greg Wilkins 2d24eb8240 368191: fixed numerical overflow converting seconds to ms 2012-01-11 12:17:26 +11:00
Greg Wilkins d0b81a185c 367638: 361316: protected multipart filter from DoS 2012-01-11 11:51:04 +11:00
Greg Wilkins cb22cfdbe5 368240: renamed to use manage/unmanage instead of join/disjoin 2012-01-11 11:06:14 +11:00
Simone Bordet a42721f321 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2012-01-10 20:55:45 +01:00
Jesse McConnell 49b3239aa6 clear up the last of the maven warnings I see 2012-01-10 13:45:39 -06:00
Simone Bordet 297625b446 Removed redundant code and cleaned up. 2012-01-10 17:42:52 +01:00
Simone Bordet bb0a320102 Improved toString(). 2012-01-10 17:41:32 +01:00
Greg Wilkins 8fcc22df32 368240: Improved handling of dispatch failure 2012-01-11 01:12:36 +11:00
Greg Wilkins 968a2ac95b 368240: Added concept of join to AggregateLifeCycle. Used by HttpClient and AbstractConnector 2012-01-11 00:09:34 +11:00
Jan Bartel 1fbec51c8a Merge remote-tracking branch 'origin/master' into jetty-8 2012-01-10 16:08:59 +11:00
Thomas Becker 9ba96f22dd 367974: Calculate wait times, etc. based on MAX_IDLE_TIME 2012-01-09 11:42:26 +11:00
Greg Wilkins 2451614381 366774 removed XSS vulnerbility 2012-01-09 11:38:07 +11:00
Thomas Becker c88a4551ae 366774: NumberFormatException when parsing Host header now causes a 400 return code 2012-01-09 11:33:06 +11:00
Thomas Becker bbaef55bd6 366774: Request.java code format 2012-01-09 11:31:11 +11:00
Greg Wilkins 90e9358ea5 367716 simplified maxIdleTime logic 2012-01-09 11:16:30 +11:00
Greg Wilkins 588b068c06 replaced break in finally with progres=false 2012-01-09 08:53:19 +11:00
Thomas Becker 07afebafe5 367716: maxIdleTime fixes
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2012-01-05 13:31:36 +01:00
Thomas Becker d6e841beae 367716: maxIdleTime fixes for async http and new maxIdleTime tests
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2012-01-05 13:31:24 +01:00
Greg Wilkins 3141b50fa0 Merge remote-tracking branch 'origin/master' into jetty-8 2011-12-30 20:19:39 +11:00
Greg Wilkins 085c79d7d6 637638 limit number of form parameters to avoid DOS 2011-12-30 12:00:18 +11:00
Greg Wilkins 009f8176a1 JETTY-1467 close half closed when idle 2011-12-28 23:09:33 +11:00
Greg Wilkins bb2d782f3e Merge remote-tracking branch 'origin/master' into jetty-8 2011-12-23 02:09:20 +11:00
Greg Wilkins a4bba4f99c 364921 Made test less time sensitive for ssl 2011-12-23 01:23:59 +11:00
Greg Wilkins b4ab738ca9 364921 Made test less time sensitive for ssl 2011-12-23 00:57:26 +11:00
Greg Wilkins d5f4b157d9 Merge remote-tracking branch 'origin/master' into jetty-8 2011-12-23 00:38:35 +11:00
Greg Wilkins 4fc12483aa Merge branch 'jetty-8' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-8 2011-12-23 00:38:27 +11:00
Greg Wilkins 31471e11cc 364921 Made test less time sensitive 2011-12-23 00:35:32 +11:00
Jan Bartel 0dfc9feaf9 367383 jsp-config element must be returned for ServletContext.getJspConfigDescriptor 2011-12-22 19:30:01 +11:00
Greg Wilkins b36425b7aa Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
2011-12-22 09:52:11 +11:00
Greg Wilkins b99e03c465 364921 moved setCheckForIdle handling to AsyncHttpConnection 2011-12-22 00:48:25 +11:00