Jesse McConnell
91b7fa881d
Merge branch 'release-8' into jetty-8
2011-10-24 17:36:20 -05:00
Jesse McConnell
97d0d9d812
Updating VERSION.txt top section
2011-10-24 16:36:35 -05:00
Jesse McConnell
d5320d95ba
[maven-release-plugin] prepare for next development iteration
2011-10-24 15:02:30 -05:00
Jesse McConnell
d02f74a50c
[maven-release-plugin] prepare release jetty-8.0.4.v20111024
2011-10-24 15:02:23 -05:00
Jesse McConnell
79c674a4ce
Updating VERSION.txt top section
2011-10-24 14:40:03 -05:00
Jesse McConnell
b074bbdeba
Merge branch 'jetty-8' into release-8
2011-10-24 14:39:27 -05:00
Jesse McConnell
e9ef517b38
pull latest merge from master
2011-10-24 14:38:54 -05:00
Jesse McConnell
261bb4a71f
update jetty version maven plugin version
2011-10-24 13:55:02 -05:00
Jesse McConnell
ae16ccd918
add merge tool bit to gitignore
2011-10-24 10:56:43 -05:00
Jan Bartel
fc497fe1e8
Merge remote-tracking branch 'origin/master' into jetty-8
2011-10-24 16:30:10 +11:00
Greg Wilkins
cd0628ab66
Added isDebugEnabled guards to debugging that generates garbage
2011-10-22 09:39:54 +11:00
Simone Bordet
810223e259
361655 ExecutorThreadPool.isLowOnThreads() returns wrong value.
...
Optimized by calling getActiveCount() last, since it locks the thread pool.
2011-10-21 22:53:20 +02:00
Simone Bordet
d4603e1fdd
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2011-10-21 16:26:18 +02:00
Simone Bordet
309e347d18
361655 ExecutorThreadPool.isLowOnThreads() returns wrong value.
...
Method isLowOnThreads() now return a value similar to what QueuedThreadPool does.
Also taken the chance to refactor constructors, and clarify that if an unbounded queue
like LinkedBlockingQueue is used, then the corePoolSize must be equal to the maxPoolSize.
2011-10-21 16:25:37 +02:00
Jan Bartel
a6b41a7deb
Merge from master, fix addFilter method signature for servlet 3.0.
2011-10-21 15:51:24 +11:00
Jan Bartel
0ba6fc7408
Merge remote-tracking branch 'origin/master' into jetty-8
2011-10-21 14:55:39 +11:00
Greg Wilkins
05fcd01d02
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2011-10-21 09:33:14 +11:00
Greg Wilkins
50af4d4b62
361456 - release timer task on connection failed
2011-10-21 09:20:30 +11:00
Joakim Erdfelt
385bc15726
358649 - Replace existing StdErrLog system properties for DEBUG/IGNORED with LEVEL instead.
...
Adding special case for "log.LEVEL" to set the root logging level.
2011-10-20 14:47:26 -07:00
Greg Wilkins
b0a9ec30f9
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2011-10-19 23:34:47 +11:00
Greg Wilkins
1d00f786a5
reduce verbosity of closes
2011-10-19 23:34:21 +11:00
Simone Bordet
d5a2ec877c
360912 CrossOriginFilter does not send Access-Control-Allow-Origin on responses.
...
355103 Make allowCredentials default to true in CrossOriginFilter.
The actual response now contains the Access-Control-Allow-Origin header, and fixed also 355103 that was not really fixed.
Added test suite.
2011-10-19 13:50:53 +02:00
Greg Wilkins
4c89a79449
JETTY-1444 start threadpool before selector manager
2011-10-19 17:23:03 +11:00
Greg Wilkins
22f1d83f10
360836 Accept parameters with bad UTF-8. Use replacement character
2011-10-19 16:32:05 +11:00
Greg Wilkins
c93e1c297f
360836 Accept parameters with bad UTF-8. Use replacement character
2011-10-19 16:23:56 +11:00
Greg Wilkins
acc1b19228
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2011-10-19 15:21:57 +11:00
Greg Wilkins
d63577b4e9
361325 359292 Allow KeyStore to be set
2011-10-19 15:20:01 +11:00
Jan Bartel
d71fd55665
361319 Log initialization does not catch correct exceptions on all jvms
2011-10-19 12:28:23 +11:00
Greg Wilkins
0fd0f5a7a1
361135 secure cookies for sessions
2011-10-19 12:21:26 +11:00
Joakim Erdfelt
e9c398e86b
Let StdErrLog *.LEVEL come from configured properties instead
2011-10-14 08:27:08 -07:00
Simone Bordet
f2bf8c277b
360938 Connections closed after a while.
...
Resetting _total_no_progress when progress is made, to avoid that the endpoint is closed after a while of normal activity.
2011-10-14 12:45:41 +02:00
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
