8514 Commits

Author SHA1 Message Date
Joakim Erdfelt
d426138d0b Fixing logic error in max length for ByteAccumulator 2013-11-06 17:30:49 -07:00
Simone Bordet
dbd404fa03 Fixed jetty-proxy module definition and XML.
The module definition had the wrong dependencies and the XML file was
starting a new Server instance instead of configuring the default one.
Updated properties to match the new configuration.
2013-11-05 23:53:56 +01:00
Simone Bordet
03983102e6 Merged branch 'master' into 'jetty-9.1'. 2013-11-05 09:58:34 +01:00
Simone Bordet
40fa764863 Catching Throwable everywhere and closing channels when necessary to
avoid leaks.
2013-11-05 09:42:50 +01: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
aba3a41a34 More fixes for Windows build 2013-11-04 16:50:18 -07:00
Joakim Erdfelt
c366c6b356 Adding .gitattributes to help Windows? 2013-11-04 15:02:19 -07: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
Jesse McConnell
57791f54e8 Merge branch 'release-9.1' into jetty-9.1 2013-11-04 15:24:04 -06: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
17bf8ccee0 420359 - Support 0 acceptors for ServerConnector
improved javadoc
2013-11-04 17:13:19 +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
Joakim Erdfelt
2c2bc46211 Fixing compilation errors 2013-11-03 11:38:38 -07: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
Joakim Erdfelt
6f1eb712e9 Cleaning up imports 2013-11-01 10:03:40 -07:00
Joakim Erdfelt
50a960ef70 410656 - WebSocketSession.suspend() hardcoded to return null 2013-11-01 10:01:42 -07: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
a76ddc1c6a 420572 IOTest explicitly uses 127.0.0.1 2013-11-01 12:17:30 +11:00
Jesse McConnell
d31ef2e396 [maven-release-plugin] prepare for next development iteration 2013-10-31 16:36:27 -05:00
Jesse McConnell
c85e7d365c [maven-release-plugin] prepare release jetty-9.1.0.RC1 jetty-9.1.0.RC1 2013-10-31 16:36:16 -05:00
Jesse McConnell
a365e9ae11 Merge branch 'jetty-9.1' into release-9.1 2013-10-31 16:10:32 -05:00
Greg Wilkins
37ea88d299 fixed bad merge 2013-11-01 08:09:26 +11:00
Jesse McConnell
6db55c3863 set for release 2013-10-31 14:56:41 -05:00
Jesse McConnell
54726c67a7 Merge branch 'jetty-9.1' into release-9.1 2013-10-31 14:55:04 -05:00
Simone Bordet
b1e277af21 Refactored addition of proxy headers into two methods,
to allow subclasses to override this behavior more easily.
2013-10-31 10:12:58 +01: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
845c08970e 417933 - logging.mod ini template should include commented log.class settings 2013-10-30 13:14:22 -07:00
Joakim Erdfelt
1705825346 417932 - resources.mod should make ${jetty.base}/resources/ directory 2013-10-30 13:11:27 -07:00
Joakim Erdfelt
ed4d8241ca 418923 - Missing parameterization of etc/jetty-proxy.xml 2013-10-30 09:29:57 -07:00
Joakim Erdfelt
035d839534 418922 - Missing parameterization of etc/jetty-xinetd.xml 2013-10-30 09:29:57 -07:00
Joakim Erdfelt
513d2ca758 Fixing @WebSocket(maxBinaryMessageSize=#} handling 2013-10-30 09:29:57 -07:00
Joakim Erdfelt
e2da5fc7f1 Removing unused imports 2013-10-30 09:29:57 -07:00
Joakim Erdfelt
12ec4e74ed enabling pipeline tests 2013-10-30 09:29:57 -07:00
Jan Bartel
44ce72164e 420687 XML errors in jetty-plus/src/test/resources/web-fragment-*.xml 2013-10-30 10:52:02 +11:00
Simone Bordet
edcb39cc89 Catching Throwable and closing channels rigorously. 2013-10-29 10:03:31 +01: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
Jan Bartel
e9925bcba2 Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-10-29 12:26:58 +11:00
Jan Bartel
b6a306a6b8 420530 AbstractLoginModule never fails a login
Conflicts:
	jetty-jaas/src/main/java/org/eclipse/jetty/jaas/spi/AbstractLoginModule.java
	jetty-jaas/src/main/java/org/eclipse/jetty/jaas/spi/PropertyFileLoginModule.java
2013-10-29 12:24:03 +11:00
Simone Bordet
c822ee4f82 Make sure we never exit the selector loop unless stopped. 2013-10-28 12:19:16 +01:00
Simone Bordet
3066b673e9 Merged branch 'master' into 'jetty-9.1'. 2013-10-28 11:18:09 +01:00