4252 Commits

Author SHA1 Message Date
Jesse McConnell
b3446fa543 Merge branch 'master' into jetty-8 2012-08-23 16:44:44 -05:00
Jesse McConnell
fd1ab0ed55 merge from master 2012-08-23 16:44:30 -05:00
Jesse McConnell
ad63e3f3f1 update parent version 2012-08-23 16:44:13 -05:00
Jesse McConnell
18cd5b455f Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2012-08-23 15:13:29 -05:00
Jesse McConnell
5761c8201b [Bug 385049] fix issue with pipelined connections when switching protocols 2012-08-23 15:11:09 -05:00
Thomas Becker
9173751438 387919: throw EOFException on early eof from client on http requests 2012-08-23 19:36:49 +02:00
Thomas Becker
2bd6cf2ebf Merge branch 'master' of ssh://git.eclipse.org:29418/jetty/org.eclipse.jetty.project 2012-08-21 11:19:02 +02:00
Thomas Becker
1721a56c6d 369349: directory with spaces --dry-run fix 2012-08-20 19:16:03 +02:00
Jesse McConnell
74e6be5097 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2012-08-20 08:34:11 -05:00
Jesse McConnell
f137b5fc38 add space between license and header 2012-08-20 08:33:06 -05:00
Greg Wilkins
c1a454c278 avoided race in FormAuth by not sending redirect until after session attribute set 2012-08-20 22:29:08 +10:00
Jan Bartel
e0276a8f65 JETTY-1515 Include cookies on 304 responses from DefaultServlet. 2012-08-20 14:52:33 +10:00
Jan Bartel
bc4f45bbfe JETTY-1532 HTTP headers decoded with platform's default encoding 2012-08-20 08:40:04 +10:00
Jesse McConnell
8e9bcf48f2 Merge branch 'master' into jetty-8 2012-08-17 14:52:03 -05:00
Jesse McConnell
5de0cee1eb merge from master + license block standardization 2012-08-17 14:50:43 -05:00
Jesse McConnell
ba8ecfbcfb format->check 2012-08-17 12:01:46 -05:00
Jesse McConnell
00ed549898 standardize license header blocks 2012-08-16 19:11:27 -05:00
Jesse McConnell
c82871b10f Merge branch 'master' into jetty-8 2012-08-16 17:10:35 -05:00
Jesse McConnell
8dc7a7b1d7 add license-check profile and header template file 2012-08-16 15:26:38 -05:00
Jan Bartel
6dbef17e44 377055 Prevent webapp classloader leaks
Use the passed in classloader as an arg to Class.forName, even though the classloader is set in AbstractPreventer as the context classloader.
2012-08-10 17:48:03 +10:00
Jan Bartel
0b4d2e6a0f 377055 Prevent webapp classloader leaks 2012-08-09 10:23:00 +10:00
Greg Wilkins
b2fd3aad26 386714 used deferred auth for form login and error pages 2012-08-08 10:37:02 +10:00
Jesse McConnell
ea6a9f8b91 Merge branch 'master' into jetty-8 2012-08-07 08:58:34 -05:00
Jesse McConnell
b4ec1f36ed [Bug 386591] add UnixCrypt note to about.html 2012-08-07 08:57:26 -05:00
Simone Bordet
ab40dee06f 367591 - Support Env variables in XmlConfiguration.
The 7.6 DTD was erroneously committed without the relevant change, which was committed to the 6.0 DTD.
2012-08-06 18:13:56 +02:00
Jan Bartel
42583e2397 Merge remote-tracking branch 'origin/master' into jetty-8 2012-08-03 19:26:53 +10:00
Jan Bartel
7b61f5f04d JETTY-1501 Setting custom error response message changes page title 2012-08-03 19:22:58 +10:00
Jan Bartel
c0dd05683b Merge remote-tracking branch 'origin/master' into jetty-8 2012-08-03 17:25:24 +10:00
Jan Bartel
3f07564274 379423 Jetty URL Decoding fails for certain international characters 2012-08-03 17:20:58 +10:00
Greg Wilkins
c998abc8bc JETTY-1527 handle requests with URIs like http://host (ie no / ) 2012-08-02 19:03:40 +10:00
Jan Bartel
4d889de159 347130 Empty getResourcePaths due to ZipFileClosedException 2012-07-31 18:31:53 +10:00
Jan Bartel
c67b2d89c0 Merge remote-tracking branch 'origin/master' into jetty-8 2012-07-27 16:05:15 +10:00
Greg Wilkins
c7c4c6e13b 379207 backported fixes from jetty-9 to make hierarchy work 2012-07-27 15:45:12 +10:00
Jan Bartel
748f06cad7 JETTY-1529 Ensure new session that has just been authenticated does not get renewed 2012-07-27 15:31:34 +10:00
Thomas Becker
2de6fa5c35 Merge branch 'master' of ssh://git.eclipse.org:29418/jetty/org.eclipse.jetty.project 2012-07-26 13:10:32 +02:00
Thomas Becker
37e0b8ffe4 spdy: StandardSession format toString method 2012-07-26 13:10:08 +02:00
Jan Bartel
cdbec2c78b Merge remote-tracking branch 'origin/master' into jetty-8 2012-07-26 19:05:51 +10:00
Jan Bartel
9164affe0c 386010 JspRuntimeContext rewraps System.err 2012-07-26 18:21:01 +10:00
Greg Wilkins
1d72a54635 better name missed the release! So support deprecated configuration 2012-07-26 17:42:29 +10:00
Greg Wilkins
bb0a564f10 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2012-07-26 17:21:34 +10:00
Thomas Becker
688eec732f version.txt update 2012-07-25 20:20:17 +02:00
Thomas Becker
b8a68b17ca 385925: make SslContextFactory.setProtocols and SslContextFactory.setCipherSuites preserve the order of the given parameters 2012-07-25 20:14:04 +02:00
hmalphettes
53105a689b Synthax to load an inner class via introspection need to use a dolloar 2012-07-25 16:03:18 +08:00
Jan Bartel
ab8e8578f8 Merge remote-tracking branch 'origin/master' into jetty-8 2012-07-23 15:35:01 +10:00
Jan Bartel
884aee31c0 385651 Message 'Address already in use' not specific enough 2012-07-23 15:29:39 +10:00
Greg Wilkins
dc7ae977ae Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2012-07-23 14:45:15 +10:00
Jan Bartel
8e0dc72b23 Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
	jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/WebBundleDeployerHelper.java
	jetty-osgi/jetty-osgi-servletbridge/pom.xml
	jetty-osgi/pom.xml
2012-07-23 13:24:57 +10:00
Jan Bartel
20ca9ad3ac Merge remote-tracking branch 'origin/master' into osgi_refactor
Remove a few System.err.printlns
2012-07-20 15:01:58 +10:00
Jan Bartel
60b90591aa Ignoring incomplete/incorrect test for now. 2012-07-20 11:12:59 +10:00
Jan Bartel
ea1033dddc Remove reference to unused class ClearablePrintWriter 2012-07-19 20:33:52 +10:00