6a22a9f5b9
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-08-09 14:46:25 +10:00
66620b77b8
414507 Ensure AnnotationParser ignores parent dir hierarchy when checking for hidden dirnames
2013-08-09 14:19:04 +10:00
59a070a9fe
Merged branch 'jetty-7' into 'jetty-8'.
2013-08-08 12:10:19 +02:00
4ce4615597
414652 - WebSocket's sendMessage() may hang on congested connections.
...
Fixed by using Locks instead of the synchronized keyword, and by using tryLock()
in flushBuffer() and flush(), that are called by WebSocketConnection.handle().
It is quite a hack, but the real fix is in Jetty 9 where the architecture is different
and there are two different paths for reading and writing, so that this problem
could not even happen.
2013-08-08 12:09:11 +02:00
f22217392b
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
...
Conflicts:
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
2013-08-08 12:28:51 +10:00
f983629434
414507 AnnotationParser should skip classes in hidden dirs or with . name prefix
2013-08-08 12:09:29 +10:00
432964cf5f
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
...
Conflicts:
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
2013-08-05 18:03:11 +10:00
f3f2bce36c
414393 StringIndexOutofBoundsException with > 8k multipart content without CR or LF
2013-08-05 17:18:44 +10:00
446820071b
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-08-05 12:35:16 +10:00
f5fb412eba
414235 - RequestLogHandler configured on a context fails to handle forwarded requests
2013-08-05 12:32:21 +10:00
01786aa0c2
Merge branch 'jetty-7' into jetty-8
2013-08-02 15:11:05 -07:00
79ac8ad22d
Fixing License Header to conform with standard with rest of project
2013-08-02 14:34:03 -07:00
2057c4c17b
Upgrading Junit + Hamcrest
2013-08-02 14:25:53 -07:00
5094dc059d
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
...
Conflicts:
VERSION.txt
example-jetty-embedded/pom.xml
jetty-aggregate/jetty-all-server/pom.xml
jetty-aggregate/jetty-all/pom.xml
jetty-aggregate/jetty-client/pom.xml
jetty-aggregate/jetty-plus/pom.xml
jetty-aggregate/jetty-server/pom.xml
jetty-aggregate/jetty-servlet/pom.xml
jetty-aggregate/jetty-webapp/pom.xml
jetty-aggregate/jetty-websocket/pom.xml
jetty-aggregate/pom.xml
jetty-ajp/pom.xml
jetty-annotations/pom.xml
jetty-client/pom.xml
jetty-continuation/pom.xml
jetty-deploy/pom.xml
jetty-distribution/pom.xml
jetty-http-spi/pom.xml
jetty-http/pom.xml
jetty-io/pom.xml
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp/pom.xml
jetty-monitor/pom.xml
jetty-nested/pom.xml
jetty-nosql/pom.xml
jetty-osgi/jetty-osgi-boot-jsp/pom.xml
jetty-osgi/jetty-osgi-boot-logback/pom.xml
jetty-osgi/jetty-osgi-boot-warurl/pom.xml
jetty-osgi/jetty-osgi-boot/pom.xml
jetty-osgi/jetty-osgi-equinoxtools/pom.xml
jetty-osgi/jetty-osgi-httpservice/pom.xml
jetty-osgi/pom.xml
jetty-osgi/test-jetty-osgi-context/pom.xml
jetty-osgi/test-jetty-osgi-webapp/pom.xml
jetty-osgi/test-jetty-osgi/pom.xml
jetty-overlay-deployer/pom.xml
jetty-plus/pom.xml
jetty-policy/pom.xml
jetty-rewrite/pom.xml
jetty-security/pom.xml
jetty-server/pom.xml
jetty-servlet/pom.xml
jetty-servlets/pom.xml
jetty-spdy/pom.xml
jetty-spdy/spdy-core/pom.xml
jetty-spdy/spdy-jetty-http-webapp/pom.xml
jetty-spdy/spdy-jetty-http/pom.xml
jetty-spdy/spdy-jetty/pom.xml
jetty-start/pom.xml
jetty-util/pom.xml
jetty-webapp/pom.xml
jetty-websocket/pom.xml
jetty-xml/pom.xml
pom.xml
test-continuation/pom.xml
test-jetty-nested/pom.xml
test-jetty-servlet/pom.xml
test-jetty-webapp/pom.xml
tests/pom.xml
tests/test-integration/pom.xml
tests/test-loginservice/pom.xml
tests/test-sessions/pom.xml
tests/test-sessions/test-hash-sessions/pom.xml
tests/test-sessions/test-jdbc-sessions/pom.xml
tests/test-sessions/test-mongodb-sessions/pom.xml
tests/test-sessions/test-sessions-common/pom.xml
tests/test-webapps/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
2013-08-01 12:40:23 +10:00
e87eee1b46
412629 PropertyFileLoginModule doesn't cache user configuration file even for refreshInterval=0
2013-08-01 11:56:13 +10:00
223c8ad7b4
Merge branch 'release-8' into jetty-8
2013-07-31 12:12:59 -05:00
2380d748f8
set for dev
2013-07-31 12:12:38 -05:00
b706f541ec
Merge branch 'release-7' into jetty-7
2013-07-31 12:09:53 -05:00
9db05ac2fa
set for dev
2013-07-31 12:09:17 -05:00
20bd1e0f96
[maven-release-plugin] prepare for next development iteration
2013-07-26 11:50:17 -05:00
49c3b2c32a
[maven-release-plugin] prepare release jetty-8.1.12.v20130726
2013-07-26 11:49:58 -05:00
6ed360c480
reset for release
2013-07-26 11:23:57 -05:00
8de5fbbac7
Merge branch 'release-8' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into release-8
2013-07-26 11:18:52 -05:00
1a5117e9ab
[maven-release-plugin] prepare release jetty-8.1.12.v20130726
2013-07-26 11:18:24 -05:00
650e8e93ae
[maven-release-plugin] prepare for next development iteration
2013-07-26 10:57:33 -05:00
e7e2fce56e
[maven-release-plugin] prepare release jetty-7.6.12.v20130726
2013-07-26 10:57:26 -05:00
ed660fffd7
set for release
2013-07-26 10:51:28 -05:00
98249488d4
set for release
2013-07-26 10:49:24 -05:00
869389e857
set for release
2013-07-26 10:48:53 -05:00
d87a3884ad
Merge branch 'jetty-8' into release-8
2013-07-26 10:38:24 -05:00
e59f1d2191
set for release
2013-07-26 10:30:55 -05:00
ef7ea3cbbf
Merge branch 'jetty-7' into release-7
2013-07-26 10:28:27 -05:00
5a0278fc3f
Merge branch 'jetty-7' into jetty-8
2013-07-26 10:26:46 -05:00
192f2d7002
BUG-413812
...
Mark RateTracker as Serializable to allow it to be stored in a Session that is
eventually persisted in a distributed memory platform.
Signed-off-by: David Harrigan <dharrigan@gmail.com>
2013-07-26 10:24:03 -05:00
6622e06841
set for release
2013-07-26 09:13:52 -05:00
e1db76563a
Merge branch 'jetty-7' into release-7
2013-07-26 09:12:45 -05:00
b7b3ced092
Merged branch 'jetty-7' into 'jetty-8'.
2013-07-26 13:46:08 +02:00
2be4ca5921
Reverted VERSION.txt.
2013-07-26 13:45:41 +02:00
5c7eb9e265
Reverted version to 7.6.12-SNAPSHOT.
2013-07-26 13:36:35 +02:00
a0519a9693
413371 - Default JSON.Converters for List and Set.
...
Introduced a JSONCollectionConvertor that is able to convert
Collections, and hence both List and Set.
Code cleanups.
2013-07-26 13:09:11 +02:00
4a5567433c
413372 JSON Enum uses name rather than toString()
2013-07-26 16:06:32 +10:00
9137644595
Merge branch 'release-7' into jetty-7
2013-07-25 15:10:09 -05:00
e810727b55
set for dev
2013-07-25 15:09:03 -05:00
49045558ef
[maven-release-plugin] prepare for next development iteration
2013-07-25 14:07:12 -05:00
9b888d5c22
[maven-release-plugin] prepare release jetty-7.6.12.v20130725
2013-07-25 14:06:53 -05:00
de2840ca1e
[maven-release-plugin] prepare for next development iteration
2013-07-25 12:52:15 -05:00
3e94867f7f
[maven-release-plugin] prepare release jetty-8.1.12.v20130725
2013-07-25 12:52:07 -05:00
6338ce23e0
remove test
2013-07-25 12:28:05 -05:00
6b8f29bb88
add import
2013-07-25 12:27:36 -05:00
3813b2da76
remove for release
2013-07-25 12:05:33 -05:00
Jan Bartel
Simone Bordet
Joakim Erdfelt
Jesse McConnell
David Harrigan
Greg Wilkins