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
Thomas Becker
b370da6783
415548 migrate ProxyHTTPToSPDYTest to use HttpClient to avoid intermittent NPE
2013-08-30 17:16:14 +02:00
Thomas Becker
b54538793b
416251 ProxyHTTPToSPDYConnection now sends a 502 to the client if it receives a rst frame from the upstream spdy server
2013-08-30 17:15:15 +02:00
Thomas Becker
1ad4f89638
416251 ProxyHTTPToSPDYConnection now sends a 502 to the client if it receives a rst frame from the upstream spdy server
2013-08-30 17:15:15 +02:00
Thomas Becker
f12afb2888
415548 migrate ProxyHTTPToSPDYTest to use HttpClient to avoid intermittent NPE part 2
2013-08-30 17:15:14 +02:00
Thomas Becker
fcdea1d4b4
416242 respect persistence headers in ProxyHTTPSPDYConnection
2013-08-30 17:15:14 +02:00
Thomas Becker
9565d2647e
415548 migrate ProxyHTTPToSPDYTest to use HttpClient to avoid intermittent NPE part 2
2013-08-30 17:15:14 +02:00
Thomas Becker
936343a3e5
415548 migrate ProxyHTTPToSPDYTest to use HttpClient to avoid intermittent NPE
2013-08-30 17:15:13 +02:00
Jesse McConnell
ac30f5c9bd
update other jetty mods to new format
2013-08-29 16:39:28 -05:00
Greg Wilkins
b884fabba6
Merge branch 'jetty-9.1' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9.1
2013-08-29 12:38:53 +10:00
Thomas Becker
ac156b9111
415780 fix StreamAlreadyCommittedException in spdy build
2013-08-28 17:15:48 +02:00
Greg Wilkins
c84063a5f8
415826 start.jar replace --enable with --initialize
...
refactored impl to be clearer when creating ini
2013-08-28 23:53:32 +10:00
Thomas Becker
af1abb7af6
416026 improve error handlig in SPDY parsers
2013-08-28 14:45:39 +02:00
Greg Wilkins
c1bd267c17
415826 start.jar replace --enable with --initialize
2013-08-28 15:41:27 +10:00
Joakim Erdfelt
29670845e7
jetty-start / fleshing out with spdy test case
2013-08-26 16:08:08 -07:00
Joakim Erdfelt
25ef708b48
Module fixes
2013-08-26 16:04:41 -07:00
Joakim Erdfelt
a6527a2ae0
Javadoc fixes
2013-08-26 16:04:28 -07:00
Jesse McConnell
2ac2a1a974
add npn.mod
2013-08-26 17:22:40 -05:00
Jesse McConnell
ef166c23e6
Merge branch 'release-9'
2013-08-23 18:58:01 -05:00
Joakim Erdfelt
2e94149ea3
Merge branch 'jetty-9.1' into jetty-9.1-altstart
2013-08-23 11:49:41 -07:00
Greg Wilkins
a6b6891d8b
415641 Remove remaining calls to deprecated HttpTranspoert.send
...
Actually removed the impl of the deprecated method that is no longer called.
2013-08-23 10:23:52 +10:00
Jesse McConnell
0032c1443d
add spdy and websocket mod
2013-08-22 13:23:29 -05:00
Thomas Becker
465f151669
415641 Remove remaining calls to deprecated HttpTranspoert.send(HttpGenerator.ResponseInfo info, ByteBuffer content, boolean lastContent) throws IOException
2013-08-22 14:00:27 +02:00
Thomas Becker
525b268d41
415656 SPDY - add IdleTimeout per Stream functionality
2013-08-22 14:00:27 +02:00
Thomas Becker
e34ba252a2
413737 hide stacktrace in ReferrerPushStrategyTest
2013-08-15 13:13:23 +02:00
Thomas Becker
c5e4457124
413737 hide stacktrace in ReferrerPushStrategyTest
2013-08-15 13:13:15 +02:00
Thomas Becker
345ee15d87
413737 hide stacktrace in ReferrerPushStrategyTest
2013-08-15 13:00:50 +02:00
Thomas Becker
050ac79f3d
413737 hide stacktrace in ReferrerPushStrategyTest
2013-08-15 12:13:44 +02:00
Jan Bartel
c80100b4a9
[maven-release-plugin] prepare for next development iteration
2013-08-15 19:13:27 +10:00
Jan Bartel
e7e7e45500
[maven-release-plugin] prepare release jetty-9.0.5.v20130815
2013-08-15 19:13:13 +10:00
Jan Bartel
716430bb03
[maven-release-plugin] rollback the release of jetty-9.0.5.v20130815
2013-08-15 18:03:49 +10:00
Jan Bartel
3d13c15d35
[maven-release-plugin] prepare release jetty-9.0.5.v20130815
2013-08-15 17:22:03 +10:00
Jan Bartel
7947b35134
Reset version for rerun of 9.0.5
2013-08-15 16:47:03 +10:00
Jesse McConnell
00d160a1c9
Merge branch 'release-9.1' into jetty-9.1
2013-08-14 14:37:19 -05:00
Jesse McConnell
657e78aff2
[maven-release-plugin] prepare for next development iteration
2013-08-14 13:28:42 -05:00
Jesse McConnell
590fae2bc4
[maven-release-plugin] prepare release jetty-9.1.0.M0
2013-08-14 13:28:32 -05:00
Simone Bordet
34032552ea
Avoid boxing of primitive int variables in logging statements.
2013-08-14 14:33:05 +02:00
Jesse McConnell
67a7a37923
ignore test
2013-08-13 14:25:47 -05:00
Jesse McConnell
4383c9042d
[maven-release-plugin] prepare for next development iteration
2013-08-13 14:20:56 -05:00
Jesse McConnell
160d34ec23
[maven-release-plugin] prepare release jetty-9.0.5.v20130813
2013-08-13 14:20:47 -05:00
Thomas Becker
fffdd6b2fa
Connection javadoc fix
2013-08-13 18:27:06 +02:00
Greg Wilkins
34cfc3ed10
Merge remote-tracking branch 'origin/master' into jetty-9.1
...
Conflicts:
jetty-http/src/main/java/org/eclipse/jetty/http/HttpFields.java
jetty-http/src/test/java/org/eclipse/jetty/http/HttpFieldsTest.java
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
2013-08-09 13:50:49 +10:00
Greg Wilkins
a779425994
414101 Do not escape special characters in cookies
2013-08-09 12:42:52 +10:00
Thomas Becker
e628478eb4
Replace calls to deprecated HttpTransport.send(..) method in SPDY code
2013-07-26 17:52:16 +02:00
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