Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,486 Commits 65 Branches 460 Tags 355 MiB
Commit Graph

4486 Commits

Author SHA1 Message Date
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
Jan Bartel a4c547d61f Make JspMatchingTest work with jsp 2.1 using maven command line build 2013-01-07 19:18:53 +11:00
Jan Bartel 64df770b42 Make new JspMatchingTest work with jsp2.2 for jetty-8 2013-01-07 12:34:57 +11:00
Jan Bartel d2c2e8693f Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-01-07 10:38:48 +11:00
Jan Bartel fc9cbbf876 397321 - Wrong condition in default start.config for annotations 2013-01-07 10:36:03 +11:00
Joakim Erdfelt c23f722286 Reverting validation changes to FileResource and disabling tests 2013-01-02 10:32:16 -07:00
Jesse McConnell c1e5b0b80c [Bug 397111] Tolerate empty or excessive whitespace preceeding MultiParts 2012-12-31 15:57:28 -03:00
Jesse McConnell 455fe8c3b1 [Bug 397111] Tolerate empty or excessive whitespace preceeding MultiParts 2012-12-31 15:52:53 -03:00
Joakim Erdfelt 9fde0c56ab Merge branch 'jetty-7' into jetty-8 2012-12-27 14:22:57 -07:00
Joakim Erdfelt 1da584003a Moving new tests from test-jetty-webapp as a webapp to test-integration as embedded 2012-12-27 13:53:38 -07:00
Joakim Erdfelt 9009f6abbf Adding safety checks for FileResource references with null characters. 
* Adding testcase for Jsp + DefaultServlet w/aliasing turned on
  with null characters in the request url.
* Adding validateUri() method to FileResource
 2012-12-27 11:44:19 -07:00
Joakim Erdfelt 2591ceb8f5 Fixing testcase 2012-12-27 09:57:20 -07:00
Jesse McConnell 863109b552 resolving merge issue 2012-12-27 13:49:31 -03:00
Jesse McConnell 525aa8b208 [Bug 397190] improve ValidUrlRule to iterate on codepoints 2012-12-27 13:26:47 -03:00
Joakim Erdfelt 6fca5fc6f9 Found valid Unicode URI that fails ValidUrlRule 2012-12-27 08:09:07 -07:00
Jan Bartel 23e41673bf Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2012-12-24 14:45:16 +11:00
Jan Bartel f0a9930693 397112 Requests with byte-range throws NPE if requested file has no mimetype (eg no file extension) 2012-12-24 13:52:28 +11:00
Jan Bartel 49d7c0c87d Merge remote-tracking branch 'origin/jetty-7' into jetty-8 
Conflicts:
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
 2012-12-22 14:37:14 +11:00
Jan Bartel 3a236c6735 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 
Conflicts:
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
 2012-12-22 14:05:29 +11:00
Jan Bartel 0420365f82 397111 Allow multipart bodies with leading blank lines 
Also trim any leading space from FIRST boundary
 2012-12-22 14:00:46 +11:00
Jan Bartel c9135e34c9 397111 Allow multipart bodies with leading blank lines 2012-12-22 12:38:28 +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
Jan Bartel 7202631515 396886 MultiPartFilter strips bad escaping on filename="..." 2012-12-20 13:48:45 +11:00
Joakim Erdfelt a5c1ced201 Merge branch 'jetty-7' into jetty-7-graceful-stop 2012-12-19 12:40:46 -07:00
Joakim Erdfelt 128cf0a6b4 396886 - MultiPartFilter strips bad escaping on filename="..." 2012-12-18 18:19:17 -07:00
Jan Bartel 43c9bba86d 393158 java.lang.IllegalStateException when sending an empty InputStream 2012-12-17 18:40:50 +11:00
Jan Bartel f9e76b1620 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 
Conflicts:
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
	jetty-util/src/main/java/org/eclipse/jetty/util/ReadLineInputStream.java
 2012-12-14 11:48:55 +11:00
Jan Bartel aacc8a1712 396459 Log specific message for empty request body for multipart mime requests 2012-12-14 11:02:44 +11:00
Jan Bartel 892cafd9a3 396459 Log specific message for empty request body for multipart mime requests 2012-12-14 10:42:58 +11:00
Greg Wilkins a478271828 JETTY-1533 handle URL with no path 2012-12-13 07:59:21 +11:00
Thomas Becker b1a7779bd2 393220 remove dead code from ServletHandler and log ServletExceptions in warn instead of debug 2012-12-12 19:27:31 +01:00
Greg Wilkins 979d6dbbf9 367638 throw exception for excess form keys 2012-12-08 10:05:32 +11:00
Joakim Erdfelt 7abd512b32 391623 - Making --stop with STOP.WAIT perform graceful shutdown 
+ Moving jetty-start Monitor to jetty-server ShutdownMonitor and
  using ShutdownThread to perform a graceful shutdown instead.
 2012-12-04 10:18:54 -07:00
Joakim Erdfelt 7488452e8a Adding some debugging 2012-12-03 14:55:22 -07:00
Joakim Erdfelt 57849a905f Adding -Dtest.slow.destroy support to CookieDump to aid in testing of 
start.jar -DSTOP.WAIT=360 --stop
 2012-12-03 13:04:03 -07:00
Joakim Erdfelt 7c0f7cc8f4 Fixing for JDK5. 2012-12-03 12:55:37 -07:00
Greg Wilkins d269015c7d Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2012-11-30 09:09:22 +11:00
Greg Wilkins 61a0d48df4 395394 allow logging from boot classloader 2012-11-30 08:33:56 +11:00