Commit Graph

1001 Commits

Author SHA1 Message Date
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
Simone Bordet ef23bf11b8 Merged from origin/master. 2011-12-21 10:45:06 +01:00
Jan Bartel 55c98c010e Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2011-12-21 12:59:14 +11:00
Jan Bartel 2028bbb444 JETTY-1465 NPE in ContextHandler.toString 2011-12-21 12:57:33 +11:00
Greg Wilkins 93a89026ce 364921 Improved timeout tests 2011-12-21 12:44:50 +11:00
Jan Bartel c3643d9937 Merge remote-tracking branch 'origin/master' into jetty-8 2011-12-21 12:37:23 +11:00
Greg Wilkins 569e930185 367048 test harness for guard on suspended requests 2011-12-20 11:13:45 +11:00
Greg Wilkins f767d8d910 367048 improved handleRequest guard for suspended requests 2011-12-19 15:15:00 +11:00
Simone Bordet 3e05c1e59d Merged from origin/master. 2011-12-16 21:30:45 +01:00
Joakim Erdfelt 2b626be186 Minor fixes for Windows build isues 2011-12-15 16:04:07 -07:00
Jan Bartel e515b5b7dc JETTY-1460 suppress PrintWriter exceptions 2011-12-15 20:19:04 +11:00
Greg Wilkins bc48eb1f5b 366730 pass the time idle to onIdleExpire 2011-12-14 11:41:32 -08:00
Jan Bartel 0b1becf58d 364936 use Resource for opening URL streams 2011-12-08 12:16:36 +11:00
Jan Bartel 0363b8100f Merge remote-tracking branch 'origin/master' into jetty-8 2011-12-05 15:24:22 +11:00
Jan Bartel 15ab626410 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2011-12-05 08:31:49 +11:00
hmalphettes 89afbdf31d 360245 OSGi: javax.servlet packages version refactored 3.0 -> 2.6 2011-12-02 17:27:26 +08:00
Jan Bartel c6480fc659 365375 ResourceHandler should be a HandlerWrapper 2011-12-02 15:32:33 +11:00
Greg Wilkins 7e9fbc7493 handle no jetty-dir css 2011-12-02 09:43:15 +11:00