52464a5ba6
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ResourceAnnotationHandler.java
jetty-client/src/test/java/org/eclipse/jetty/client/SslHttpExchangeTest.java
jetty-client/src/test/java/org/eclipse/jetty/client/SslSecurityListenerTest.java
jetty-deploy/src/main/java/org/eclipse/jetty/deploy/WebAppDeployer.java
jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/ContextProvider.java
jetty-http/src/main/resources/org/eclipse/jetty/http/mime.properties
jetty-http/src/test/java/org/eclipse/jetty/http/HttpFieldsTest.java
jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java
jetty-jmx/src/main/java/org/eclipse/jetty/jmx/MBeanContainer.java
jetty-jmx/src/main/java/org/eclipse/jetty/jmx/ObjectMBean.java
jetty-overlay-deployer/src/main/java/org/eclipse/jetty/overlays/OverlayedAppProvider.java
jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/Injection.java
jetty-plus/src/main/java/org/eclipse/jetty/plus/security/DataSourceLoginService.java
jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyServlet.java
jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/ProxyRule.java
jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java
jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionIdManager.java
jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/proxy/ProxyHTTPSPDYConnection.java
jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/ServerHTTPSPDYAsyncConnection.java
jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
jetty-util/src/main/java/org/eclipse/jetty/util/Fields.java
jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketClientFactory.java
jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketConnectionRFC6455.java
jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketClientTest.java
jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketMessageRFC6455Test.java
test-jetty-nested/src/main/java/org/eclipse/jetty/nested/Dump.java
test-jetty-webapp/src/main/java/com/acme/Dump.java
2012-11-02 14:08:05 +11:00
8723408731
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
...
Conflicts:
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
2012-11-02 13:17:53 +11:00
65202e9abe
393363 Use Locale.ENGLISH for all toUpperCase and toLowerCase calls
2012-11-02 11:55:00 +11:00
62f8e13397
HTTP client: renamed Request.aborted() to Request.isAborted() to comply with the naming convention.
2012-10-31 13:21:15 +01:00
b3c1accab9
HTTP client: fixed bug in redirects: the new host was overwritten with the old one.
2012-10-30 22:37:25 +01:00
0d762bcdbc
HTTP client: refactored response listeners to support lambdas.
2012-10-30 19:22:29 +01:00
8d51961516
HTTP client: refactored request listeners to support lambdas.
2012-10-30 19:22:29 +01:00
33d97b8dd4
HTTP client: refactored "last exchange" concept out of HttpConversation into HttpExchange.
2012-10-30 12:56:21 +01:00
7f37ddbc25
HTTP client: added TestTracker rule.
2012-10-30 12:15:21 +01:00
ebb76ecfb9
392959 - Review HttpClient.getConversation(long).
...
Modified to HttpClient.getConversation(long, boolean) in order
to specify whether the conversation must be created or not.
2012-10-30 12:15:21 +01:00
1173916da1
HTTP client: renamed ResponseListener.Timed to Schedulable.
2012-10-30 12:15:21 +01:00
605b0360e1
HTTP client: reviewed API.
...
The API were inconsistent: sometimes using the C format for getters and setters
(e.g. String host(), void host(String)), sometimes using the JavaBeans format.
Now the API stick with the JavaBean format apart the "fluent" API in Request,
that is in the fluent format (i.e. C setter format, but returning this instead of void).
2012-10-26 23:42:18 +02:00
5e7f6988e4
HTTP client: introduced InputStreamContentProvider.
2012-10-26 17:40:28 +02:00
b0306adf8d
HTTP client: fixed bug in case of connection failure:
...
requests may have stayed queued and never notified of a connection failure
if their number exceeded the max connection per address value.
2012-10-26 14:57:06 +02:00
58e8ff8fbf
#392733 - Implement a total timeout for asynchronous sends.
...
Reworked the implementation.
Instead of adding another method for asynchronous sends with
timeout parameters, we now use a TimedResponseListener utility
class, that holds the timeout information.
2012-10-26 14:57:06 +02:00
e2a988f8fc
HTTP client: tests on external synchronization.
2012-10-26 14:57:06 +02:00
975a20271f
#392733 - Implement a total timeout for asynchronous sends.
2012-10-24 21:36:40 +02:00
b6bf6899a9
HTTP client: improved request abort handling in case of conversations.
2012-10-23 11:02:50 +02:00
8635792507
HTTP client: better implementation for request/response abort.
2012-10-22 23:33:41 +02:00
8c3642754e
392470: Fix problem in suspend, expire cycle when HttpChannel.run() is called multiple times (happens for SPDY). Add test cases. Remove unused argument from HttpHandler.messageComplete() interface and it's implementations.
2012-10-19 18:17:29 +02:00
1a895bbd44
392237 move verbose client test failures
2012-10-18 16:53:19 +11:00
7796a49020
392237 cleaned up client test exceptions
2012-10-18 16:36:21 +11:00
7e30c4ac20
jetty-9: HTTP client: fixed problem when using default ports such as 80 or 443.
2012-10-12 15:03:14 +02:00
6159d6f268
jetty-9: HTTP client: fixed problem when idle connections were closed remotely: the local connection was not closed.
2012-10-12 14:58:21 +02:00
707acbeed7
jetty-9: HTTP client: better logging.
2012-10-12 14:58:21 +02:00
4ab9715c1b
jetty-9: HTTP client: better names for the default thread pool and scheduler.
2012-10-12 14:58:21 +02:00
6c011025b6
jetty-9 added a pretty welcome page
2012-10-12 15:36:32 +11:00
109381abdb
Merge branch 'jetty-9-client-100-continue-bis' into jetty-9
2012-10-11 10:58:56 +02:00
402afc6092
jetty-9: HTTP client: implemented support for 100-Continue.
2012-10-11 10:57:40 +02:00
f2595a7ec3
Bumping up to jetty-test-helper 2.0 with new @Rule TestTracker & AdvancedRunner status messages.
2012-10-10 09:10:51 -07:00
03b27d0c61
jetty-9: HTTP client: always dispatching after connection creation.
...
This is needed to allow onOpen() to execute just after the connection creation,
otherwise the application may delay the onOpen() call indefinitely by implementing
a request listener method.
2012-10-09 10:36:12 +02:00
0e448c6514
jetty-9: HTTP client: replaced usage of deprecated JUnit class.
2012-10-09 10:34:44 +02:00
02d0cc125c
jetty-9: HTTP client: named the scheduler for better debugging.
2012-10-09 10:34:21 +02:00
bad8f74840
jetty-9: HTTP client: avoid double dispatch for SSL, and made I/O dispatch a configurable parameter.
2012-10-08 14:25:59 +02:00
be044015ff
jetty-9: HTTP client: allow configuration of sockets.
2012-10-08 11:38:26 +02:00
0ecd64a747
jetty-9: HTTP client: implemented Request idle timeout.
2012-10-08 11:05:27 +02:00
c751860af2
jetty-9: Improved HttpReceiver state handling.
2012-10-08 11:05:27 +02:00
2748a9381e
jetty-9: Added support for connect timeout.
2012-10-08 11:05:26 +02:00
f4d12412eb
jetty-9 added FilterConnectionFactory and made SpdyServer use it
2012-10-08 15:22:49 +11:00
d742578353
jetty-9: HTTP client: improvements.
...
Request now supports opaque attributes.
ContentResponse supports a contentAsString() method, along with BufferingResponseListener.
2012-09-26 13:29:57 +02:00
05a0090dd6
jetty-9: HTTP client: re-enabled debug logging for tests.
2012-09-21 18:12:12 +02:00
199971a989
jetty-9: Better use of StdErrLog.
2012-09-21 18:00:13 +02:00
ab2757ab96
jetty-9: Removed TODOs.
2012-09-21 17:24:45 +02:00
12a2d3f475
jetty-9: HTTP client: hiding stack traces for expected exception on server.
2012-09-21 15:23:56 +02:00
f81dc0161e
jetty-9: HTTP client: more tests.
2012-09-21 15:10:40 +02:00
68ee346b8a
jetty-9 combined the Container and AggregateLifeCycle into ContainerLifeCycle
2012-09-21 11:45:51 +10:00
37a7e5977d
Merged branch 'jetty-9' into jetty-9-open-close.
2012-09-20 18:46:16 +02:00
6de7398d48
jetty-9 - HTTP client: reducing the number of requests for the load test, as it seems the SSL version is never able to pass cleanly.
2012-09-20 18:33:43 +02:00
40382bad3a
jetty-9 - Removed references to JUnit 3.x.
2012-09-20 18:23:02 +02:00
80e1e7b47b
jetty-9 - HTTP client: increased the test timeout.
2012-09-20 17:48:30 +02:00
Greg Wilkins
Simone Bordet
Thomas Becker
Joakim Erdfelt