Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-02-24 00:17:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,388 Commits 55 Branches 466 Tags
Commit Graph

1806 Commits

Author SHA1 Message Date
Greg Wilkins
42f82e1e3c Merge remote-tracking branch 'origin/master' into jetty-9.1 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java
 2013-11-07 17:18:01 +11:00
Greg Wilkins
1db4f4e431 allow for HttpConnection extensions 2013-11-07 16:13:48 +11:00
Simone Bordet
4024708bbc Connection and NetworkConnector now implements Closeable, 
rather than AutoCloseable, since they deal with I/O.
 2013-11-05 09:41:49 +01:00
Joakim Erdfelt
4bd1a041f7 Merge branch 'jetty-9.1' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9.1 2013-11-04 15:00:17 -07:00
Joakim Erdfelt
2c9ea8d4b7 Windows build fixes 2013-11-04 14:59:47 -07:00
Greg Wilkins
3bb17e5029 Merge branch 'jetty-9.1' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9.1 2013-11-04 17:41:13 +11:00
Jan Bartel
cafb13ea89 HashedSession deIdles itself via getMaxInactiveInterval every time scavenger is run 2013-11-04 17:36:37 +11:00
Jan Bartel
4073e772c4 Use File.createTempFile for test output directory for RequestTest 2013-11-04 17:36:37 +11:00
Greg Wilkins
36c807c2f3 417223 - removed deprecated ThreadPool.dispatch 2013-11-04 17:21:50 +11:00
Greg Wilkins
55fafc4c3a 418741 - Threadlocal cookie buffer in response 2013-11-04 16:39:24 +11:00
Greg Wilkins
74272663e6 420359 - Support 0 acceptors for ServerConnector 2013-11-04 16:16:54 +11:00
Greg Wilkins
f567bddad9 global clean up imports 2013-11-04 13:48:03 +11:00
Greg Wilkins
eb3bb660b5 Merge remote-tracking branch 'origin/master' into jetty-9.1 
Conflicts:
	jetty-client/src/main/java/org/eclipse/jetty/client/util/DigestAuthentication.java
	jetty-client/src/test/java/org/eclipse/jetty/client/HttpReceiverTest.java
	jetty-client/src/test/java/org/eclipse/jetty/client/HttpSenderTest.java
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpField.java
	jetty-server/src/test/java/org/eclipse/jetty/server/AbstractHttpTest.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/AbstractDoSFilterTest.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/HeadersBlockGenerator.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/HeadersBlockParser.java
	jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/ClientUpgradeRequest.java
	jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketFrame.java
	jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSession.java
	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/DeflateCompressionMethodTest.java
	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/PerMessageDeflateExtensionTest.java
 2013-11-03 18:22:09 +11:00
Mikhail Mazursky
6b0269a16d [Bug 420930] Use Charset to specify character encoding 
Signed-off-by: Mikhail Mazursky <mikhail.mazursky@gmail.com>
 2013-11-02 14:44:36 +06:00
Greg Wilkins
8d9e6dbd64 420692 set soTimeout to try to avoid hang 2013-11-01 16:54:58 +11:00
Greg Wilkins
852be79a3c Merge remote-tracking branch 'origin/master' into jetty-9.1 
Conflicts:
	jetty-server/src/test/java/org/eclipse/jetty/server/HttpConnectionTest.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
 2013-11-01 14:45:16 +11:00
Greg Wilkins
56fcfa45fb 420844 Connection:close on exceptional errors 2013-11-01 13:37:44 +11:00
Greg Wilkins
c64dad6066 Merge remote-tracking branch 'origin/master' into jetty-9.1 
Conflicts:
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
 2013-10-31 14:40:54 +11:00
Greg Wilkins
466725e343 420776 complete error pages after startAsync 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextTest.java
 2013-10-31 14:16:34 +11:00
Joakim Erdfelt
1705825346 417932 - resources.mod should make ${jetty.base}/resources/ directory 2013-10-30 13:11:27 -07:00
Joakim Erdfelt
035d839534 418922 - Missing parameterization of etc/jetty-xinetd.xml 2013-10-30 09:29:57 -07:00
Joakim Erdfelt
12ec4e74ed enabling pipeline tests 2013-10-30 09:29:57 -07:00
Simone Bordet
00867b094b Making classes implement Closeable, rather than AutoCloseable, 
since it is more semantically correct.
 2013-10-29 10:03:31 +01:00
Greg Wilkins
4b87c4683d Merge remote-tracking branch 'origin/master' into jetty-9.1 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
 2013-10-28 10:22:16 +11:00
Greg Wilkins
979ddd958b fixed merge 2013-10-28 10:17:55 +11:00
Greg Wilkins
960c03b8ac 419350 Do not borrow space from passed arrays 2013-10-28 10:14:12 +11:00
Greg Wilkins
121e725740 Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-10-28 09:59:47 +11:00
Greg Wilkins
de75b82f99 419350 Do not borrow space from passed arrays 2013-10-28 09:59:05 +11:00
Greg Wilkins
05cab9bfb4 Merge remote-tracking branch 'origin/master' into jetty-9.1 
Conflicts:
	jetty-client/src/main/java/org/eclipse/jetty/client/HttpSender.java
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/StatisticsHandler.java
 2013-10-26 11:01:25 +11:00
Joakim Erdfelt
5965e695fa Cleaning up modules 2013-10-24 14:06:50 -07:00
Greg Wilkins
28566c72c8 420142 reimplemented graceful shutdown 2013-10-24 17:22:08 +11:00
Greg Wilkins
d6e301d7fd Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-10-24 16:02:35 +11:00
Greg Wilkins
ac3787b167 420033 AsyncContext.onTimeout exceptions passed to onError 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
	jetty-server/src/main/java/org/eclipse/jetty/server/AsyncContinuation.java
	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextTest.java
 2013-10-24 15:33:08 +11:00
Greg Wilkins
d5f83a8159 420034 Removed threads/timers from Date caching 2013-10-24 11:09:17 +11:00
Joakim Erdfelt
ebf11ebfb8 Fixing javadoc 2013-10-23 16:59:30 -07:00
Greg Wilkins
353357e816 Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-10-23 11:28:55 +11:00
Greg Wilkins
55b279cc3d 420048 - DefaultServlet alias checks configured resourceBase 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
 2013-10-23 08:00:30 +11:00
Jan Bartel
c5fe3bcfd3 Merge remote-tracking branch 'origin/master' into jetty-9.1 
Conflicts:
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
	jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyWebAppContext.java
	jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/MavenAnnotationConfiguration.java
 2013-10-21 17:27:45 +11:00
Greg Wilkins
cd1035d1d6 minor code cleanups 2013-10-21 16:30:22 +11:00
Greg Wilkins
33e2055468 minor code cleanups 2013-10-21 15:50:22 +11:00
Greg Wilkins
ffffd3938c fixed merge 2013-10-21 14:56:23 +11:00
Greg Wilkins
565bd3b331 419937 - Request isSecure cleared on recycle 2013-10-21 13:25:47 +11:00
Greg Wilkins
82a991dd07 Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-10-21 12:32:54 +11:00
Greg Wilkins
24c1b30495 418732 - Add whiteListByPath mode to IPAccessHandler 
Fixed the contribution.

The PathMap changes were not correct as "" is the pattern for "/" path only.
Also removed the use of the lazy list
 2013-10-21 12:20:34 +11:00
Jan Bartel
ad64ca831a 419846 JDBCSessionManager doesn't determine dirty state correctly 2013-10-21 12:16:04 +11:00
Joakim Erdfelt
d6d54e048b Merge branch 'master' into jetty-9.1 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ErrorPageErrorHandler.java
	jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/UpgradeConnection.java
	jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/WebSocketClientTest.java
	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/AnnotatedMaxMessageSizeTest.java
 2013-10-18 16:12:00 -07:00
Constantine Linnick
f451a14e04 [Bug 418732] Add whiteListByPath mode to IPAccessHandler 
Signed-off-by: Constantine Linnick <theaspect@gmail.com>
 2013-10-18 01:10:35 -04:00
Constantine Linnick
b4052a2b53 [Bug 418732] Swap PathMap with IPAddressMap, also fix PathMap initialization bug 
Signed-off-by: Constantine Linnick <theaspect@gmail.com>
 2013-10-18 01:05:44 -04:00
Greg Wilkins
b31466839a 419799 Async timeout dispatches to error page 
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/handler/ErrorHandler.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ErrorPageErrorHandler.java
	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextTest.java
 2013-10-18 14:50:01 +11:00
Greg Wilkins
f3b393aa5d Refactored complexity out of HttpFields 
In preparation of merging Fields class and supporting HTTP/2.0 HPACK
 2013-10-17 21:35:11 +11:00