Thomas Becker
ae785f034e
Replace calls to deprecated HttpTransport.send(..) method in SPDY code
2013-07-26 17:51:02 +02:00
Thomas Becker
af82e49835
ProxySPDYToSPDYLoadTest small change for shutting down the test
2013-07-26 17:40:57 +02:00
Simone Bordet
f4a41efaad
Merged branch 'master' into 'jetty-9.1'.
2013-07-24 11:21:36 +02:00
Thomas Becker
0049aa4322
412418 HttpTransportOverSPDY fix race condition while sending push streams that could cause push data not to be sent. Fixes intermittent test issues in ReferrerPushStrategyTest
2013-07-24 10:16:20 +02:00
Thomas Becker
1ab5de8ecd
412418 HttpTransportOverSPDY fix race condition while sending push streams that could cause push data not to be sent. Fixes intermittent test issues in ReferrerPushStrategyTest
2013-07-24 10:14:14 +02:00
Simone Bordet
ff3b36cfb0
Merged branch 'master' into 'jetty-9.1'.
2013-07-23 16:28:29 +02:00
Simone Bordet
d0f0dedf20
413531 - Introduce pluggable transports for HttpClient.
...
Merge of the branch 'http_client_transport' is now complete,
and the implementation is sound for the HTTP transport.
A basic implementation for the SPDY transport exists, but needs
improvements.
2013-07-23 16:08:56 +02:00
Simone Bordet
86d51f057d
Ignored idle timeout test, not yet implemented in within the SPDY transport.
2013-07-23 15:53:35 +02:00
Simone Bordet
aa6226e1fa
Merged branch 'jetty-9.1' into 'http_client_transport'.
2013-07-23 15:53:35 +02:00
Simone Bordet
beee37e96a
Moved HttpClientTransport SPDY implementation in its own module under the SPDY project.
2013-07-23 15:53:35 +02:00
Simone Bordet
52b805697a
Moved HTTPSPDYHeader into its own module, for use by a SPDY HttpClientTransport implementation.
2013-07-23 15:53:35 +02:00
Simone Bordet
a4c63caf26
Working draft of the abstraction of HttpClient transport.
2013-07-23 15:50:51 +02:00
Thomas Becker
1c546a90d6
ReferrerPushStrategy logging changes
2013-07-23 14:34:46 +02:00
Thomas Becker
4837b75eec
413155 HttpTransportOverSPDY remove constructor argument for version and get version from stream.getSession instead
2013-07-23 10:52:13 +02:00
Greg Wilkins
b8f7637e7d
Merge remote-tracking branch 'origin/master' into jetty-9.1
2013-07-22 23:32:04 +10:00
Greg Wilkins
fede2a7151
413291 Avoid SPDY double dispatch
...
removed task queue from HttpChannelOverSPDY
2013-07-19 11:07:17 +10:00
Thomas Becker
a1789c8f7c
412840 remove Future in SPDYClient.connect() and return Session instead in blocking version
2013-07-17 18:09:11 +02:00
Thomas Becker
d65b511447
413155 simplify HttpTransportOverSPDY a bit more. Throw exceptions if send is called with no content, lastContent=false and no responseInfo
2013-07-17 15:52:55 +02:00
Thomas Becker
205ef85ead
413155 refactor HttpTransportOverSPDY to fix some bugs and reduce cyclomatic complexity
2013-07-17 13:34:03 +02:00
Thomas Becker
11e0b57f68
413066 accept lower case method: head
2013-07-16 16:27:59 +02:00
Thomas Becker
0b3d91e94e
disable debug logging
2013-07-16 15:52:41 +02:00
Thomas Becker
7d9803972e
413066 fix HttpTransportOverSPDYTest
2013-07-16 15:39:39 +02:00
Thomas Becker
b858f266d6
413066 SPDY HEAD requests don't send response body anymore
2013-07-16 14:36:02 +02:00
Greg Wilkins
987aa846cc
398467 Servlet 3.1 Non Blocking IO
...
ensure that EOF is checked after all calls to nextContent
2013-07-15 14:28:22 +10:00
Greg Wilkins
b2be8a5781
turned off debugging
2013-07-15 14:12:00 +10:00
Thomas Becker
64f4ad3b11
Fix SPDYClient refactoring. Wrap FuturePromise<Session> in SessionPromise
2013-07-12 09:57:31 +02:00
Thomas Becker
891a2c2b36
add HttpStalledServerConnectionTest, small improvements to ProxySPDYToHTTPLoadTest
2013-07-12 08:40:35 +02:00
Thomas Becker
6b91b947ab
ProxySPDYToHTTPLoadTest add debug logging
2013-07-12 08:40:34 +02:00
Jan Bartel
bd2add0ae9
Update to post-release (servlet 3.1/javaee) versions of javaee dependencies. WARNING: jetty-schemas from jetty-toolchain needs to be changed from SNAPSHOT to final release.
2013-07-12 13:53:58 +10:00
Simone Bordet
cdf6f17b9e
412729 - SPDYClient needs a Promise-based connect() method.
...
Implemented the new method, modified the blocking method
(with a better signature) to call the new method.
2013-07-11 10:28:58 +02:00
Greg Wilkins
83b55418f5
Merge remote-tracking branch 'origin/master' into jetty-9.1
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java
2013-07-08 13:58:35 +10:00
Thomas Becker
81e92fcc13
409845 add test that makes sure that DataFrameGenerator correctly prepends the header information
2013-07-05 16:11:29 +02:00
Thomas Becker
5d1225b60e
Revert "Revert "412318 HttpChannel fix multiple calls to _transport.completed() if handle() is called multiple times while the channel is COMPLETED""
...
This reverts commit 474d9fec28
.
2013-07-05 10:42:43 +02:00
Greg Wilkins
981102fda5
398467 Servlet 3.1 Non Blocking IO
...
Asynchronous reads working.
2013-07-05 18:11:09 +10:00
Greg Wilkins
474d9fec28
Revert "412318 HttpChannel fix multiple calls to _transport.completed() if handle() is called multiple times while the channel is COMPLETED"
...
This reverts commit cb2eb030d1
.
2013-07-05 09:21:10 +10:00
Thomas Becker
cb2eb030d1
412318 HttpChannel fix multiple calls to _transport.completed() if handle() is called multiple times while the channel is COMPLETED
2013-07-04 15:46:14 +02:00
Greg Wilkins
965918d8f2
Merge remote-tracking branch 'origin/master' into jetty-9.1
2013-07-04 17:28:57 +10:00
Thomas Becker
a85711420d
409282 fix intermittently failing MaxConcurrentStreamTest
2013-07-03 17:12:13 +02:00
Thomas Becker
e4c7cfbf37
408235 SPDYtoHTTP proxy fix: remove hop headers from upstream server
2013-07-03 15:21:06 +02:00
Thomas Becker
85ef539663
HttpTransportOverSPDY add newline
2013-07-02 08:48:11 +02:00
Thomas Becker
8b31188ca7
405424 add X-Powered-By and Server header to SPDY
2013-07-01 21:57:22 +02:00
Thomas Becker
260b21f7df
405424 add X-Powered-By and Server header to SPDY
2013-07-01 17:08:35 +02:00
Thomas Becker
d2470f6170
410805 StandardSession: remove all frameBytes for a given stream from queue if the stream is reset
2013-07-01 11:35:13 +02:00
Greg Wilkins
e4716e05e1
Merge remote-tracking branch 'origin/master' into jetty-9.1
...
Conflicts:
aggregates/jetty-all/pom.xml
examples/async-rest/async-rest-jar/pom.xml
examples/async-rest/async-rest-webapp/pom.xml
examples/async-rest/pom.xml
examples/embedded/pom.xml
examples/pom.xml
jetty-annotations/pom.xml
jetty-ant/pom.xml
jetty-client/pom.xml
jetty-continuation/pom.xml
jetty-deploy/pom.xml
jetty-distribution/pom.xml
jetty-http/pom.xml
jetty-io/pom.xml
jetty-jaas/pom.xml
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp/pom.xml
jetty-jspc-maven-plugin/pom.xml
jetty-maven-plugin/pom.xml
jetty-monitor/pom.xml
jetty-nosql/pom.xml
jetty-osgi/jetty-osgi-boot-jsp/pom.xml
jetty-osgi/jetty-osgi-boot-warurl/pom.xml
jetty-osgi/jetty-osgi-boot/pom.xml
jetty-osgi/jetty-osgi-httpservice/pom.xml
jetty-osgi/jetty-osgi-npn/pom.xml
jetty-osgi/pom.xml
jetty-osgi/test-jetty-osgi-context/pom.xml
jetty-osgi/test-jetty-osgi-webapp/pom.xml
jetty-plus/pom.xml
jetty-proxy/pom.xml
jetty-rewrite/pom.xml
jetty-runner/pom.xml
jetty-security/pom.xml
jetty-server/pom.xml
jetty-servlet/pom.xml
jetty-servlets/pom.xml
jetty-spdy/pom.xml
jetty-spdy/spdy-client/pom.xml
jetty-spdy/spdy-core/pom.xml
jetty-spdy/spdy-example-webapp/pom.xml
jetty-spdy/spdy-http-server/pom.xml
jetty-spdy/spdy-server/pom.xml
jetty-spring/pom.xml
jetty-start/pom.xml
jetty-util-ajax/pom.xml
jetty-util/pom.xml
jetty-webapp/pom.xml
jetty-websocket/pom.xml
jetty-websocket/websocket-api/pom.xml
jetty-websocket/websocket-client/pom.xml
jetty-websocket/websocket-common/pom.xml
jetty-websocket/websocket-server/pom.xml
jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/ab/Fuzzer.java
jetty-websocket/websocket-servlet/pom.xml
jetty-xml/pom.xml
pom.xml
tests/pom.xml
tests/test-continuation/pom.xml
tests/test-loginservice/pom.xml
tests/test-sessions/pom.xml
tests/test-sessions/test-hash-sessions/pom.xml
tests/test-sessions/test-jdbc-sessions/pom.xml
tests/test-sessions/test-sessions-common/pom.xml
tests/test-webapps/pom.xml
tests/test-webapps/test-jaas-webapp/pom.xml
tests/test-webapps/test-jetty-webapp/pom.xml
tests/test-webapps/test-jndi-webapp/pom.xml
tests/test-webapps/test-mock-resources/pom.xml
tests/test-webapps/test-proxy-webapp/pom.xml
tests/test-webapps/test-servlet-spec/pom.xml
tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
2013-06-27 09:12:28 +10:00
Thomas Becker
67fd1e496f
410498 ignore type of exception in GoAwayTest.testDataNotProcessedAfterGoAway
2013-06-25 09:13:34 -07:00
Joakim Erdfelt
78b5f7df1f
[maven-release-plugin] prepare for next development iteration
2013-06-25 08:29:26 -07:00
Joakim Erdfelt
5f2c937fcb
[maven-release-plugin] prepare release jetty-9.0.4.v20130625
2013-06-25 08:29:18 -07:00
Joakim Erdfelt
31faf2fe20
Reverting failed release from friday
2013-06-25 07:42:45 -07:00
Jesse McConnell
8927c18840
reset versions for release
2013-06-21 15:28:26 -05:00
Jesse McConnell
57bfda2a08
[maven-release-plugin] prepare for next development iteration
2013-06-21 09:49:25 -05:00
Jesse McConnell
c1082ad4d4
[maven-release-plugin] prepare release jetty-9.0.4.v20130621
2013-06-21 09:49:15 -05:00
Thomas Becker
4ba9385ebc
411340 add comment why executeOnFillable defaults to true
2013-06-21 15:28:33 +02:00
Thomas Becker
918632d408
411340 SpdyConnection make executeOnFillable configurable and default to true
2013-06-21 14:45:16 +02:00
Thomas Becker
b119bdfa24
fix typo in javadoc
2013-06-21 14:45:16 +02:00
Jan Bartel
b006496198
Merge remote-tracking branch 'origin/master' into jetty-9.1
2013-06-21 14:55:14 +10:00
Jan Bartel
8c580bd875
Fix spdy pom.xml
2013-06-21 14:54:35 +10:00
Jan Bartel
f59ef8cfce
Merge remote-tracking branch 'origin/master' into jetty-9.1
2013-06-21 14:52:38 +10:00
Jan Bartel
8d7477218d
Add profile for jdk1.7.0_25
2013-06-21 14:51:10 +10:00
Greg Wilkins
507cc074c6
Merge remote-tracking branch 'origin/servlet-3.1-api' into jetty-9.1
2013-06-21 13:04:54 +10:00
Greg Wilkins
3ded04813d
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/http/ServerHTTPSPDYTest.java
2013-06-21 11:22:58 +10:00
Joakim Erdfelt
f8c457f75e
Merge branch 'jetty-9.1' into javawebsocket-jsr
2013-06-19 15:07:15 -07:00
Thomas Becker
4085cfb602
411061 fix cookie handling in spdy. If two different HTTP headers with the same name are set, they should be translated to a single multiheader value according to: http://www.chromium.org/spdy/spdy-protocol/spdy-protocol-draft3#TOC-2.6.10-Name-Value-Header-Block . That applies for Set-Cookie headers for example. Before this changed duplicate header names have overwritten the previous one
2013-06-19 16:22:57 +02:00
Joakim Erdfelt
931cfa10ce
Merge branch 'master' into javawebsocket-jsr
...
Conflicts:
jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/TomcatServerQuirksTest.java
2013-06-18 12:41:20 -07:00
Thomas Becker
ad458105f2
ReferrerPushStrategy fix javadoc
2013-06-18 17:34:20 +02:00
Thomas Becker
117b086f26
PushStrategy.java remove newlines in javadoc
2013-06-18 16:00:59 +02:00
Joakim Erdfelt
2da8c9c306
Merge branch 'master' into javawebsocket-jsr
...
Conflicts:
jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/http/ReferrerPushStrategyTest.java
jetty-util/src/main/java/org/eclipse/jetty/util/BufferUtil.java
jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/UpgradeConnection.java
jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/events/EventDriver.java
jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/ServletWebSocketRequest.java
jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java
jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketLoadRFC6455Test.java
2013-06-17 10:54:10 -07:00
Thomas Becker
00744e42fc
410341 suppress stacktraces that happen during test setup shutdown after successful test run
2013-06-17 09:19:03 -07:00
Thomas Becker
11760a7c83
@Ignore MaxConcurrentStreamsTest for now
2013-06-17 09:19:03 -07:00
Thomas Becker
1efd637dec
409796 fix and cleanup ReferrerPushStrategy. There's more work to do here, so it remains @Ignore for now
2013-06-17 09:19:02 -07:00
Thomas Becker
d9ada8a1eb
410098 inject accept-encoding header for all http requests through SPDY as SPDY clients MUST support spdy. Also remove two new tests that have been to implementation agnostic and not needed anymore due to recent code changes
2013-06-17 09:19:02 -07:00
Thomas Becker
ba9f9b4195
406759 supressed stacktrace in ReferrerPushStrategyTest
2013-06-17 09:19:02 -07:00
Thomas Becker
79ff74ea8e
406759 supressed two stacktraces thrown in ProxySPDYToHTTPTest
2013-06-17 09:19:02 -07:00
Thomas Becker
c22a8f195e
409403 fix IllegalStateException when SPDY is used and the response is written through BufferUtil.writeTo byte by byte
...
git removed a newline in the file. Fix the filesize in the test accordingly.
2013-06-17 09:19:02 -07:00
Greg Wilkins
4e4ffaa54c
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
2013-06-17 16:29:39 +10:00
Joakim Erdfelt
02de232411
405313 - Websocket client SSL hostname verification is broken, always defaults to raw IP as String
...
+ After discussion with simone, we have changed from using IP address to
hostnames in both websocket and spdy.
2013-06-14 11:40:37 -07:00
Thomas Becker
e23bfc82bb
spdy: uncomment pushStrategy in default config
2013-06-14 17:44:54 +02:00
Thomas Becker
6d75e18661
410799 errors while creating push streams in HttpTransportOverSPDY are now logged to debug instead of warn
2013-06-14 13:27:16 +02:00
Jesse McConnell
eddb49941d
[Bug 408600] set correct jetty.url in all pom files
2013-06-12 15:52:36 -05:00
Thomas Becker
d93faf589c
409598 spdy: Fix NPE when a broken client tried to create duplicate stream IDs
2013-06-12 16:23:31 +02:00
Thomas Becker
9501ef3392
409796 fix intermittent test issue in ReferrerPushStrategy.testResourceOrder. Happened when the client got closed before the server finished sending all data frames. Client waits now until all data is received.
2013-06-12 10:54:57 +02:00
Greg Wilkins
d660cfcff6
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java
tests/test-continuation/src/test/java/org/eclipse/jetty/continuation/ContinuationBase.java
2013-06-11 11:17:04 +10:00
Thomas Becker
fb5de72f76
410341 suppress stacktraces that happen during test setup shutdown after successful test run
2013-06-10 16:01:19 +02:00
Thomas Becker
ba6ce78fc2
@Ignore MaxConcurrentStreamsTest for now
2013-06-10 11:26:00 +02:00
Thomas Becker
654dc1e007
409796 fix and cleanup ReferrerPushStrategy. There's more work to do here, so it remains @Ignore for now
2013-06-07 18:12:19 +02:00
Thomas Becker
937c3b13b8
410098 inject accept-encoding header for all http requests through SPDY as SPDY clients MUST support spdy. Also remove two new tests that have been to implementation agnostic and not needed anymore due to recent code changes
2013-06-07 15:13:59 +02:00
Greg Wilkins
d2794584e1
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
2013-06-07 15:48:22 +10:00
Thomas Becker
bf9a4dd0c0
406759 supressed stacktrace in ReferrerPushStrategyTest
2013-06-06 16:46:45 +02:00
Thomas Becker
5c8b785962
406759 supressed two stacktraces thrown in ProxySPDYToHTTPTest
2013-06-06 14:48:03 +02:00
Thomas Becker
544b4414c3
409403 fix IllegalStateException when SPDY is used and the response is written through BufferUtil.writeTo byte by byte
...
git removed a newline in the file. Fix the filesize in the test accordingly.
2013-06-06 08:18:31 +02:00
Greg Wilkins
cefe657ad4
409796 ignored failing test
2013-06-06 12:09:22 +10:00
Greg Wilkins
bb8c58e315
409403 fix IllegalStateException when SPDY is used and the response is written through BufferUtil.writeTo byte by byte
...
ignore broken test
2013-06-06 11:25:46 +10:00
Thomas Becker
b274fdb0d6
409403 fix IllegalStateException when SPDY is used and the response is written through BufferUtil.writeTo byte by byte
2013-06-05 15:31:24 +02:00
Greg Wilkins
288a452881
398467 Servlet 3.1 Non Blocking IO
...
some cleanup/fixes of SPDY tests. More work needed
2013-05-25 17:07:30 +10:00
Greg Wilkins
5397f16559
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
2013-05-17 14:09:17 +10:00
Greg Wilkins
d56ee96219
398467 Servlet 3.1 Non Blocking IO
...
fixed SPDY
2013-05-16 23:48:00 +10:00
Greg Wilkins
b22d280e2a
398467 Servlet 3.1 Non Blocking IO
...
Cleaned up exceptions and HttpOutput.write
2013-05-16 19:00:00 +10:00
Greg Wilkins
4dd80e9128
398467 Servlet 3.1 Non Blocking IO
...
More refinements to avoid duplicate code and optimise common paths
2013-05-14 17:52:46 +10:00
Jesse McConnell
3d600ed95e
[maven-release-plugin] prepare for next development iteration
2013-05-06 18:13:04 -05:00
Jesse McConnell
d832f3dc7e
[maven-release-plugin] prepare release jetty-9.0.3.v20130506
2013-05-06 18:12:55 -05:00
Jan Bartel
8d0cf5e949
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2013-05-06 14:46:28 +10:00
Simone Bordet
5b2aab505f
405570 - spdy push: resource ordering and sequential push.
...
Fixed race condition.
The race was happening when the headers of a push resource
were pushed, then the push resource was completed, which
triggered the send of the next resource, which was polling the
queue but find it empty, because the next resource was not pushed yet.
In this case the activity flag remained true, causing all subsequent
pushes to be skipped.
2013-05-03 17:24:29 +02:00
Jan Bartel
0d181d9a75
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2013-05-03 16:59:39 +10:00
Greg Wilkins
d351e0790a
406617 Spin in Request.recycle
...
Numerous code cleanups with the handling of early closes of requests, specially when the response has already been sent.
2013-05-03 15:15:03 +10:00
Simone Bordet
5bea4cc781
Fixed race condition in test.
2013-05-02 23:50:24 +02:00
Jan Bartel
e7ecfd2b2b
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java
2013-05-02 09:07:24 +10:00
Simone Bordet
f4b8e043e5
Added SPDY profile for JDK 7u21.
2013-04-29 16:54:32 +02:00
Thomas Becker
f62cec561b
406214 fix constructor for PushSynInfo ignores timeout, remove timeout for creating push streams in HttpTransportOverSPDY
2013-04-26 16:33:03 +02:00
Jan Bartel
2360f5dcd5
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-security/src/main/java/org/eclipse/jetty/security/ConstraintSecurityHandler.java
2013-04-23 15:08:56 +10:00
Thomas Becker
270083f6a1
405570 spdy push - send push resources in the order they have been requested. Do not interleave sending the bytes of the push streams.
2013-04-22 13:50:02 +02:00
Greg Wilkins
a7073d05a6
updated version to 9.1.0-SNAPSHOT
2013-04-19 13:59:18 +10:00
Jesse McConnell
7baaa14ba1
[maven-release-plugin] prepare for next development iteration
2013-04-17 11:46:39 -05:00
Jesse McConnell
e390b54b25
[maven-release-plugin] prepare release jetty-9.0.2.v20140417
2013-04-17 11:46:31 -05:00
Jesse McConnell
0b20467c6f
[maven-release-plugin] prepare for next development iteration
2013-04-15 11:40:45 -05:00
Jesse McConnell
3aa4301711
[maven-release-plugin] prepare release jetty-9.0.2.v20140415
2013-04-15 11:40:37 -05:00
Thomas Becker
7ed3a343ad
405449 spdy improve handling of duplicate stream Ids
2013-04-11 12:28:33 +02:00
Greg Wilkins
5728077faf
Merge remote-tracking branch 'origin/release-9'
2013-04-11 06:24:01 +10:00
Thomas Becker
6a6660bfc6
405364 spdy imeplement MAX_CONCURRENT_STREAMS
2013-04-10 16:49:45 +02:00
Greg Wilkins
b8dd8bde14
[maven-release-plugin] prepare for next development iteration
2013-04-08 12:31:34 +10:00
Greg Wilkins
bf3771904b
[maven-release-plugin] prepare release jetty-9.0.1.v20130408
2013-04-08 12:30:59 +10:00
Simone Bordet
72219d016b
404610 - Reintroduce ability to disallow TLS renegotiation.
2013-04-04 17:11:01 +02:00
Simone Bordet
f7eb78d849
404757 - SPDY can only be built with the latest JDK version.
2013-04-02 22:27:55 +02:00
Greg Wilkins
d5f84c661e
404323 Improved parameterization of https and SPDY
2013-03-26 13:44:15 +11:00
Greg Wilkins
9079bae9c0
404323 Improved parameterization of https and SPDY
2013-03-26 13:38:28 +11: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
Greg Wilkins
29b83dff9b
402626 Do not required endpoint host checking by default
2013-03-14 09:25:28 +11:00
Simone Bordet
0c4d457fce
Updated npn-boot version to 1.1.5.
2013-03-13 22:36:30 +01:00
Thomas Becker
a90a505316
401806 spdy push properly pass through request and response headers for pushed resources
2013-03-13 18:17:34 +01:00
Thomas Becker
8aeecf972b
SPDYToSPDYProxy add test where upstream server resets client stream
2013-03-12 14:21:29 +01:00
Joakim Erdfelt
897c35c2cb
[maven-release-plugin] prepare for next development iteration
2013-03-08 11:33:23 -07:00
Joakim Erdfelt
cc6196af50
[maven-release-plugin] prepare release jetty-9.0.0.v20130308
2013-03-08 11:33:15 -07:00
Joakim Erdfelt
7fc38f6c0f
[maven-release-plugin] prepare for next development iteration
2013-03-07 19:14:19 -07:00
Joakim Erdfelt
96d045442f
[maven-release-plugin] prepare release jetty-9.0.0.v20130307
2013-03-07 19:14:11 -07:00
Jesse McConnell
778ee1411b
[maven-release-plugin] prepare for next development iteration
2013-03-06 10:21:46 -06:00
Jesse McConnell
d916078711
[maven-release-plugin] prepare release jetty-9.0.0.v20130306
2013-03-06 10:21:38 -06:00
Jan Bartel
cde549c0e8
399070 org.eclipse.jetty.spdy.server must declare import of org.eclipse.jetty.npn
2013-03-05 16:51:45 +11:00
Simone Bordet
7037bca94d
Introduced Request.header(HttpHeader, String) to simplify code.
2013-03-04 17:05:18 +01:00
Thomas Becker
1aa8fce78b
402277 spdy proxy: fix race condition in nested push streams initiated by upstream server. Fix several other small proxy issues
2013-03-04 10:25:17 +01:00
Greg Wilkins
6478306812
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
...
Conflicts:
jetty-server/src/main/config/etc/jetty.xml
2013-03-02 09:32:57 +11:00
Simone Bordet
e6fed09129
402075 - Massive old gen growth when hit by lots of non persistent connections.
...
Replaced usages of TimerScheduler with ScheduledExecutorScheduler.
2013-03-01 15:19:51 +01:00
Greg Wilkins
41952ebf1d
402075 Dont allocate the parser trie unless needed
2013-03-01 22:16:54 +11:00
Joakim Erdfelt
29b2118870
[maven-release-plugin] prepare for next development iteration
2013-02-26 09:20:45 -07:00
Joakim Erdfelt
2b82b54f6d
[maven-release-plugin] prepare release jetty-9.0.0.RC2
2013-02-26 09:20:45 -07:00
Thomas Becker
88e32cb021
401183 Handle push streams in new method StreamFrameListener.onPush() instead of SessionFrameListener.syn()
2013-02-19 15:22:55 +01:00
Thomas Becker
c840d3dbb1
400555 HttpProxyEngine: Add http version header in response
2013-02-12 12:16:05 +01:00
Thomas Becker
ade135ba74
Add ProxySPDYToSPDYLoadTest
2013-02-07 12:21:05 +01:00
Joakim Erdfelt
4dc3ed38c2
[maven-release-plugin] prepare for next development iteration
2013-02-05 10:00:36 -07:00
Joakim Erdfelt
ed24f78498
[maven-release-plugin] prepare release jetty-9.0.0.RC0
2013-02-05 10:00:36 -07:00
Jesse McConnell
e073ceb06d
[maven-release-plugin] prepare for next development iteration
2013-02-05 10:00:36 -07:00
Jesse McConnell
2f2ad287af
[maven-release-plugin] prepare release jetty-9.0.0.RC0
2013-02-05 10:00:35 -07:00
Simone Bordet
209d5bc12f
399721 - Change <Ref id= ...> to <Ref refid= ...>
2013-02-01 13:03:11 +01:00
Thomas Becker
95698ca248
396606 make spdy proxy capable of receiving SPDY and talk HTTP to the upstream server
2013-01-31 15:11:30 +01:00
Thomas Becker
80b44f9940
interims
2013-01-28 15:27:03 +01:00
Thomas Becker
1f6d058b20
intermittent commit
2013-01-28 12:18:30 +01:00
Simone Bordet
2ba64a59e6
Made the test more reliable.
2013-01-24 10:32:05 +01:00
Thomas Becker
9ebea3938d
393385: Make hostname verification configurable in SslContextFactory and enable it by default (See http://www.ietf.org/rfc/rfc2818.txt section 3.1)
2013-01-17 10:28:15 +01:00
Jesse McConnell
e1c516c7d1
merge from jetty-8 and update license blocks.
2013-01-11 17:04:53 -06:00
Jesse McConnell
863944873d
merge from 7 and update license blocks for 2013
2013-01-11 15:01:16 -06:00
Jesse McConnell
a4dbb5823c
update license blocks for 2013
2013-01-11 14:57:51 -06:00
Greg Wilkins
27c31fb403
jetty-9 organised imports. Cleaned up some TODOs
2013-01-11 16:37:32 +11:00
Greg Wilkins
31def06214
jetty-9 URI parsing passed ByteBuffer so that strange query string encodings can be supported
2012-12-24 19:17:00 +11:00
Thomas Becker
e1a663865c
394210 spdy api rename stream.syn() to stream.push()
2012-12-21 18:14:14 +01:00
Thomas Becker
26c5eb428f
396193 spdy remove timeout parameters from api and move them to the Info* classes
2012-12-21 13:24:16 +01:00
Simone Bordet
c9f4513a89
Reworked HTTP client API, removing usage of Future.
2012-12-19 16:27:20 +01:00
Greg Wilkins
6bfc19be1b
jetty-9 optimisation to dispatch before parsing so that handling is done in same thread
2012-12-14 09:50:22 +11:00
Thomas Becker
440d4c4bf4
394211 - spdy: Expose RemoteServerAddress and LocalServerAddress in StandardSession
2012-12-12 18:48:49 +01:00
Thomas Becker
e299169ee3
StandardSession change LOG.warn in flush() back to LOG.debug
2012-12-12 18:48:49 +01:00
Thomas Becker
6567940471
HttpTransportOverSPDYTest hide stacktrace
2012-12-12 18:48:49 +01:00
Greg Wilkins
3e151901bf
jetty-9 Use public HttpField
2012-12-08 01:41:01 +11:00
Greg Wilkins
a20d984d30
jetty-9 Added Trie for cached string lookup. HttpFields does not use StringMap
2012-12-08 01:41:00 +11:00
Thomas Becker
dc2850c898
396036 SPDY send controlFrames even if Stream is reset to avoid breaking the compression context
2012-12-07 13:22:19 +01:00
Thomas Becker
db6fdca3b9
395922: Unit test that checks if ControlFrameBytes are sent in the right order even with priorization
2012-12-07 11:39:53 +01:00
Thomas Becker
98d17bdea9
395922: Avoid that SPDY frames containing headers are sent in another order than they have been created
2012-12-06 14:18:52 +01:00
Simone Bordet
b2e878a7e8
+ Introduced Request.content(ContentProvider content, String contentType)
...
+ Introduced a new renamings to clarify concepts
+ Vastly improved Javadocs.
2012-12-04 16:18:09 +01:00
Thomas Becker
efc1a3e98f
Fix javadoc in Stream.java and logging if a Stream is committed twice
2012-11-30 13:55:09 +01:00
Thomas Becker
e1fb49d4d7
remove log.info in StandardSession.flush()
2012-11-29 14:22:01 +01:00
Thomas Becker
61fbc68be7
395312 log.warn if a SPDY stream gets committed twice
2012-11-29 13:37:02 +01:00
Greg Wilkins
4d823c28bf
jetty-9 added jetty-all for javadoc, reinstated static context for javadoc, made proxy to xref
2012-11-29 17:41:54 +11:00
Greg Wilkins
21f717078c
jetty-9 handle null push strategy
2012-11-29 17:03:40 +11:00
Thomas Becker
30091ccd89
395314 Add missing flush() call after StandardSession.complete() has been called. Some test cleanup.
2012-11-28 17:43:53 +01:00
Thomas Becker
68afcbba6c
395313 HttpTransportOverSPDY.send() does not rethrow exceptions, but call Callback.failed() only
2012-11-28 17:41:44 +01:00
Thomas Becker
0ec793bee5
395312 Avoid that streams get committed twice
2012-11-28 17:40:43 +01:00
Thomas Becker
6e70ee4211
394370 Add integration test for client resetting SPDY push SYN's
2012-11-26 15:25:47 +01:00
Simone Bordet
ee893d8526
Corrected changes introduced with Promise.
...
Save creation of iterators for every append() and prepend() in StandardSession.
Removed PromisingCallback, only used by SPDY and better implemented otherwise.
2012-11-23 13:16:32 +01:00
Greg Wilkins
9edac367c8
394854 optimised promise implementation
2012-11-23 12:18:52 +11:00
Simone Bordet
04aafcae3c
Fixed NPEs caused by guard introduced in AbstractFrameBytes's constructor for null callbacks.
2012-11-23 12:18:52 +11:00
Greg Wilkins
7737dc8c76
394854 Implemented Promise
2012-11-23 12:18:51 +11:00
Simone Bordet
e9705abf21
Updated spdy configuration.
2012-11-19 23:29:16 +01:00
Thomas Becker
4ee88c3bc0
jetty-spdy-proxy.xml fixes, still not working
2012-11-19 23:29:16 +01:00
Thomas Becker
a99a3ae254
newline after license header
2012-11-19 16:28:24 +01:00
Thomas Becker
3edae8a52d
394370 Add unit tests for HttpTransportOverSPDY.send()
2012-11-19 15:27:20 +01:00
Thomas Becker
b76669434f
Add messages to StreamExceptions thrown in StandardSession and StandardStream
2012-11-16 12:50:32 +01:00
Thomas Becker
6bc8bab92d
394383 - add logging of the SSLEngine
2012-11-16 11:43:24 +01:00
Greg Wilkins
139de22bc0
394370 correctly handle last content and responses with no content
2012-11-16 12:42:52 +11:00
Greg Wilkins
62e033fcd0
394370 392237 reverted Improved handling of SPDY async send. Added simple NPE protection to further investigate problem
2012-11-16 10:55:10 +11:00
Greg Wilkins
b5c6555a4a
392237 Improved handling of SPDY async send
2012-11-16 10:45:08 +11:00
Simone Bordet
73ecfd6755
394383 - NPNServerConnection not upgraded causes spin.
...
Following a discussion on spdy-dev, we close the connection
if the NextProtocol message is missing.
2012-11-15 17:15:49 +01:00
Simone Bordet
eda558aaa8
Added guard in case of null next protocol.
2012-11-15 15:29:03 +01:00
Simone Bordet
a736ebc062
394383 - NPNServerConnection not upgraded causes spin.
...
We now guard the case where fill() returns, the TLS handshake is completed,
but we have no next protocol.
If that happens, we force the default protocol.
2012-11-15 14:22:13 +01:00
Jesse McConnell
bb27f561c1
[maven-release-plugin] prepare for next development iteration
2012-11-05 12:24:06 -06:00
Jesse McConnell
1d767e99a3
[maven-release-plugin] prepare release jetty-8.1.8.v20121105
2012-11-05 12:23:59 -06:00
Jesse McConnell
70d591c430
[maven-release-plugin] prepare for next development iteration
2012-11-05 12:16:03 -06:00
Jesse McConnell
017826b4eb
[maven-release-plugin] prepare release jetty-7.6.8.v20121105
2012-11-05 12:15:57 -06:00
Thomas Becker
accc3b321a
config fix
2012-11-02 17:16:13 +01:00
Thomas Becker
971bf4dec7
393281: Add getters to expose ReferrerPushStrategy Config
2012-11-02 14:27:11 +01:00
Thomas Becker
3d3e077509
393281: Add User-Agent filter to ReferrerPushStrategy
2012-11-02 13:21:42 +01:00
Greg Wilkins
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
Greg Wilkins
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
Greg Wilkins
65202e9abe
393363 Use Locale.ENGLISH for all toUpperCase and toLowerCase calls
2012-11-02 11:55:00 +11:00
Thomas Becker
1d6ec310b5
393160: fix connection leaks in NextProtoNegoClientConnection and NextProtoNegoServerConnection
2012-10-30 18:48:38 +01:00
Greg Wilkins
add3c2b381
392237 improved names and examples for documentation
2012-10-29 17:59:39 +11:00
Simone Bordet
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
Greg Wilkins
c51cabccc1
392237 moved HttpTransport towards asynchronous solution
2012-10-25 23:28:32 +11:00
Greg Wilkins
bf7a0ace22
392237 Added BlockingCallback optimisation
2012-10-25 22:36:13 +11:00
Greg Wilkins
18f7293efd
392237 Fixed 3.0 port of chat servlet
2012-10-25 12:27:30 +11:00
Thomas Becker
35b7a0a62d
block instead of copy
2012-10-24 16:41:09 +02:00
Greg Wilkins
b08dd26284
392237 Added some more debugging
2012-10-21 16:51:35 +11:00
Greg Wilkins
7c1039940f
392237 Added some debugging
2012-10-21 16:39:05 +11:00
Greg Wilkins
be3432ad55
392237 removed server dependency on contination. All Continuations are now Servlet3Continuations or FauxContinuations
2012-10-21 16:19:40 +11:00
Thomas Becker
8a6b18c1b0
ServerHTTPSPDYTest fix test
2012-10-19 18:35:17 +02:00
Thomas Becker
91eaf6b562
ServerHTTPSPDYTest Ignore failing test until fixed
2012-10-19 18:32:38 +02:00
Thomas Becker
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
Simone Bordet
aa1a6347c1
#392465 - NextProtoNegoClientConnection does not replace the connection if handshake terminates in onOpen().
...
Now we check in NextProtoNegoClientConnection.onOpen() if the NPN is completed, and if so, we replace the connection.
2012-10-19 17:53:54 +02:00
Thomas Becker
dd651b0d9f
Expose more stuff via jmx like threadpool details, connector details, etc.
...
Enhance start.ini documentation for spdy.
2012-10-17 13:37:34 +02:00
Jesse McConnell
64ec72e1d5
[maven-release-plugin] prepare for next development iteration
2012-10-15 13:10:04 -05:00
Jesse McConnell
8e6d049dd8
[maven-release-plugin] prepare release jetty-9.0.0.M1
2012-10-15 13:09:56 -05:00
Jesse McConnell
4d86e5762e
Merge branch 'jetty-9' into release-9
2012-10-15 12:35:25 -05:00
Greg Wilkins
d173e91ef5
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
2012-10-12 13:05:31 +11:00
Simone Bordet
0ee83d334d
jetty-9: replaced usage of deprecated JUnit class.
2012-10-11 10:58:22 +02:00
Greg Wilkins
8c3fa91b26
jetty-9 reverted to more start.ini rather than start.d usage as we will not be using plugins. More configuration documentation added
2012-10-11 16:15:57 +11:00
Simone Bordet
84f6f65e90
jetty-9: Improved configurability of SPDYClient.Factory.
2012-10-08 11:05:27 +02:00
Simone Bordet
2748a9381e
jetty-9: Added support for connect timeout.
2012-10-08 11:05:26 +02:00
Greg Wilkins
f4d12412eb
jetty-9 added FilterConnectionFactory and made SpdyServer use it
2012-10-08 15:22:49 +11:00
Hugues Malphettes
3efefe37bc
Clean-up OSGi test; add spdy OSGi test; fix felix
...
Upgrade to the latest pax-exam
Support for felix-3.x and 4.x as tested
Fix the spdy MANIFEST.MF generations
Add an integration test for SPDY
Refactor the test code
Squashed commit of the following:
commit bd020ee1214992d8d21a11dc800e04dc5e9b2001
Author: Hugues Malphettes <hmalphettes@gmail.com>
Date: Sat Oct 6 16:58:43 2012 +0800
Add spdy integration test for OSGi and clean-up
Refacor the pax-exam OSGi integration tests
Add an integration test for spdy.
Execute the test under 2 versions of felix and 2 versions of equinox.
commit f3151a272ab92560432f3b76f564bf06b19bc22b
Author: Hugues Malphettes <hmalphettes@gmail.com>
Date: Sat Oct 6 16:28:51 2012 +0800
Fix the generated MANIFEST.MF
OSGi integration test in the next commit.
commit 3152aa2b5e39cf2d3b81f8400488c0672e922b8d
Author: Hugues Malphettes <hmalphettes@gmail.com>
Date: Fri Oct 5 16:58:29 2012 +0800
Fix the startup of the servlet.
setInitOrder(0) was working in jetty-7 and jetty-8 but not in jetty-9
anymore. setInitOrder(1) is fine.
commit 8038d314f4f423e8608fd09dd42b840e101a0c13
Author: Hugues Malphettes <hmalphettes@gmail.com>
Date: Thu Oct 4 17:53:28 2012 +0800
Upgrade to pax-exam-2.6
commit 7136fa88e2410ac345b6ae0657d882c7e9714c0b
Author: Hugues Malphettes <hmalphettes@gmail.com>
Date: Thu Oct 4 17:53:07 2012 +0800
Support for felix-3.x and felix-4.x
commit 0bcc6b0d8ed5144150f90f578a90c558419349d1
Author: Hugues Malphettes <hmalphettes@gmail.com>
Date: Thu Oct 4 17:53:28 2012 +0800
Upgrade to pax-exam-2.6
commit 2e17466624650df433b6c5f11abafb56539ee740
Author: Hugues Malphettes <hmalphettes@gmail.com>
Date: Thu Oct 4 17:53:07 2012 +0800
Support for felix-3.x and felix-4.x
2012-10-06 17:26:14 +08:00
Greg Wilkins
435f8a6db8
jetty 9: Improved NPN client connection to perform the connection replacement from onFillable() rather than from NPN callback methods.
2012-10-02 15:49:25 -07:00
Greg Wilkins
604f4985d3
jetty 9: Improved NPN client connection to perform the connection replacement from onFillable() rather than from NPN callback methods.
2012-10-02 15:47:57 -07:00
Greg Wilkins
97d08c399a
jetty-9 removed race with NPN replacing connection and extra wrap causing NPE in SSLEngineImpl
2012-10-02 15:00:31 -07:00
Greg Wilkins
6cc0734a1a
jetty-9 miscillaneous optimizations: donot dispatch to HTTP and SPDY; improved executorCallback
2012-10-02 13:48:51 -07:00
Thomas Becker
ef2939b86c
jetty-9: AbstractTest replace deprecated TestWatchmen with TestWatcher
2012-10-02 12:12:33 +02:00
Hugues Malphettes
29c18fc4d5
OSGi manifests generation fixes cleanup
2012-09-25 11:24:16 +08:00
Hugues Malphettes
1cfa277c6c
jetty-9 osgi support
2012-09-24 13:04:57 +08:00
Jesse McConnell
a69cab7ae9
[maven-release-plugin] prepare for next development iteration
2012-09-21 13:58:16 -05:00
Jesse McConnell
1237b739c7
[maven-release-plugin] prepare release jetty-9.0.0.M0
2012-09-21 13:58:09 -05:00
Greg Wilkins
68ee346b8a
jetty-9 combined the Container and AggregateLifeCycle into ContainerLifeCycle
2012-09-21 11:45:51 +10:00
Greg Wilkins
b9ceb8703d
Merge branch 'jetty-9' into jetty-9-open-close
2012-09-21 08:36:22 +10:00
Joakim Erdfelt
857498b115
Upgrading to junit-dep-4.10.jar (banning junit.jar)
2012-09-20 11:52:59 -07:00
Simone Bordet
37a7e5977d
Merged branch 'jetty-9' into jetty-9-open-close.
2012-09-20 18:46:16 +02:00
Simone Bordet
40382bad3a
jetty-9 - Removed references to JUnit 3.x.
2012-09-20 18:23:02 +02:00
Greg Wilkins
0d2627b6e9
jetty-9 improved onOpen onclose handling
2012-09-20 11:05:20 +10:00
Simone Bordet
851de69d9d
jetty-9 - Third take at open/close refactoring.
2012-09-19 18:04:15 +02:00
Simone Bordet
f257f4b2bb
jetty-9 - First take at open/close refactoring.
2012-09-19 13:37:47 +02:00
Simone Bordet
bfe08d1a99
jetty-9 - Reorganized SPDY modules.
...
This change was due to the fact that the old spdy-core and spdy-jetty modules had classes in the same package,
which is a problem for OSGi.
The old spdy-jetty module has been split in 2: spdy-client and spdy-server, and other SPDY modules just underwent a
renaming to make them more sound.
2012-09-18 23:33:31 +02:00
Simone Bordet
707ff4aea8
jetty-9 - Ported test to use new HttpClient.
2012-09-17 16:59:24 +02:00
Simone Bordet
0915b2b0ab
jetty-9 - Refactored code that was counting the number of reentrant invocations into a common utility class, ForkInvoker.
2012-09-17 14:39:13 +02:00
Greg Wilkins
129583679a
jetty-9 javadoc improvements and renamed SelectChannelConnector to ServerConnector
2012-09-17 17:37:56 +10:00
Simone Bordet
88cbfed7e0
jetty-9 - Made SelectorManager.connection[Opened|Closed]() concrete, since they are overridden only by SelectChannelConnector.
2012-09-14 23:30:21 +02:00
Simone Bordet
3be83efbae
jetty-9 - Calling connectionOpened() to trigger the necessary call to connection.onOpen().
2012-09-14 23:30:21 +02:00
Simone Bordet
cf3f12297f
jetty-9 - Cosmetics.
2012-09-14 23:30:21 +02:00
Greg Wilkins
22ba57b8d2
jetty-9 refactored onOpen and onClose
2012-09-14 17:38:47 +10:00
Greg Wilkins
35a86c3373
jetty-9 more configuration clean ups
2012-09-13 16:49:15 +10:00
Greg Wilkins
9940796a32
jetty-9 xml configurations
2012-09-13 14:43:03 +10:00
Greg Wilkins
c709981aa5
jetty-9 finished refactor for oneconnector and configuration pluggability
2012-09-13 10:00:44 +10:00
Greg Wilkins
a41b6e32ac
Merge branch 'jetty-9-configuration' into jetty-9
...
Conflicts:
jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java
2012-09-13 08:22:06 +10:00
Greg Wilkins
b3e8f91026
jetty-9 flush returns boolean to say completely flushed or not
2012-09-13 08:11:05 +10:00
Greg Wilkins
79caf45604
Merge branch 'jetty-9' into jetty-9-configuration
...
Conflicts:
jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java
2012-09-12 23:11:12 +10:00
Greg Wilkins
427a01855c
jetty-9 WriteFlusher handlers buffering endpoints
2012-09-12 23:06:19 +10:00
Jesse McConnell
a8994178f5
[maven-release-plugin] prepare for next development iteration
2012-09-10 14:18:11 -05:00
Jesse McConnell
92180a9700
[maven-release-plugin] prepare release jetty-7.6.7.v20120910
2012-09-10 14:18:01 -05:00
Jesse McConnell
10e4027579
[maven-release-plugin] prepare for next development iteration
2012-09-10 13:59:34 -05:00
Jesse McConnell
57a6258f96
[maven-release-plugin] prepare release jetty-8.1.7.v20120910
2012-09-10 13:59:10 -05:00
Jesse McConnell
1ec8b2621b
[maven-release-plugin] prepare release jetty-7.6.7.v20120910
2012-09-10 13:47:05 -05:00
Jesse McConnell
4180d7e1f5
prepare for release
2012-09-10 12:59:04 -05:00
Greg Wilkins
73ebe89019
jetty-9 refactored configuration
2012-09-10 20:26:14 +10:00
Simone Bordet
d8ed9116f1
jetty-9 - Moved SPDY's Headers class to jetty-util module as Fields.
2012-09-06 13:22:04 +02:00
Simone Bordet
7231c82b69
Merged branch 'jetty-9' into jetty-9-client.
2012-09-06 08:41:48 +02:00
Greg Wilkins
3acf2e65ed
jetty-9 moved servlet dependencies out of jetty-http
2012-09-06 09:13:17 +10:00
Jesse McConnell
d37deeea74
[maven-release-plugin] prepare for next development iteration
2012-09-03 13:33:18 -05:00
Jesse McConnell
b418b0dd57
[maven-release-plugin] prepare for next development iteration
2012-09-03 13:33:16 -05:00
Jesse McConnell
41e9b1f6e2
[maven-release-plugin] prepare release jetty-7.6.6.v20120903
2012-09-03 13:33:10 -05:00
Jesse McConnell
6c0b0af2fe
[maven-release-plugin] prepare release jetty-8.1.6.v20120903
2012-09-03 13:33:08 -05:00
Jesse McConnell
6d2c793edc
Merge branch 'master' into jetty-8
2012-09-03 12:48:21 -05:00
Greg Wilkins
fd01a1b496
JETTY-1541 fixed different behaviour for single byte writes
2012-09-03 17:57:37 +10:00
Greg Wilkins
c3776764f4
jetty-9 ConcurrentScheduler refinements
2012-09-03 15:24:36 +10:00
Greg Wilkins
8331b1db71
jetty-9 some useful debug
2012-08-31 14:05:40 +10:00
Greg Wilkins
83dbca6553
jetty-9 reworked the schedulers
2012-08-31 13:22:58 +10:00
Greg Wilkins
72827aa44d
jetty-9 TODOs
2012-08-31 08:05:09 +10:00
Simone Bordet
6531cbb69c
Jetty9 - Renamed class removing "Async".
2012-08-30 11:14:00 +02:00
Simone Bordet
7586e5c9e9
Jetty9 - More tests for HTTP over SPDY.
2012-08-29 22:42:35 +02:00
Simone Bordet
2d7a80c44b
Jetty9 - Parametrized tests on the SPDY version.
2012-08-29 21:04:00 +02:00
Simone Bordet
bf30ec24a5
Jetty9 - Removed the concept of multiple connection factories in SPDYClient.
...
A client is given a version when instantiated; as such it makes no sense to have
multiple connection factories, as the client only supports one SPDY version.
2012-08-29 21:04:00 +02:00
Simone Bordet
8920cd16b6
Jetty9 - Ported the HTTP SPDY Proxy code.
2012-08-29 18:12:28 +02:00
Simone Bordet
9522bcb404
Jetty9 - Including also the spdy-jetty-http-webapp module.
2012-08-28 16:39:09 +02:00
Simone Bordet
7a2b53d987
Jetty9 - Dispatching the onConnect(Session) callback in a different thread.
...
This is needed for two reasons: the first is that onOpen() is called from the selector thread
and onConnect() may perform I/O (such as sending a SETTINGS frame), and second
because onOpen() may be called when NPN upgrades the connection.
In the latter case, SslConnection is busy with the SSL handshake (for example is filling)
and calling onConnect() triggers a write, that ends up in the SslConnection that sees that
it is still in the SSL handshake and needs to fill, resulting in a reentrant fill, which is not
supported correctly by SslConnection.
Dispatching to a new thread makes the call safe, since SslConnection is properly synchronized.
2012-08-28 15:20:14 +02:00
Simone Bordet
2339da7cc0
Jetty9 - Marked tests as @Slow.
2012-08-28 13:04:18 +02:00
Simone Bordet
156f07d493
Jetty9 - Greatly simplified HttpChannelOverSPDY.
...
Removed old code that was not necessary anymore.
2012-08-28 09:33:11 +02:00
Simone Bordet
a224a8e962
Jetty9 - Ignored two tests because the functionality they test is not yet implemented.
2012-08-27 17:21:58 +02:00
Simone Bordet
edd40ec299
Jetty9 - Fixed ProtocolNegotiationTest and additional minor cleanups/logging/comments.
2012-08-27 17:13:38 +02:00
Simone Bordet
1a2266b1b8
Jetty9 - Fixed test by specifying hardcoded idle timeout to avoiding NPE.
2012-08-27 16:58:29 +02:00
Simone Bordet
bc0f9cd9e6
Jetty9 - Made test more robust.
2012-08-27 09:21:56 +02:00
Simone Bordet
5a3a25c880
Jetty9 - Logging idle timeouts.
2012-08-27 09:21:35 +02:00
Simone Bordet
7b58c584b9
Jetty9 - Fixed tests: now creating a connector requires an instance of Server, otherwise throws an NPE.
2012-08-27 08:38:27 +02:00
Greg Wilkins
9a1a020f0e
jetty-9 renamed HttpTransport.{commit|write} to send
2012-08-27 14:43:29 +10:00
Simone Bordet
cda0528625
Jetty9 - Second draft of SPDY wiring: more test cases pass, still work to do.
2012-08-24 19:36:10 +02:00
Simone Bordet
6b3d5f5390
Jetty9 - First draft of SPDY wiring: most test cases pass, still work to do.
2012-08-24 16:18:53 +02:00
Simone Bordet
171ad66962
Fixed compilation errors after merging branch 'jetty-9-aggregation' into jetty-9-spdy-http
2012-08-24 12:20:44 +02:00
Simone Bordet
06b2de17d5
Merge branch 'jetty-9-aggregation' into jetty-9-spdy-http
2012-08-24 11:52:29 +02:00
Jesse McConnell
6ffaa478c4
standardize license headers
2012-08-17 16:09:49 -05:00
Joakim Erdfelt
3d1d76d214
Merge from jetty-8 to jetty-9 (license header standarization)
2012-08-17 13:44:22 -07:00
Jesse McConnell
5de0cee1eb
merge from master + license block standardization
2012-08-17 14:50:43 -05:00
Greg Wilkins
086e74bed8
jetty-9 merged jetty-8
...
Merge remote-tracking branch 'origin/jetty-8' into jetty-9
Conflicts:
jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java
jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
jetty-server/src/test/java/org/eclipse/jetty/server/HttpConnectionTest.java
jetty-util/src/main/java/org/eclipse/jetty/util/log/StdErrLog.java
jetty-util/src/main/java/org/eclipse/jetty/util/resource/JarFileResource.java
jetty-util/src/test/java/org/eclipse/jetty/util/log/StdErrLogTest.java
2012-08-17 23:35:42 +10:00
Thomas Becker
b73ca3e316
interims changes
2012-08-17 11:52:59 +02:00
Jesse McConnell
00ed549898
standardize license header blocks
2012-08-16 19:11:27 -05:00
Thomas Becker
f8950b64bd
merge with jetty-9
2012-08-16 09:56:51 +02:00
Thomas Becker
aa22952368
interims commit
2012-08-16 09:47:33 +02:00
Simone Bordet
279f24faaa
Jetty9 - Removed duplicate logger definitions.
2012-08-13 11:48:32 +02:00
Greg Wilkins
73a89427b1
jetty-9 fixed some XML validation issues
2012-08-12 11:23:20 +10:00
Greg Wilkins
488f53f8d6
jetty-9 cleaned up the stop and stopTimeout handlng
2012-08-11 12:51:32 +10:00
Simone Bordet
2d832fa9ad
Jetty9 - Introduced Connection.close() for better stop of lifecycle components.
2012-08-10 10:32:45 +02:00
Greg Wilkins
afe489e986
jetty-9 potential SSL fix
2012-08-10 15:21:52 +10:00
Greg Wilkins
16b404754e
jetty-9 improved logging
2012-08-10 13:31:11 +10:00
Thomas Becker
731eb31c7e
interims changes
2012-08-09 18:54:41 +02:00
Simone Bordet
c4912f4a1d
Jetty9 - Removed "async" from class/method names.
2012-08-08 11:28:53 +02:00
Greg Wilkins
32c5f6c093
jetty-9 reduced LazyList usage
2012-08-08 11:58:50 +10:00
Simone Bordet
b1bb418fea
Jetty9 - SPDY cleanups.
2012-08-03 19:17:11 +02:00
Simone Bordet
433839bd47
Jetty9 - Introduced ConnectionFactory for SelectChannelConnector.
...
This change abstracts out the connection creation from the connector itself,
so there can be only one connector managing all protocols, depending on
the configuration of the connection factories.
2012-08-03 19:10:21 +02:00
Greg Wilkins
29833f000b
Merge branch 'jetty-9' into jetty-9-oneconnector
...
Conflicts:
jetty-io/src/main/java/org/eclipse/jetty/io/AsyncByteArrayEndPoint.java
jetty-io/src/main/java/org/eclipse/jetty/io/ChannelEndPoint.java
jetty-io/src/main/java/org/eclipse/jetty/io/WriteFlusher.java
jetty-io/src/main/java/org/eclipse/jetty/io/ssl/SslConnection.java
jetty-io/src/test/java/org/eclipse/jetty/io/WriteFlusherTest.java
2012-08-03 12:39:21 +10:00
Thomas Becker
137ccca7c5
jetty9 - Make WriteFlusher.java threadsafe
2012-08-03 01:06:41 +02:00
Thomas Becker
a4018d3484
merge with jetty-9
2012-08-02 15:00:43 +02:00
Thomas Becker
4e94601619
jetty-9: Make WriteFlusher threadsafe.
2012-08-02 14:38:54 +02:00
Greg Wilkins
0865a9cfb0
jetty-9 removed more AsyncConnection names
2012-08-02 18:10:29 +10:00
Greg Wilkins
b63e09df61
jetty-9 rudimentary connectionFactory impl
2012-08-02 17:44:29 +10:00
Greg Wilkins
b52930be14
jetty-9 merged Async and non-Async classes for EndPoint and Connection
2012-08-02 16:08:49 +10:00
Greg Wilkins
7c4fd9326e
jetty-9 one connector passing more tests
2012-08-02 14:17:49 +10:00
Simone Bordet
78802c35c2
Jetty9 - SPDY: computing return value for write() and small optimization in fill().
2012-07-31 16:18:42 +02:00
Simone Bordet
9c717d552f
Jetty9 - SPDY: gracefully shutting down the Session in case of read of -1 from the remote peer.
...
A special item is queued into the Session for flushing, and when it is dequeued it closes the
underlying connection.
This allows pending writes to complete before the underlying connection is closed.
2012-07-30 23:02:26 +02:00
Simone Bordet
b4b1bc814c
Jetty9 - SPDY: fixed copyright headers.
2012-07-30 23:02:26 +02:00
Simone Bordet
8d12e49988
Jetty9 - SPDY: removed System.out statements.
2012-07-30 23:02:25 +02:00
Thomas Becker
51d7404956
jetty-9: spdy replaced log4j with jetty-logging.properties
2012-07-30 16:19:24 +02:00
Simone Bordet
36729c4248
Jetty9 - Always returning false from onReadTimeout(). Either we do not have to close, or the goAway() will close after it is written.
2012-07-30 12:45:39 +02:00
Simone Bordet
3abb8cfd37
Jetty9 - Reverted test logging to INFO.
2012-07-29 15:04:27 +02:00
Simone Bordet
2dcee671e1
Jetty9 - Removed leftover debug statement.
2012-07-27 23:28:27 +02:00
Simone Bordet
592cb3432e
Jetty9 - Introduced NextProtoNego AsyncConnections to handle SSL with NPN.
2012-07-27 21:54:09 +02:00
Thomas Becker
369bc035fc
jetty-9: jetty-spdy refactored to match jetty-9.
2012-07-27 16:18:47 +02:00
Thomas Becker
b36a6cc9cc
jetty-9 checkout jetty-spdy from jetty-8
2012-07-27 15:51:14 +02:00
Jan Bartel
c67b2d89c0
Merge remote-tracking branch 'origin/master' into jetty-8
2012-07-27 16:05:15 +10:00
Thomas Becker
37e0b8ffe4
spdy: StandardSession format toString method
2012-07-26 13:10:08 +02:00
Simone Bordet
6aba6d1e8c
Jetty9 - Refactored SelectorManager and SelectChannelEndPoint.
...
Simplified Selectable interface, and improved idle timeout checking.
2012-07-20 13:04:28 +02:00
Simone Bordet
dfeb761306
Jetty9 - Now calling SelectorManager.newConnection() from a single call site rather than having to duplicate the call in every newEndPoint() implementation.
2012-07-19 18:43:23 +02:00
Simone Bordet
ebb7806edc
Jetty9 - Implemented abstract methods on SelectorManager that were always implemented in the same way, making them consistent.
2012-07-18 19:47:10 +02:00
Jesse McConnell
136514948f
[maven-release-plugin] prepare for next development iteration
2012-07-16 13:24:49 -05:00
Jesse McConnell
1bbc677a09
[maven-release-plugin] prepare release jetty-8.1.5.v20120716
2012-07-16 13:24:42 -05:00