Jesse McConnell
3167424943
Merge branch 'release-8' into jetty-8
2011-12-22 16:54:47 -06:00
Jesse McConnell
30bd9ee000
update version
2011-12-22 16:54:19 -06:00
Jesse McConnell
6fb729ea0d
[maven-release-plugin] prepare for next development iteration
2011-12-22 13:55:28 -06:00
Jesse McConnell
ac42188458
[maven-release-plugin] prepare release jetty-8.1.0.RC2
2011-12-22 13:55:23 -06:00
Jesse McConnell
9b592b7542
Merge branch 'jetty-8' into release-8
2011-12-22 13:31:58 -06:00
Jesse McConnell
97ce7f7f09
Merge branch 'master' into jetty-8
2011-12-22 13:08:42 -06:00
Jesse McConnell
9c4d49f3c4
[maven-release-plugin] rollback the release of jetty-8.1.0.RC2
2011-12-22 13:07:39 -06:00
Jesse McConnell
d7ba9772f6
Updating VERSION.txt top section
2011-12-22 12:56:08 -06:00
Jesse McConnell
9c678793c5
Merge branch 'jetty-8' into release-8
2011-12-22 12:55:21 -06:00
Greg Wilkins
a4bba4f99c
364921 Made test less time sensitive for ssl
2011-12-23 01:23:59 +11:00
Greg Wilkins
b4ab738ca9
364921 Made test less time sensitive for ssl
2011-12-23 00:57:26 +11:00
Greg Wilkins
d5f4b157d9
Merge remote-tracking branch 'origin/master' into jetty-8
2011-12-23 00:38:35 +11:00
Greg Wilkins
4fc12483aa
Merge branch 'jetty-8' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-8
2011-12-23 00:38:27 +11:00
Greg Wilkins
4e2e576fdb
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2011-12-23 00:37:13 +11:00
Greg Wilkins
31471e11cc
364921 Made test less time sensitive
2011-12-23 00:35:32 +11:00
Jesse McConnell
6a967ff2fe
Skip two failing unit tests on mac and windows for the time being, tests
...
are commented on what the underlying open question is
2011-12-22 07:02:05 -06:00
Jan Bartel
0dfc9feaf9
367383 jsp-config element must be returned for ServletContext.getJspConfigDescriptor
2011-12-22 19:30:01 +11:00
Greg Wilkins
f8cd2e9a0c
365947 Set headers for Auth failure and retry in http-spi
2011-12-22 17:34:19 +11:00
Greg Wilkins
b36425b7aa
Merge remote-tracking branch 'origin/master' into jetty-8
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
2011-12-22 09:52:11 +11:00
Jesse McConnell
e96f828dcf
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2011-12-21 14:12:46 -06:00
Jesse McConnell
8981176dda
remove snapshot repo to see if that resolves issue with p2 snapshot build
2011-12-21 14:12:25 -06:00
Greg Wilkins
7b2a0cb502
364921 removed debug
2011-12-22 00:53:33 +11:00
Greg Wilkins
b99e03c465
364921 moved setCheckForIdle handling to AsyncHttpConnection
2011-12-22 00:48:25 +11:00
Simone Bordet
ef23bf11b8
Merged from origin/master.
2011-12-21 10:45:06 +01:00
Simone Bordet
744f76f6c9
Added an idle timeout test.
2011-12-21 10:34:33 +01:00
Jan Bartel
55c98c010e
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2011-12-21 12:59:14 +11:00
Jan Bartel
2028bbb444
JETTY-1465 NPE in ContextHandler.toString
2011-12-21 12:57:33 +11:00
Greg Wilkins
93a89026ce
364921 Improved timeout tests
2011-12-21 12:44:50 +11:00
Jan Bartel
c3643d9937
Merge remote-tracking branch 'origin/master' into jetty-8
2011-12-21 12:37:23 +11:00
Greg Wilkins
a606529710
364921 SslConnection does real close on idle if already oshut
2011-12-21 10:06:55 +11:00
Joakim Erdfelt
2ca897c1ea
367219 - WebSocketClient.open() fails when URI uses default ports.
...
+ Fixing testcase to not fail if http://localhost/ exists.
Reworking code to not rely on existence of server to validate the
correct behavior of URI port parsing.
2011-12-20 13:01:23 -07:00
Simone Bordet
8ea22a6a4c
367219 - WebSocketClient.open() fails when URI uses default ports.
2011-12-20 18:01:45 +01:00
Simone Bordet
ecb88f836e
367175 - SSL 100% CPU spin in case of blocked write and RST.
2011-12-20 13:25:55 +01:00
Greg Wilkins
070a2b5759
JETTY-1463 websocket D0 parser should return progress even if no fill done
2011-12-20 14:54:50 +11:00
Greg Wilkins
b67961ada3
JETTY-1463 websocket D0 parser should return progress even if no fill done
2011-12-20 12:00:48 +11:00
Greg Wilkins
569e930185
367048 test harness for guard on suspended requests
2011-12-20 11:13:45 +11:00
Greg Wilkins
b7d8bd4f28
364638 HttpParser closes if data received while seeking EOF. Tests fixed to cope
2011-12-20 10:55:56 +11:00
Greg Wilkins
c5c6377e26
some IOTests to show that clients can write after server close???
2011-12-20 09:21:18 +11:00
Greg Wilkins
d2a91f40cd
disable continuation 6 testing
2011-12-20 08:08:02 +11:00
Joakim Erdfelt
960407492a
Removing System.out debug
2011-12-19 13:13:57 -07:00
Joakim Erdfelt
93ebd1dbe5
Using straight Socket as HttpURLConnection request header modifications are not reliable enough for testing purposes
2011-12-19 13:06:54 -07:00
Joakim Erdfelt
95f763fab4
Bug 367099 - Upgrade jetty-websocket for RFC 6455
...
+ Adding new RFC declared close codes 1011 (CLOSE_SERVER_ERROR) and
1015 (CLOSE_FAILED_TLS_HANDSHAKE)
+ Adding support for responding as CLOSE_SERVER_ERROR if an unhandled
exception (similar to how HTTP error 500 works) but for exceptions
thrown out of implementations of WebSocket.
+ Adding guard to prevent use of CLOSE_FAILED_TLS_HANDSHAKE on
close control frame.
+ Adding unit test for the CLOSE_SERVER_ERROR case.
+ Adding unit test for HTTP response 400 on bad Sec-WebSocket-Version
request header value.
2011-12-19 12:29:15 -07:00
Joakim Erdfelt
874a6502f4
Adding missing license headers.
2011-12-19 10:06:58 -07:00
Joakim Erdfelt
6d907fa61d
Bug 367099 - Upgrade jetty-websocket for RFC 6455
...
+ Renaming *D13 classes to *RFC6455 per dicussion in jetty-dev mailing
list
2011-12-19 10:03:01 -07:00
Greg Wilkins
f7103d88f9
364638 reverted write after shutdown handling
2011-12-19 21:56:42 +11:00
Greg Wilkins
b027779830
364638 check for idle after shutdown output
2011-12-19 16:53:14 +11:00
Greg Wilkins
f767d8d910
367048 improved handleRequest guard for suspended requests
2011-12-19 15:15:00 +11:00
Joakim Erdfelt
44de94f185
Attempting to write a better timeout test
2011-12-16 14:45:38 -07:00
Joakim Erdfelt
a5d18d48ad
Attempting to get a non-ssl version of the timeout bug into a unit test
2011-12-16 14:16:32 -07:00
Simone Bordet
3e05c1e59d
Merged from origin/master.
2011-12-16 21:30:45 +01:00