1681 Commits

Author SHA1 Message Date
Greg Wilkins
e9185aa062 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-04-04 16:09:19 +11:00
Greg Wilkins
3cd6d90e9f removed verbose output 2013-04-04 15:38:15 +11:00
Jan Bartel
7523c5234c Merge remote-tracking branch 'origin/master' into servlet-3.1-api
Conflicts:
	jetty-jsp/pom.xml
2013-04-04 13:31:33 +11:00
Simone Bordet
b312fffd7e 402666 - Improve handling of TLS exceptions due to raw socket close. 2013-03-29 16:57:05 +01:00
Greg Wilkins
5b3d866a27 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2013-03-28 16:03:34 +11:00
Greg Wilkins
7db1b36be9 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
	jetty-server/src/test/java/org/eclipse/jetty/server/ssl/SslBytesServerTest.java
2013-03-28 15:04:42 +11:00
Jan Bartel
af5f8aac33 403122 Session replication fails with ClassNotFoundException when session attribute is Java dynamic proxy 2013-03-28 15:02:33 +11:00
Greg Wilkins
1f9e4f3e5c Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-03-28 14:05:24 +11:00
Greg Wilkins
72162c0342 404517 Close connection if request received after half close 2013-03-28 14:04:24 +11:00
Greg Wilkins
fd099aa77d 404511 Replaced all StringMap usage with Tries 2013-03-28 13:20:47 +11:00
Jan Bartel
370df6e723 404036 JDBCSessionIdManager.doStart() method should not call cleanExpiredSessions() because Listeners can't be notified 2013-03-26 23:45:28 +11:00
Greg Wilkins
108a8e9dca 404326 set status when Request.setHandled(true) is called 2013-03-26 23:36:31 +11:00
Greg Wilkins
8c405f4503 404323 Improved parameterization of https and SPDY 2013-03-26 16:29:48 +11:00
Greg Wilkins
9079bae9c0 404323 Improved parameterization of https and SPDY 2013-03-26 13:38:28 +11:00
Greg Wilkins
6c9f090479 removed System.outs 2013-03-22 11:34:11 +11:00
Jan Bartel
bcdf071a9c 404067 If cannot connect to db fail startup of JDBCSessionIdManager 2013-03-22 10:00:05 +11:00
Jan Bartel
7c2321b9d4 403510 HttpSession maxInactiveInterval is not serialized in HashSession 2013-03-21 12:23:52 +11:00
Greg Wilkins
b2f3a05503 403591 do not use the ConcurrentArrayBlockingQueue for thread pool, selector and async request log 2013-03-21 09:24:02 +11:00
Joakim Erdfelt
bb7a1d4ca6 396562 - Add an implementation of RequestLog that supports Slf4j 2013-03-20 13:17:14 -07:00
Joakim Erdfelt
a4d3740900 Merge branch 'jetty-8' -> 'master' 2013-03-18 12:34:57 -07:00
Jan Bartel
279dff381c Merge remote-tracking branch 'origin/master' into servlet-3.1-api
Conflicts:
	jetty-osgi/pom.xml
	jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
	jetty-servlets/pom.xml
	tests/test-webapps/test-jetty-webapp/pom.xml
2013-03-18 16:00:23 +11:00
Greg Wilkins
8514e8452b 403591 use the ConcurrentArrayBlockingQueue for thread pool, selector and async request log 2013-03-18 15:37:00 +11:00
Jan Bartel
b69b52d984 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-03-18 15:27:10 +11:00
Jan Bartel
25f5e38e13 403513 jetty:run goal cannot be executed twice during the maven build 2013-03-18 14:33:49 +11:00
Greg Wilkins
5f1980f408 merged unsafe blocking Q, removed unsafe usage and usage of Q 2013-03-18 13:27:37 +11:00
Greg Wilkins
ba9d70589a Merge branch 'master' into unsafe 2013-03-18 12:02:37 +11:00
Greg Wilkins
47bf3eef0c use async request log by default 2013-03-18 11:09:50 +11:00
Greg Wilkins
e8d76ef12c Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	examples/embedded/src/main/java/org/eclipse/jetty/embedded/SpdyServer.java
	jetty-client/src/test/java/org/eclipse/jetty/client/HttpExchangeTest.java
	jetty-io/src/test/java/org/eclipse/jetty/io/ThreadLocalBuffersTest.java
	jetty-server/src/main/config/etc/jetty-requestlog.xml
	jetty-server/src/test/java/org/eclipse/jetty/server/AsyncStressTest.java
	jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestFixture.java
	jetty-server/src/test/java/org/eclipse/jetty/server/StressTest.java
	jetty-servlets/pom.xml
2013-03-18 11:09:13 +11:00
Greg Wilkins
d21c8e5ca4 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-03-18 10:53:14 +11:00
Greg Wilkins
63f2719938 403570 Asynchronous Request Logging 2013-03-18 10:48:06 +11:00
Jan Bartel
b15f9340d0 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-03-15 14:40:19 +11:00
Jan Bartel
41feea7e01 402844 STOP.PORT & STOP.KEY behaviour has changed 2013-03-15 14:38:53 +11:00
Greg Wilkins
c577783fa6 inject new Q into ThreadPool 2013-03-15 12:30:49 +11:00
Joakim Erdfelt
8a96cc8c4a Merge branch 'jetty-7' into jetty-8 2013-03-14 16:54:35 -07:00
Joakim Erdfelt
5084a1430f Fixing build.
+ Bumping jetty-test-helper to 2.0
 + Bumping jetty-version-maven-plugin to 1.0.10
 + Fixing JDK 1.5 build warts
 + Updating Stress use for new "test.stress" property introduced by upgrades
2013-03-14 16:52:52 -07:00
Thomas Becker
93efdcf080 384552 add comment to jetty-https.xml describing keymanager password 2013-03-14 11:23:55 +01:00
Greg Wilkins
29b83dff9b 402626 Do not required endpoint host checking by default 2013-03-14 09:25:28 +11:00
Jesse McConnell
acb5919844 [maven-release-plugin] prepare for next development iteration 2013-03-12 09:10:50 -05:00
Jesse McConnell
d6ebdc0a4a [maven-release-plugin] prepare release jetty-7.6.10.v20130312 2013-03-12 09:10:42 -05:00
Jesse McConnell
0405c8ded6 [maven-release-plugin] prepare for next development iteration 2013-03-12 09:05:25 -05:00
Jesse McConnell
852178cd01 [maven-release-plugin] prepare release jetty-8.1.10.v20130312 2013-03-12 09:05:14 -05:00
Jan Bartel
0834ad259c 402706 HttpSession.setMaxInactiveInterval(int) does not change JDBCSession expiry 2013-03-11 19:31:39 +11:00
Greg Wilkins
11442814fa Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
2013-03-11 17:23:54 +11:00
Joakim Erdfelt
bbf44a5d32 Merge branch 'release-9' 2013-03-09 06:16:25 -07:00
Joakim Erdfelt
897c35c2cb [maven-release-plugin] prepare for next development iteration 2013-03-08 11:33:23 -07:00
Joakim Erdfelt
cc6196af50 [maven-release-plugin] prepare release jetty-9.0.0.v20130308 2013-03-08 11:33:15 -07:00
Jan Bartel
f1cd726ba2 Merge remote-tracking branch 'origin/jetty-8' 2013-03-08 14:27:24 +11:00
Jan Bartel
9055132144 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-03-08 13:45:56 +11:00
Jan Bartel
57cff606fd 400144 When loading a session fails the JDBCSessionManger produces duplicate session IDs 2013-03-08 13:33:48 +11:00
Joakim Erdfelt
7fc38f6c0f [maven-release-plugin] prepare for next development iteration 2013-03-07 19:14:19 -07:00