Jesse McConnell
cf214ffeef
Merge branch 'master' into jetty-8
2012-05-24 08:35:22 -05:00
Jesse McConnell
c7a9adaa32
reset for release
2012-05-24 08:33:44 -05:00
Jesse McConnell
c8fe38733f
reset versions for release
2012-05-24 08:30:26 -05:00
Greg Wilkins
d80be96e41
379046 avoid closing idle connections from selector thread
2012-05-24 13:20:44 +02:00
Jesse McConnell
ea176f0586
[maven-release-plugin] prepare for next development iteration
2012-05-22 15:14:05 -05:00
Jesse McConnell
3fdda881d8
[maven-release-plugin] prepare release jetty-8.1.4.v20120522
2012-05-22 15:13:56 -05:00
Jesse McConnell
300a37319a
[maven-release-plugin] prepare for next development iteration
2012-05-22 14:34:10 -05:00
Jesse McConnell
9ccd059375
[maven-release-plugin] prepare release jetty-7.6.4.v20120522
2012-05-22 14:33:59 -05:00
Jan Bartel
2131a40559
Merge remote-tracking branch 'origin/master' into jetty-8
2012-05-07 13:54:30 +02:00
Thomas Becker
011ae1f447
377587: UnitTest for ConnectHandler.write() with partial writes and non full buffer.
...
Change-Id: I8a8a3d57cba7a9c3502d1b6af6ff6eb5ac4e4ef5
377587: UnitTest for ConnectHandler.write() with partial writes and non full buffer.
Change-Id: I8d104d54de55e22325d14e69b474b245fe9d126c
2012-04-27 11:13:44 +02:00
Greg Wilkins
5e83df20c8
various sonar/findbug code cleanups
2012-04-25 00:00:54 +10:00
Jesse McConnell
b64909900c
[maven-release-plugin] prepare for next development iteration
2012-04-13 15:31:47 -05:00
Jesse McConnell
2c0a35d430
[maven-release-plugin] prepare release jetty-8.1.3.v20120413
2012-04-13 15:31:38 -05:00
Jesse McConnell
b963840d40
[maven-release-plugin] prepare for next development iteration
2012-04-13 15:29:14 -05:00
Jesse McConnell
a652ee7396
[maven-release-plugin] prepare release jetty-7.6.3.v20120413
2012-04-13 15:29:05 -05:00
Simone Bordet
72040202d4
Reverted release back to 8.1.3-SNAPSHOT.
2012-04-13 17:27:37 +02:00
Simone Bordet
85710fb9ea
Reverted release back to 7.6.3-SNAPSHOT.
2012-04-13 16:59:06 +02:00
Jesse McConnell
3b87e91cbe
[maven-release-plugin] prepare for next development iteration
2012-04-12 10:29:30 -05:00
Jesse McConnell
308b010744
[maven-release-plugin] prepare release jetty-8.1.3.v20120412
2012-04-12 10:29:20 -05:00
Jesse McConnell
cdcc0922c3
[maven-release-plugin] prepare for next development iteration
2012-04-12 09:49:52 -05:00
Jesse McConnell
5966c86571
[maven-release-plugin] prepare release jetty-7.6.3.v20120412
2012-04-12 09:49:46 -05:00
Greg Wilkins
b5e9de1cd8
Merge remote-tracking branch 'origin/master' into jetty-8
2012-04-12 17:16:22 +10:00
Greg Wilkins
a565c72adb
374550: remove printStackTrace calls
2012-04-12 16:51:59 +10:00
Jan Bartel
17269583fb
Merge remote-tracking branch 'origin/master' into jetty-8
2012-03-30 12:05:46 +11:00
Greg Wilkins
65725b0025
357318: make the cancel key work around conditional on running on windows
2012-03-23 09:21:00 +11:00
Greg Wilkins
d8b1d80e4e
Merge remote-tracking branch 'origin/master' into jetty-8
...
Conflicts:
jetty-spdy/spdy-jetty-http-webapp/pom.xml
jetty-spdy/spdy-jetty-http/pom.xml
jetty-spdy/spdy-jetty/pom.xml
2012-03-19 17:22:02 +11:00
Greg Wilkins
7e3b8bcfd4
374611: do not redispatch if already dispatched when SSL reads content on write
2012-03-19 15:48:39 +11:00
Greg Wilkins
7842e9c101
374450: use temp read only buffers instead of synchronisation
2012-03-16 10:05:38 +11:00
Greg Wilkins
a6eda90594
fixed merge issue
2012-03-16 09:16:46 +11:00
Simone Bordet
fef74963af
Forgotten modifications from Jetty7
2012-03-14 19:39:21 +01:00
Simone Bordet
5624a5721e
Merged from master.
2012-03-14 18:24:57 +01:00
Simone Bordet
2e2247bde5
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2012-03-14 16:32:03 +01:00
Simone Bordet
4a02fdb6c0
374252 - SslConnection.onClose() does not forward to nested connection.
2012-03-14 16:12:46 +01:00
Greg Wilkins
708f8ccaeb
374158: do not asyncDispatch from SSL if suspended
2012-03-14 11:48:06 +11:00
Jesse McConnell
b4985ad0d5
[maven-release-plugin] prepare for next development iteration
2012-03-08 23:53:50 -06:00
Jesse McConnell
7a99af4ffe
[maven-release-plugin] prepare release jetty-8.1.2.v20120308
2012-03-08 23:53:42 -06:00
Jesse McConnell
246e3ed756
[maven-release-plugin] prepare for next development iteration
2012-03-08 21:09:46 -06:00
Jesse McConnell
a63b3fdc5e
[maven-release-plugin] prepare release jetty-7.6.2.v20120308
2012-03-08 21:09:37 -06:00
Jesse McConnell
381615f52d
merge from master
2012-03-07 16:44:31 -06:00
Jesse McConnell
50d92ec8ef
reset versions
2012-03-06 17:07:53 -06:00
Jesse McConnell
f12e3c390c
reset versions
2012-03-06 17:06:10 -06:00
Thomas Becker
ff75d9e38a
373394: fix for IllegalArgumentException in SelectChannelEndpoint.blockWritable() when wait is called with a negative value.
2012-03-06 21:26:46 +01:00
Simone Bordet
ffdcfa5dde
Avoid reading field twice (may lead to spurious NPEs).
2012-03-06 18:09:58 +01:00
Jesse McConnell
54493cd80d
Merge "373246: IOTest.testReset uses dynamic port now instead of static hard coded one"
2012-03-05 09:18:08 -05:00
Thomas Becker
0adec36c29
373246: IOTest.testReset uses dynamic port now instead of static hard coded one
...
Change-Id: I9b254937fa02ba745832bf1b5c99069bea641bbd
2012-03-05 15:15:23 +01:00
Jesse McConnell
d1c8c477ea
[maven-release-plugin] prepare for next development iteration
2012-03-02 08:57:43 -06:00
Jesse McConnell
b75868e84f
[maven-release-plugin] prepare release jetty-8.1.2.v20120302
2012-03-02 08:57:19 -06:00
Jesse McConnell
51311d050e
[maven-release-plugin] prepare for next development iteration
2012-03-02 08:37:46 -06:00
Jesse McConnell
a8296ec3d5
[maven-release-plugin] prepare release jetty-7.6.2.v20120302
2012-03-02 08:37:38 -06:00
Jan Bartel
959a4a2743
Merge remote-tracking branch 'origin/master' into jetty-8
2012-03-02 10:39:17 +11:00
