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
5965e695fa
Cleaning up modules
2013-10-24 14:06:50 -07:00
Simone Bordet
0c80567c12
Using StandardCharset fields instead of Charset.forName().
2013-10-21 16:14:18 +02:00
Simone Bordet
2d6190da59
Refactored class Fields to a better API.
2013-10-18 13:55:49 +02:00
Simone Bordet
16b317ea60
418212 - org.eclipse.jetty.spdy.server.http.SSLExternalServerTest
...
hangs.
2013-10-17 10:44:39 +02:00
Simone Bordet
e85f34612c
419344 - NPNServerConnection does not close the EndPoint if it reads
...
-1.
Fixed by correctly handling the -1 read, closing the connection.
Also covered additional error cases, making sure the connection is
closed.
2013-10-14 13:29:47 +02:00
Simone Bordet
8fec401b06
419344 - NPNServerConnection does not close the EndPoint if it reads
...
-1.
Fixed by correctly handling the -1 read, closing the connection.
Also covered additional error cases, making sure the connection is
closed.
2013-10-14 13:26:00 +02:00
Greg Wilkins
33b10efcaa
Merge remote-tracking branch 'origin/release-9'
2013-10-14 11:12:31 +11:00
Thomas Becker
081e7d3bbd
415609 spdy replace SessionInvoker with IteratingCallback. Introduce Flusher class to separate queuing/flushing logic from StandardSession
2013-10-11 10:51:05 +02:00
Simone Bordet
3886cc2dc5
Merged branch 'jetty-9.1' into 'http_client_connection_factories'.
2013-10-08 15:08:07 +02:00
Simone Bordet
25d9b8704f
417356 - Add SOCKS support to jetty client.
...
Big refactoring to allow for additional proxy schemes that work at a
lower level than HTTP.
Introduced client-side ConnectionFactory, and binding that to a
HttpDestination, so that connections to that destination will use the
same ConnectionFactory.
The destination's ConnectionFactory is now initialized from the proxy
configuration and the transport, which is now itself a
ConnectionFactory.
The proxy configuration has also changed becoming polymorphic by
introducing a new ProxyConfiguration.Proxy abstract class,
which is implemented as HTTPProxy and can be implemented in future as
SOCKS4Proxy (and possibly others).
2013-10-08 15:06:39 +02:00
Joakim Erdfelt
9daf520994
Adding @Test(timeout=60000) to prevent build hang
2013-10-04 15:27:10 -07:00
Simone Bordet
8eaedc4a5e
Code cleanups.
...
Removed unused parameters, and renamed property "executeOnFillable"
to "dispatchIO", for similarity with HttpClient and for better
description (it names the concept, not the implementation detail).
2013-10-04 16:40:27 +02:00
Joakim Erdfelt
499d811ba7
Merge branch 'master' into jetty-9.1
2013-09-30 20:00:26 -07:00
Joakim Erdfelt
1315096192
Disabling broken external server test
2013-09-30 20:00:02 -07:00
Greg Wilkins
2d7f1a2272
ignore test dependent on external server
2013-10-01 11:18:09 +10:00
Jesse McConnell
856a24b65a
[maven-release-plugin] prepare for next development iteration
2013-09-30 14:46:09 -05:00
Jesse McConnell
f466f03c6a
[maven-release-plugin] prepare release jetty-9.0.6.v20130930
2013-09-30 14:46:00 -05:00
Jesse McConnell
0b3f431d27
set version back to 9.0.6-SNAPSHOT
2013-09-30 12:33:06 -05:00
Jesse McConnell
af2e6ff911
Merge branch 'master' into release-9
2013-09-30 12:28:04 -05:00
Joakim Erdfelt
8d312b9e5d
418212 - org.eclipse.jetty.spdy.server.http.SSLExternalServerTest hangs
...
+ Adding timeout on test
2013-09-27 11:40:35 -07:00
Joakim Erdfelt
273f61210e
418212 - org.eclipse.jetty.spdy.server.http.SSLExternalServerTest hangs
...
+ Adding timeout on test
2013-09-27 11:39:52 -07:00
Thomas Becker
2ef4a4fb1c
fix SimpleHTTPBenchmarkTest
2013-09-23 15:07:47 +02:00
Thomas Becker
bfb90523d6
SPDY remove unnecessary flush calls
2013-09-23 14:39:49 +02:00
Greg Wilkins
f2f8ec54c6
Merge remote-tracking branch 'origin/master' into jetty-9.1
...
Conflicts:
aggregates/jetty-all/pom.xml
examples/embedded/src/main/java/org/eclipse/jetty/embedded/MinimalServlets.java
examples/embedded/src/main/java/org/eclipse/jetty/embedded/SecuredHelloHandler.java
2013-09-23 13:38:43 +10:00
Jesse McConnell
0525498ad3
[maven-release-plugin] prepare for next development iteration
2013-09-19 15:06:31 -05:00
Jesse McConnell
c05a725db6
[maven-release-plugin] prepare release jetty-9.0.6.v20130919
2013-09-19 15:06:17 -05:00
Thomas Becker
5346e06d4a
417289 SPDY replace use of direct buffers with indirect buffers or make it configurable
2013-09-19 15:43:07 +02:00
Greg Wilkins
156c936754
comments explaining other NPN boot versions
2013-09-12 18:35:16 +10:00
Jan Bartel
710806b4fd
Update npn mod for different version of npn boot jar
2013-09-12 13:01:56 +10:00
Jan Bartel
b24928db81
Move npn profiles to parent pom so that npn.version is available to other modules (eg osgi)
2013-09-12 11:55:21 +10:00
Jan Bartel
be2ecca599
Move npn profiles to parent pom so that npn.version is available to other modules (eg osgi)
2013-09-12 10:06:01 +10:00
Simone Bordet
c49ba7bdcc
Merged branch 'master' into 'jetty-9.1'.
2013-09-11 09:16:39 +02:00
Simone Bordet
9910db17cb
Added profile for JDK 1.7.0_40.
2013-09-11 09:15:39 +02:00
Greg Wilkins
070ce9dd22
Merge remote-tracking branch 'origin/master' into jetty-9.1
...
Conflicts:
jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
2013-09-09 15:41:17 +10:00
Mikhail Mazursky
767faece5c
[Bug 415999] Fix some of FindBugs warnings
...
Mostly not closed streams/DB resources are fixed. But also less
important things.
Signed-off-by: Mikhail Mazursky <mikhail.mazursky@gmail.com>
2013-09-09 00:24:31 -04:00
Simone Bordet
3cdf4dece1
Refactored some behaviour to base classes to ease the FCGI
...
implementation, and taken the chance to remove redundant code.
2013-09-07 00:36:31 +02:00
Simone Bordet
e09415145f
Removed unchecked warning.
2013-09-06 23:38:46 +02:00
Greg Wilkins
ace43502ad
refined start.jar mechanism to align with updated documentation
2013-09-06 16:10:03 +10:00
Greg Wilkins
5c3f498624
create directories on module ini
2013-09-06 13:06:15 +10:00
Simone Bordet
4663fa4992
Renamed "Empty" inner classes to "Adapter" to comply with the rest of
...
the codebase.
2013-09-04 13:15:23 +02:00
Greg Wilkins
2e444d2f17
Merge remote-tracking branch 'origin/master' into jetty-9.1
...
Conflicts:
jetty-io/src/main/java/org/eclipse/jetty/io/AbstractConnection.java
jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestBase.java
jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/proxy/ProxyHTTPSPDYConnection.java
2013-09-02 17:00:07 +10:00
Thomas Becker
d22fa0dae1
416251 ProxyHTTPToSPDYConnection now sends a 502 to the client if it receives a rst frame from the upstream spdy server
2013-08-30 17:22:11 +02:00
Thomas Becker
85c0f47337
416251 ProxyHTTPToSPDYConnection now sends a 502 to the client if it receives a rst frame from the upstream spdy server
2013-08-30 17:22:05 +02:00
Thomas Becker
669ee75720
415548 migrate ProxyHTTPToSPDYTest to use HttpClient to avoid intermittent NPE part 2
2013-08-30 17:21:59 +02:00
Thomas Becker
8ba45188db
merge ProxyHTTPSPDYConnection change with 9.1
2013-08-30 17:19:47 +02:00
Thomas Becker
8e4bae0ccf
415548 migrate ProxyHTTPToSPDYTest to use HttpClient to avoid intermittent NPE part 2
2013-08-30 17:16:22 +02:00