Commit Graph

4322 Commits

Author SHA1 Message Date
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
Jan Bartel 3c6a6fa8e0 383304 Reset PrintWriter on response recycle
Backout changes based on jdk1.6 method and replace by nulling out AbstractHttpConnection._writer object.
2012-07-19 20:14:41 +10:00
Jan Bartel 999f66b6a8 383304 PrintWriter error flag not recycled 2012-07-19 15:32:33 +10:00
Thomas Becker e274379a7f add cla-tbecker.txt 2012-07-17 21:37:33 +02:00
Jesse McConnell 29fda3a7d8 merge 2012-07-17 11:01:04 -05:00
Jesse McConnell 3baa4e78de Merge branch 'release-8' into jetty-8 2012-07-17 10:39:43 -05:00
Jesse McConnell 3530da5515 reset for dev 2012-07-17 10:39:28 -05:00
Jesse McConnell c8909d578c Merge branch 'release' 2012-07-17 10:38:58 -05:00
Jesse McConnell db2118df4a reset for dev 2012-07-17 10:38:35 -05:00
Jesse McConnell 136514948f [maven-release-plugin] prepare for next development iteration 2012-07-16 13:24:49 -05:00
Jesse McConnell 1bbc677a09 [maven-release-plugin] prepare release jetty-8.1.5.v20120716 2012-07-16 13:24:42 -05:00
Jesse McConnell f755d014cd [maven-release-plugin] prepare for next development iteration 2012-07-16 13:23:59 -05:00
Jesse McConnell 04b7e807a0 [maven-release-plugin] prepare release jetty-7.6.5.v20120716 2012-07-16 13:23:53 -05:00
Jesse McConnell 88922d3dc9 set for release 2012-07-16 12:58:26 -05:00
Jesse McConnell 5e8165e2db set for release 2012-07-16 12:58:15 -05:00
Jesse McConnell 43f7000902 Merge branch 'jetty-8' into release-8 2012-07-16 12:57:38 -05:00
Jesse McConnell 69e0a83601 Merge branch 'master' into release 2012-07-16 12:56:08 -05:00
Jesse McConnell e082da1ce0 reset for release 2012-07-16 12:55:44 -05:00
Jesse McConnell c00bb2d6ca reset for release 2012-07-16 12:55:22 -05:00
Jesse McConnell f59b2a0632 reset release 2012-07-16 12:54:36 -05:00
Jesse McConnell 957d39da17 merge master 2012-07-16 12:51:18 -05:00
Thomas Becker e7658ba829 385136: set header prefix in IncludableGzipFilter to make sure that header is being set 2012-07-16 18:57:16 +02:00
Jesse McConnell ef86919672 [Bug 385138] add getter for session path and max cookie age that seemed to disappear in a merge long ago 2012-07-16 11:38:55 -05:00
Greg Wilkins cca2484389 384847 better name 2012-07-16 15:42:51 +10:00
Jan Bartel b62473b58f 384896 JDBCSessionManager fails to load existing sessions on oracle when contextPath is / 2012-07-16 14:10:53 +10:00
Jesse McConnell 5a09de7f11 Merge branch 'release-8' into jetty-8 2012-07-13 12:25:59 -05:00
Jesse McConnell fc7c186cbf reset for dev 2012-07-13 12:25:39 -05:00
Jesse McConnell 9315ed8b73 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2012-07-13 12:24:50 -05:00
Jesse McConnell 8ac5a2c488 Merge branch 'release' 2012-07-13 12:24:38 -05:00
Jesse McConnell 9353ef6461 reset for dev 2012-07-13 12:24:20 -05:00
Jesse McConnell 205e8f74f0 [maven-release-plugin] prepare for next development iteration 2012-07-13 10:20:48 -05:00