1265 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
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
a5c1ced201 Merge branch 'jetty-7' into jetty-7-graceful-stop 2012-12-19 12:40:46 -07: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
Greg Wilkins
a478271828 JETTY-1533 handle URL with no path 2012-12-13 07:59:21 +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
Jan Bartel
8241089364 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2012-11-23 14:45:34 +11:00
Jan Bartel
769260f251 392417 Prevent Cookie parsing interpreting unicode chars 2012-11-23 12:29:53 +11:00
Greg Wilkins
e42b5bf970 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2012-11-22 16:35:26 +11:00
Jan Bartel
90a86d3a6b Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2012-11-22 16:26:38 +11:00
Greg Wilkins
14162c6154 394514 Preserve URI parameters in sendRedirect 2012-11-22 16:10:19 +11:00
Jan Bartel
8920fcc128 394829 Session can not be restored after SessionManager.setIdleSavePeriod has saved the session 2012-11-22 15:50:01 +11:00
Greg Wilkins
9ab2a96715 removed incorrect log.info from listener initialiser 2012-11-12 13:05:06 +11:00
Greg Wilkins
3d3b035b22 Merge remote-tracking branch 'origin/jetty-7' into jetty-8
Conflicts:
	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DefaultServletTest.java
2012-11-12 09:08:53 +11:00
Greg Wilkins
75aedbbf45 393947 implement ETags and update gzip filter to handle them 2012-11-11 09:52:26 +11:00
Greg Wilkins
b3274a6baa Merge remote-tracking branch 'origin/jetty-7' into jetty-8
Conflicts:
	VERSION.txt
2012-11-08 14:41:01 +11:00
Greg Wilkins
e615504889 392492 expect headers only examined for requests>=HTTP/1.1 2012-11-08 14:37:07 +11:00
Jesse McConnell
bb27f561c1 [maven-release-plugin] prepare for next development iteration 2012-11-05 12:24:06 -06:00
Jesse McConnell
1d767e99a3 [maven-release-plugin] prepare release jetty-8.1.8.v20121105 2012-11-05 12:23:59 -06:00
Jesse McConnell
70d591c430 [maven-release-plugin] prepare for next development iteration 2012-11-05 12:16:03 -06:00
Jesse McConnell
017826b4eb [maven-release-plugin] prepare release jetty-7.6.8.v20121105 2012-11-05 12:15:57 -06:00
Jan Bartel
f3af8c8650 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2012-11-05 16:28:25 +11:00
Jan Bartel
fff825a997 393494 HashSessionManager can't delete unrestorable sessions on Windows 2012-11-05 16:26:20 +11:00
Greg Wilkins
8723408731 Merge remote-tracking branch 'origin/jetty-7' into jetty-8
Conflicts:
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
2012-11-02 13:17:53 +11:00
Greg Wilkins
65202e9abe 393363 Use Locale.ENGLISH for all toUpperCase and toLowerCase calls 2012-11-02 11:55:00 +11:00
Jan Bartel
e93aa7d42c Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2012-10-26 09:39:53 +11:00
Jan Bartel
8a9d25a48b 392641 JDBC Sessions not scavenged if expired during downtime 2012-10-26 09:26:40 +11:00
Jan Bartel
0ad8913034 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2012-10-18 16:43:03 +11:00
Jan Bartel
f6c1ade82f Refactor AbstractSession to remove _jdbcAttributes 2012-10-18 14:40:22 +11:00
Jan Bartel
785e06d347 390108 Servlet 3.0 API for programmatic login doesn't appear to work 2012-10-12 19:00:28 +11:00
Jan Bartel
7625f0b8b3 Merge remote-tracking branch 'origin/master' into jetty-8 2012-10-11 16:34:16 +11:00
Jesse McConnell
f26b792782 [Bug 391483] fix bad javadoc example in shutdown handler 2012-10-09 15:23:01 -05:00
Jan Bartel
31807b7892 391188 Files written with Request.getPart().write(filename) should not be auto-deleted 2012-10-08 11:09:41 +11:00
Jan Bartel
36a2ed10be 391080 Multipart temp files can be left on disk from Request.getPart and getParts 2012-10-04 18:31:09 +10:00
Jan Bartel
25cdef966c 391080 Multipart temp files can be left on disk with MultiPartFilter 2012-10-04 15:24:23 +10:00
Jan Bartel
e1e321a243 Merge remote-tracking branch 'origin/master' into jetty-8 2012-09-13 14:10:01 +10:00
Jan Bartel
0035343af3 388675 Non utf8 encoded query strings not decoded to parameter map using queryEncoding 2012-09-13 13:35:27 +10:00
Jesse McConnell
a8994178f5 [maven-release-plugin] prepare for next development iteration 2012-09-10 14:18:11 -05:00