Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-02-22 15:05:58 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,644 Commits 55 Branches 466 Tags
Commit Graph

6644 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Greg Wilkins
9079bae9c0 404323 Improved parameterization of https and SPDY 2013-03-26 13:38:28 +11:00
Jesse McConnell
25626e743d open up the close latch await to combat test failing timing issues 2013-03-25 19:54:24 -05:00
Jan Bartel
be0e2d41f4 Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-util/src/main/java/org/eclipse/jetty/util/Scanner.java
 2013-03-26 11:03:15 +11:00
Jan Bartel
28bb68a8ae Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-03-26 10:57:16 +11:00
Jan Bartel
af53d94b8b 404283 org.eclipse.jetty.util.Scanner.scanFile() dies with an NPE if listFiles() returns null 2013-03-26 10:55:37 +11:00
Jan Bartel
5ebf6996c5 404283 org.eclipse.jetty.util.Scanner.scanFile() dies with an NPE if listFiles() returns null 2013-03-26 10:18:32 +11:00
Jesse McConnell
933cbb7da2 clean up for inclusion into master 2013-03-25 13:55:19 -05:00
Jesse McConnell
3cf2f4a461 [Bug 404029] port jetty-monitor to jetty-9 and activate it 2013-03-25 13:55:19 -05:00
Simone Bordet
6a8049f126 Simplified connect Promise implementation. 2013-03-25 18:41:57 +01:00
Simone Bordet
07420547f9 Using Closeable instead of AutoCloseable. 2013-03-25 16:36:07 +01:00
Simone Bordet
679eeb7a7c Test for 404204 - Exception from inputstream cause hang or timeout. 2013-03-25 15:44:18 +01:00
Greg Wilkins
948b260b7d Merge remote-tracking branch 'origin/jetty-8' 2013-03-22 12:59:28 +11:00
Greg Wilkins
50119acb66 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-03-22 12:58:55 +11:00
Greg Wilkins
e553e2ec1f 403281 jetty.sh waits for started or failure before returning 2013-03-22 12:58:31 +11:00
Greg Wilkins
ba920bf09e updated npn example 2013-03-22 11:59:38 +11:00
Greg Wilkins
2858a2587e Merge remote-tracking branch 'origin/jetty-8' 2013-03-22 11:55:39 +11:00
Greg Wilkins
e4fb243adf Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-03-22 11:54:44 +11:00
Greg Wilkins
61be691a0c 403281 jetty.sh waits for started or failure before returning 2013-03-22 11:54:09 +11:00
Greg Wilkins
662de165a4 Merge remote-tracking branch 'origin/jetty-8' 2013-03-22 11:34:26 +11:00
Greg Wilkins
6c9f090479 removed System.outs 2013-03-22 11:34:11 +11:00
Greg Wilkins
ea5fcfd20d Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-03-22 11:32:53 +11:00
Greg Wilkins
e083f9d95a 403281 jetty.sh waits for started or failure before returning 2013-03-22 11:31:15 +11:00
Jan Bartel
bcdf071a9c 404067 If cannot connect to db fail startup of JDBCSessionIdManager 2013-03-22 10:00:05 +11:00
Joakim Erdfelt
bfb92dc18b reverting dispatched session open 2013-03-21 07:13:16 -07:00
Jan Bartel
8efcc8b566 403280 Update to javax.el 2.2.4 2013-03-21 16:56:01 +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
23ce4235d8 403817 - Use of WebSocket Session.close() results in invalid status code 
+ Fixing WebSocketSession.close() to delgate NORMAL close properly
 2013-03-20 09:28:07 -07:00
Joakim Erdfelt
dd4394aa77 403380 - Introduce WebSocketTimeoutException to differentiate between EOF on write and Timeout 2013-03-19 12:05:29 -07:00
Joakim Erdfelt
4d52c3ca8e 402984 - WebSocket Upgrade must honor case insensitive header fields in upgrade request 2013-03-19 11:28:23 -07:00
Joakim Erdfelt
a4d3740900 Merge branch 'jetty-8' -> 'master' 2013-03-18 12:34:57 -07:00
Greg Wilkins
76607e20a5 403591 do not use the ConcurrentArrayBlockingQueue for thread pool, selector and async request log 2013-03-18 16:19:58 +11:00
Greg Wilkins
2dec200c5d disabled setuid for osx until built 2013-03-18 15:41:37 +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
1eea7a2a89 Update to build with jdk1.7 which requires npn-boot jar v 1.1.5, and npn-api 1.1.0 2013-03-18 14:38:42 +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
Simone Bordet
0d2fc88384 Fixed put() and timed offer() implementations in Unbounded. 2013-03-18 01:51:24 +01: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
Greg Wilkins
7ba6bb92b0 403281 jetty.sh waits for started or failure before returning 2013-03-16 10:36:43 +11:00
Simone Bordet
d6cac8cf0d 403451 - Review synchronization in SslConnection. 
The review consisted in finding all the places where SslConnection was calling application code
and made sure those call where performed outside synchronized blocks.

The few calls that remain within synchronized blocks are SslConnection.fillInterested() and
SelectChannelEndPoint.write(...), which are dealing with the encrypted connection and do not
call application code.
 2013-03-15 16:37:56 +01:00
Simone Bordet
b66ec3d57e Made isOpen() public to avoid clashes with AbstractEndPoint. 2013-03-15 16:37:56 +01:00
Thomas Becker
e1a31f468e 403370 move frameBytes.fail() call in StandardSession.flush() outside the synchronized block to avoid deadlock 2013-03-15 15:49:05 +01:00
Joakim Erdfelt
6b9c0ac3e3 Merge branch 'jetty-7' into jetty-8 2013-03-14 23:32:19 -07:00