Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-02-24 16:35:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,285 Commits 55 Branches 466 Tags
Commit Graph

913 Commits

Author SHA1 Message Date
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