Jesse McConnell
2700581906
Merge from master
2011-10-13 07:59:30 -05:00
Greg Wilkins
72310d0c03
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2011-10-13 15:19:34 +11:00
Greg Wilkins
54d0944019
no ForwardServer
2011-10-13 15:18:55 +11:00
Jan Bartel
160385606c
358263 - JDBCSessionIdManager add setDatasource(DataSource) method
2011-10-13 13:58:25 +11:00
Jesse McConnell
eeb617f4d8
Adding an example of a forwarding rewrite embedded server
2011-10-12 21:00:42 -05:00
Jesse McConnell
b0a2098544
Merge branch 'release-8' into jetty-8
2011-10-11 11:04:15 -05:00
Jesse McConnell
ec1a23adc9
Updating VERSION.txt top section
2011-10-11 11:03:39 -05:00
Jesse McConnell
a38f2a9e68
[maven-release-plugin] prepare for next development iteration
2011-10-11 10:16:54 -05:00
Jesse McConnell
55a1be5435
[maven-release-plugin] prepare release jetty-8.0.3.v20111011
2011-10-11 10:16:47 -05:00
Jesse McConnell
16854504c7
Merge branch 'jetty-8' into release-8
2011-10-11 09:53:13 -05:00
Jesse McConnell
1dc4666ccd
set version in http-spi
2011-10-11 09:52:47 -05:00
Jesse McConnell
adc04c9132
Merge branch 'release'
2011-10-11 09:50:37 -05:00
Jesse McConnell
3e62343aae
Updating VERSION.txt top section
2011-10-11 09:48:57 -05:00
Jesse McConnell
2038d75c8c
Updating VERSION.txt top section
2011-10-11 09:47:05 -05:00
Jesse McConnell
93180f8f81
Merge branch 'jetty-8' into release-8
2011-10-11 09:46:02 -05:00
Jesse McConnell
c62d01f115
add kdiff orig merge files to gitignore
2011-10-11 09:45:08 -05:00
Jesse McConnell
925335dab2
merge from master
2011-10-11 09:43:27 -05:00
Jesse McConnell
7d10182034
[maven-release-plugin] prepare for next development iteration
2011-10-11 08:47:07 -05:00
Jesse McConnell
b6ac542604
[maven-release-plugin] prepare release jetty-7.5.3.v20111011
2011-10-11 08:47:00 -05:00
Jesse McConnell
55842580aa
Updating VERSION.txt top section
2011-10-11 08:25:05 -05:00
Jesse McConnell
0f77ee6b34
Merge branch 'master' into release
2011-10-11 08:23:49 -05:00
Greg Wilkins
06f4ada935
gentler SSL close
2011-10-11 16:05:17 +11:00
Greg Wilkins
4149ff4d21
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2011-10-11 08:29:40 +11:00
Simone Bordet
3476887f8a
Forcing call to super.close() even if _closing is already set.
2011-10-10 19:09:03 +02:00
Greg Wilkins
7e3dc94edc
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2011-10-11 01:38:39 +11:00
Greg Wilkins
3b80b206f3
reduce verbosity of no progress checks
2011-10-11 01:37:15 +11:00
Jan Bartel
ea56eaff00
Cient socket fd leak when access an URL with bad domain
2011-10-10 13:09:58 +11:00
Joakim Erdfelt
64ce44c3dc
358649 - StdErrLog system properties for package/class logging LEVEL.
...
+ Fixing LogTest for deprecations in StdErrLog.setDebugEnabled()
2011-10-07 10:39:50 -07:00
Joakim Erdfelt
f81c1b68e2
358649 - StdErrLog system properties for package/class logging LEVEL.
...
* Remerging back into master now that 7.5.2 release is done.
2011-10-07 10:28:31 -07:00
Jesse McConnell
3ff03b0731
[Bug 348978] migrate jetty-http-spi
2011-10-07 11:37:33 -05:00
Jesse McConnell
4ca2828ace
Added javadoc with shutdown example
2011-10-07 10:20:33 -05:00
Jesse McConnell
9e18323acd
Merge branch 'release-8' into jetty-8
2011-10-06 20:12:26 -05:00
Jesse McConnell
22c15a8cb8
Updating VERSION.txt top section
2011-10-06 20:11:39 -05:00
Jesse McConnell
15ae01d4b6
Merge branch 'release'
2011-10-06 19:38:32 -05:00
Jesse McConnell
93c0cb62ca
Updating VERSION.txt top section
2011-10-06 19:38:14 -05:00
Jesse McConnell
b55ec9bac1
[maven-release-plugin] prepare for next development iteration
2011-10-06 17:59:52 -05:00
Jesse McConnell
e32e8b1377
[maven-release-plugin] prepare release jetty-8.0.2.v20111006
2011-10-06 17:59:46 -05:00
Jesse McConnell
3e1a8c08bc
Updating VERSION.txt top section
2011-10-06 17:32:47 -05:00
Jesse McConnell
8024831fec
Merge branch 'jetty-8' into release-8
2011-10-06 17:30:58 -05:00
Jesse McConnell
3c11c94f8b
resolve merge error
2011-10-06 17:30:15 -05:00
Jesse McConnell
0cd4f2ec5c
update update-version profile
2011-10-06 17:28:17 -05:00
Simone Bordet
e3949694d0
360051 SocketConnectionTest.testServerClosedConnection is excluded.
...
Reworked StreamEndPoint methods isInputShutdown(), isOutputShutdown(), shutdownInput(), shutdownOutput(), and updated subclasses to call super where appropriate.
The test had to be modified to work properly with SocketConnector, because behavior is different from SelectConnector, but the CPU spinning is fixed.
2011-10-06 17:28:17 -05:00
Simone Bordet
eadc1d418a
Removed dead code.
2011-10-06 17:28:17 -05:00
Jesse McConnell
f96bf09c64
add versions to reporting plugins, they don't seem to inherit from plugin management
2011-10-06 17:28:17 -05:00
Jesse McConnell
0c55c774d4
[maven-release-plugin] prepare for next development iteration
2011-10-06 17:25:38 -05:00
Jesse McConnell
4d822759de
[maven-release-plugin] prepare release jetty-7.5.2.v20111006
2011-10-06 17:25:32 -05:00
Jesse McConnell
97e286a1ab
update VERSION
2011-10-06 17:03:58 -05:00
Jesse McConnell
6dc33497d9
Merge branch 'master' into release
2011-10-06 17:00:34 -05:00
Simone Bordet
074722f8c7
360051 SocketConnectionTest.testServerClosedConnection is excluded.
...
Strengthened condition under which the handling is aborted due to a remote close: now checking also if the endpoint has been closed locally.
2011-10-06 22:05:23 +02:00
Jesse McConnell
9ac4e35b96
wqRevert "358649 - StdErrLog system properties for package/class logging LEVEL."
...
This reverts commit 12dbcadede
.
2011-10-06 14:16:03 -05:00