Commit Graph

958 Commits

Author SHA1 Message Date
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
Greg Wilkins de005c68fd Revert "Merge branch 'release-8'"
This reverts commit 9e72457941, reversing
changes made to df12605f0e.
2011-11-30 16:27:30 +11:00
Greg Wilkins 631b0ba1b6 [maven-release-plugin] prepare for next development iteration 2011-11-30 13:16:54 +11:00
Greg Wilkins 9d3745f999 [maven-release-plugin] prepare release jetty-8.1.0.RC0 2011-11-30 13:16:41 +11:00
Greg Wilkins 55d5020980 Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
	VERSION.txt
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
	jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
2011-11-29 09:06:25 +11:00
Greg Wilkins b969de1788 organized imports 2011-11-28 15:32:14 +11:00
Greg Wilkins ddce35a2e6 364638 SCEP does idle timestamp checking. New setCheckForIdle method controls onIdleExpired callback.
364921 a second onIdleExpired callback will result in close rather than a shutdown output.
2011-11-28 11:51:01 +11:00
Simone Bordet 8e913fe7c0 Fixed bug in AsyncEndPoint.hasProgressed() handling: the progressing status
must be remembered until a call to hasProgressed() is made.
Additional code cleanups.
2011-11-24 20:58:59 +01:00
Simone Bordet c6103f2d53 Removed usages of ThreadDeath. 2011-11-24 20:39:04 +01:00
Simone Bordet 59c111bde1 Rewritten toString() methods using String.format(). 2011-11-24 15:20:06 +01:00
Simone Bordet 7c0445f425 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2011-11-24 10:16:49 +01:00
Simone Bordet 8f1fff78c0 Improved dumping capabilities of HttpClient, and rewritten toString() methods using String.format(). 2011-11-24 10:16:19 +01:00
Greg Wilkins 1907944aef 364657 Support HTTP only cookies from standard API 2011-11-24 09:11:52 +11:00
Greg Wilkins 024cf605e5 sensible sized default buffers 2011-11-22 16:48:39 +11:00
Greg Wilkins 6cb2d13abd Client idle connection uses onIdleExpired rather than close 2011-11-22 12:57:32 +11:00
Jan Bartel 0e9449ac85 Merge remote-tracking branch 'origin/master' into jetty-8 2011-11-21 18:18:09 +11:00
Greg Wilkins a00f790bc5 fixed close on early shutdown 2011-11-21 10:25:26 +11:00
Simone Bordet 712d250d3e Merge remote-tracking branch 'origin/master' 2011-11-18 12:45:05 +01:00
Jan Bartel ef49f079c8 363488 ShutdownHandler use stopper thread 2011-11-18 15:31:43 +11:00
Simone Bordet 324f2049f3 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2011-11-17 12:40:56 +01:00
Simone Bordet d1592cf5b5 Added more SSL tests to detect spinning conditions. 2011-11-17 12:40:32 +01:00
Greg Wilkins 89d0cb765f improved siege like load tester 2011-11-17 14:45:41 +11:00
Jan Bartel cd41752b9c Merge remote-tracking branch 'origin/master' into jetty-8 2011-11-17 11:18:49 +11:00
Jan Bartel 127a5af8d7 Merge remote-tracking branch 'origin/master' into jetty-8 2011-11-17 10:59:54 +11:00
Greg Wilkins 97b48a5b93 avoid double request handling when suspended 2011-11-17 10:35:14 +11:00
Greg Wilkins 9beadb5f3a Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2011-11-15 18:01:30 +11:00
Greg Wilkins c9e08217d8 fixed read while suspended issue with double dispatch 2011-11-15 17:09:10 +11:00
Jan Bartel 8458df32cb 363381 Throw IllegalStateException if Request uri is null on getServerName 2011-11-15 14:43:09 +11:00
Greg Wilkins 722f390800 numerous findbugs inspired cleanups 2011-11-15 11:22:35 +11:00
Greg Wilkins a82d429e0b improved test 2011-11-15 08:09:16 +11:00
Jan Bartel f7c1c414b5 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2011-11-14 12:12:18 +11:00
Jan Bartel e723b90de4 363488 ShutdownHandler pollutes the log during shutdown 2011-11-14 12:11:39 +11:00
Greg Wilkins 26bf17f9c1 removed lock from HttpParser. Altered way that returnBuffers called to avoid nulling buffer for other thread 2011-11-14 12:08:21 +11:00
Simone Bordet 09999a629d Removed EndPoint.isBufferingOutput(). 2011-11-10 21:52:33 +01:00
Greg Wilkins 7cc526b9dd remove confused test 2011-11-10 15:39:17 +11:00
Greg Wilkins 921b285235 Avoid flush if no content to flush 2011-11-10 14:45:28 +11:00
Greg Wilkins 144195d435 removed redundant setConnection 2011-11-10 12:47:50 +11:00
Greg Wilkins e3cf7a8898 improved ThreadDeath handling 2011-11-10 12:40:29 +11:00
Greg Wilkins 7a9b8f1e9d reverted last changes due to instability 2011-11-10 12:11:58 +11:00
Greg Wilkins d61258ec4e clean ups from review from sbordet.
Removed isBufferred
fixed instanceof ThreadDeath
avoid race with onInputShutdown
2011-11-10 10:12:37 +11:00
Greg Wilkins af4c40d793 fixed SSL buffer pool 2011-11-09 17:39:59 +11:00
Greg Wilkins a36342438c cleaned up some unit tests 2011-11-09 17:03:11 +11:00
Greg Wilkins 4808239cbd copyright and comments 2011-11-09 08:17:56 +11:00
Greg Wilkins 5bf6f60396 copyright and comments 2011-11-09 08:13:29 +11:00