Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
6,313 Commits 70 Branches 462 Tags 370 MiB
Commit Graph

1526 Commits

Author SHA1 Message Date
Joakim Erdfelt 2ebdc749db [maven-release-plugin] prepare release jetty-9.0.0.RC0 2013-02-01 10:47:03 -07:00
Simone Bordet 209d5bc12f 399721 - Change <Ref id= ...> to <Ref refid= ...> 2013-02-01 13:03:11 +01:00
Jan Bartel 9194fe1b7b 399566 Running org.eclipse.jetty.server.session.MaxInactiveMigrationTest produces stack trace 2013-01-31 15:42:27 +11:00
Greg Wilkins b132663c2b jetty-9 made WebAppContext configuration additive 2013-01-31 12:21:04 +11:00
Jesse McConnell a086451bc7 [Bug 393933] remove deprecated classes/methods and consolidate some static methods to SslContextFactory 2013-01-28 16:15:34 -06:00
Jesse McConnell 2cbb630f8e Merge branch 'jetty-8' 2013-01-25 16:53:46 -06:00
Jesse McConnell f16fc7e7b7 Merge branch 'jetty-7' into jetty-8 2013-01-25 16:53:18 -06:00
Jesse McConnell 1a31067369 Add note about getCanonicalFile check and fix IdleSession test in test hash sessions 2013-01-25 16:25:59 -06:00
Jesse McConnell b3043276bc add corresponding correct file removal check 2013-01-25 16:12:08 -06:00
Jesse McConnell a7c074a86c merge from jetty-8 2013-01-25 15:32:08 -06:00
Jesse McConnell 4bed164462 Merge branch 'jetty-7' into jetty-8 2013-01-25 15:31:13 -06:00
Jesse McConnell 111bd19634 doh, header 2013-01-25 15:30:59 -06:00
Jesse McConnell d8a3b76862 Merge branch 'jetty-7' into jetty-8 2013-01-25 15:24:41 -06:00
Jesse McConnell d4568feba6 [Bug 399132] check parent dir of session store against file to be removed 2013-01-25 15:22:16 -06:00
Greg Wilkins 5435cd3365 385306 added getURI method 2013-01-25 13:52:32 +11:00
Greg Wilkins ff350c3740 Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-client/src/main/java/org/eclipse/jetty/client/BlockingHttpConnection.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/AbstractCompressedStream.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java
 2013-01-25 11:46:03 +11:00
Greg Wilkins 3c6deaf83c Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-01-25 09:43:57 +11:00
Greg Wilkins c9d026703f removed System.outs 2013-01-25 09:42:51 +11:00
Greg Wilkins fd25e3a742 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 
Conflicts:
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java
 2013-01-24 14:30:45 +11:00
Greg Wilkins 161a14d9d0 381521 Only set Vary header when content could be compressed 2013-01-24 14:07:25 +11:00
Jesse McConnell e1c516c7d1 merge from jetty-8 and update license blocks. 2013-01-11 17:04:53 -06:00
Jesse McConnell 863944873d merge from 7 and update license blocks for 2013 2013-01-11 15:01:16 -06:00
Jesse McConnell a4dbb5823c update license blocks for 2013 2013-01-11 14:57:51 -06:00
Greg Wilkins 3a0291929c removed some TODOs 2013-01-11 23:53:26 +11:00
Greg Wilkins 27c31fb403 jetty-9 organised imports. Cleaned up some TODOs 2013-01-11 16:37:32 +11:00
Greg Wilkins e6d3397c1c jetty-9 removed alias option 2013-01-11 08:50:09 +11:00
Greg Wilkins 25324b666c jetty-9 made Trie abstract and added TreeTrie for the HttpParser cache to save space 2013-01-10 17:31:57 +11:00
Greg Wilkins 3efcc2af41 Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
 2013-01-10 16:24:41 +11:00
Greg Wilkins 3cba027390 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 
Conflicts:
	jetty-server/src/test/java/org/eclipse/jetty/server/handler/ContextHandlerAliasTest.java
 2013-01-08 09:13:39 +11:00
Greg Wilkins 64ed66db8b Remove test needing java 7 2013-01-08 09:12:08 +11:00
Joakim Erdfelt 83aa65415b Fixing for JDK 6 2013-01-07 09:37:13 -07:00
Greg Wilkins 2aab780eba Merge remote-tracking branch 'origin/jetty-7' into jetty-8 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
	tests/test-integration/src/test/java/org/eclipse/jetty/test/jsp/JspMatchingTest.java
 2013-01-07 23:45:38 +11:00
Jan Bartel 96fd7dc562 Merge branch 'jetty-7' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-7 2013-01-07 20:12:49 +11:00
Jan Bartel 3265c334cb 397130 maxFormContentSize set in jetty.xml is ignored 2013-01-07 20:10:54 +11:00
Greg Wilkins ccda9bb10b 397535 Support pluggable alias checking to support symbolic links 2013-01-07 19:57:52 +11:00
Joakim Erdfelt 4037e6111f 395885 - ResourceCache should honor useFileMappedBuffer if set 2013-01-02 14:47:02 -07:00
Greg Wilkins 31def06214 jetty-9 URI parsing passed ByteBuffer so that strange query string encodings can be supported 2012-12-24 19:17:00 +11:00
Jan Bartel aa3b829fb1 Revert "395794 slightly modified fix for empty file extenstion to mime type mapping. Added a default, so it will also work with unknown file extensions" 
This reverts commit 72cdab4934.
 2012-12-24 14:11:15 +11:00
Jan Bartel 37ac5e7b16 Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpURI.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
	jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStream.java
	jetty-util/src/test/java/org/eclipse/jetty/util/MultiPartInputStreamTest.java
	jetty-util/src/test/java/org/eclipse/jetty/util/URLEncodedTest.java
 2012-12-22 16:42:33 +11:00
Jan Bartel 346918577f Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-client/src/main/java/org/eclipse/jetty/client/AsyncHttpConnection.java
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
	jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
	jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStream.java
	jetty-util/src/test/java/org/eclipse/jetty/util/MultiPartInputStreamTest.java
	jetty-webapp/src/test/java/org/eclipse/jetty/webapp/WebAppContextTest.java
	test-jetty-servlet/src/main/java/org/eclipse/jetty/testing/ServletTester.java
	test-jetty-webapp/src/main/java/com/acme/CookieDump.java
	test-jetty-webapp/src/main/java/com/acme/HelloWorld.java
 2012-12-22 15:12:17 +11:00
Greg Wilkins d4c4637f4d Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2012-12-22 12:30:20 +11:00
Greg Wilkins 810ff3802f 397110 Accept %uXXXX encodings in URIs 2012-12-22 12:00:54 +11:00
Jan Bartel 191040b736 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2012-12-21 14:00:13 +11:00
Jan Bartel 32e1d0f29c Merge remote-tracking branch 'origin/jetty-7' into jetty-8 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/Server.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
 2012-12-21 13:00:14 +11:00
Joakim Erdfelt 5e4711fdb0 Fixing confusing output 2012-12-20 17:32:34 -07:00
Joakim Erdfelt a371a8963d Fixing NPE 2012-12-20 17:30:46 -07:00
Joakim Erdfelt b65973afdd Bug 391623 - Add option to --stop to wait for target jetty to stop 
* Reworked ShutdownMonitor to better support multiple servers +
  jetty-maven-plugin requirements.
 2012-12-20 15:32:36 -07:00
Joakim Erdfelt 69b9856998 Squashing JMX warnings on jetty startup 2012-12-19 13:50:51 -07:00
Joakim Erdfelt a5c1ced201 Merge branch 'jetty-7' into jetty-7-graceful-stop 2012-12-19 12:40:46 -07:00
Thomas Becker 72cdab4934 395794 slightly modified fix for empty file extenstion to mime type mapping. Added a default, so it will also work with unknown file extensions 2012-12-18 13:09:21 +01:00