Commit Graph

1606 Commits

Author SHA1 Message Date
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
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
Joakim Erdfelt 96d045442f [maven-release-plugin] prepare release jetty-9.0.0.v20130307 2013-03-07 19:14:11 -07:00
Greg Wilkins b7aded6e55 392129 fixed merged of handling of timeouts after startAsync 2013-03-08 11:22:07 +11:00
Greg Wilkins ae7248b6d2 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
	jetty-server/src/main/java/org/eclipse/jetty/server/AsyncContinuation.java
	jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/AbstractDoSFilterTest.java
2013-03-08 11:21:05 +11:00
Greg Wilkins face3b3584 392129 fixed handling of timeouts after startAsync 2013-03-08 09:35:08 +11:00
Jan Bartel f714504acc Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionManager.java
2013-03-07 12:56:42 +11:00
Jan Bartel 621b1489e1 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-03-07 12:17:20 +11:00
Jan Bartel a636fbfe7b 400142 ConcurrentModificationException in JDBC SessionManger
As part of this fix, refactored the JDBCSession to remove the SessionData object.
2013-03-07 12:02:27 +11:00
Greg Wilkins e283d72f25 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSessionIdManager.java
2013-03-07 09:09:23 +11:00
Greg Wilkins 60a6340f8f Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-03-07 08:36:23 +11:00
Greg Wilkins 1e0b9d4d97 402485 reseed secure random 2013-03-07 08:34:42 +11:00
Jesse McConnell 778ee1411b [maven-release-plugin] prepare for next development iteration 2013-03-06 10:21:46 -06:00
Jesse McConnell d916078711 [maven-release-plugin] prepare release jetty-9.0.0.v20130306 2013-03-06 10:21:38 -06:00
Greg Wilkins 0f415a735a 399799 do not hold lock while calling invalidation listeners 2013-03-05 17:05:50 +11:00
Greg Wilkins 0c941a878d Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-03-05 14:42:55 +11:00
Greg Wilkins 777817dd0f 399799 do not hold lock while calling invalidation listeners 2013-03-05 14:32:17 +11:00
Greg Wilkins 3bc0411e65 401904 fixed getRemoteAddr to return IP instead of hostname 2013-03-04 17:10:27 +11:00
Greg Wilkins 8933a8bdca less verbose exception 2013-03-04 16:22:03 +11:00
Greg Wilkins 7d7769475c removed printStackTrace 2013-03-04 15:44:30 +11:00