Jesse McConnell
831791bdf4
Merge branch 'distro-rework-589' into jetty-9.4.x
2016-06-13 11:49:39 -05:00
Simone Bordet
046e2d2a80
Merged branch 'jetty-9.4.x' into 'master'.
2016-06-13 18:13:24 +02:00
Simone Bordet
dd2a31e240
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-06-13 18:12:34 +02:00
Simone Bordet
45eac1de69
Enlarged idle timeout to avoid failures in slower machines.
2016-06-13 18:11:07 +02:00
Simone Bordet
7c0d1ea026
Refactored tests to use HttpTester instead of SimpleHttpParser.
2016-06-13 17:55:03 +02:00
Simone Bordet
2b539b6383
Fixes #638 - ConnectHandler responses should have Content-Length.
...
Added Content-Length: 0 to the responses.
2016-06-13 17:54:41 +02:00
Jesse McConnell
9ca6d617a8
Merge branch 'jetty-9.4.x' into distro-rework-589
2016-06-13 10:08:22 -05:00
Simone Bordet
b9a27f792a
Updated test to print out test method via TestTracker.
2016-06-13 16:24:53 +02:00
Simone Bordet
7008a96225
Merged branch 'jetty-9.4.x' into 'master'.
2016-06-13 12:17:31 +02:00
Simone Bordet
3d8242ef82
Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'.
2016-06-13 12:16:33 +02:00
Simone Bordet
e803bf6c81
Test code cleanup.
...
Converted static fields to non-static, and removed unused code.
2016-06-13 12:15:45 +02:00
Greg Wilkins
b40c2ae66f
Debug #624
...
This commit is instrumentation to be executed in the CI system to debug #624
This commit should be reverted once the test has failed again!
2016-06-11 10:33:48 +10:00
Joakim Erdfelt
19e52ab9c4
Removing HttpCompliance from example
2016-06-10 13:19:51 -07:00
Jesse McConnell
eef2252e14
merged
2016-06-10 10:46:58 -05:00
Jan Bartel
29fcd50354
Issue #632
...
Fix jetty version number
2016-06-10 16:53:52 +10:00
Jan Bartel
d05865d555
Issue #482
...
Fix license header
2016-06-10 16:42:17 +10:00
Jan Bartel
3aceb21019
Issue #482
...
Correct jetty xml config file from pull request #492 .
2016-06-10 16:12:47 +10:00
Jan Bartel
1664cc599d
Merge pull request #492 from laeubi/issue482
...
Fix #482 The CCL while parsing the xml files should be set to a combination of Jetty and Bundle-Classloader
2016-06-10 15:53:52 +10:00
Jan Bartel
9a541f0eb2
Fix version in jetty-memcached poms
2016-06-10 12:34:55 +10:00
Jan Bartel
11b85446e7
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-06-10 12:32:08 +10:00
Jan Bartel
e93f98951b
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-06-10 12:18:33 +10:00
Jan Bartel
76a5ec1b8e
Merge pull request #629 from rbygrave/springboot-metaInfConf
...
Issue #628 resolve by checking for existing jar: prefix on uri
2016-06-10 12:17:33 +10:00
Jan Bartel
36b87967c0
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-06-10 11:54:52 +10:00
Jan Bartel
73a0cd6b06
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-06-10 11:53:45 +10:00
Jan Bartel
27ed0480b9
Issue #632
...
Remove unneeded scripts
2016-06-10 11:52:32 +10:00
Jan Bartel
1cdeac9c53
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-06-10 11:50:41 +10:00
Jan Bartel
a6cfff8573
Issue #632 fix jmx tests to use random jetty server port
2016-06-10 11:46:15 +10:00
Greg Wilkins
fc4ebaac92
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-06-10 09:41:13 +10:00
Greg Wilkins
79874d80ff
Fix #627 Use start.d or start.ini not both
...
create file in empty to ensure it is not pruned
2016-06-10 09:40:26 +10:00
Jesse McConnell
c6172c9f2e
Merge branch 'jetty-9.4.x'
2016-06-09 14:18:52 -05:00
Jesse McConnell
147df2a031
Merge branch 'jetty-9.3.x' into jetty-9.4.x
2016-06-09 14:18:27 -05:00
Jesse McConnell
7e3db100ab
resolve version expansion across blocks by adding subs= attributes
2016-06-09 14:18:04 -05:00
Robin Bygrave
95d6b9f39e
Issue #628 resolve by checking for existing jar: prefix on uri - additional fix for scanForResources and scanForWebFragments
...
Signed-off-by: Robin Bygrave <robin.bygrave@gmail.com>
2016-06-09 23:03:52 +12:00
Robin Bygrave
3923b9bbf5
Issue #628 resolve by checking for existing jar: prefix on uri - format
...
Signed-off-by: Robin Bygrave <robin.bygrave@gmail.com>
2016-06-09 20:19:08 +12:00
Robin Bygrave
1494906b9d
Issue #628 resolve by checking for existing jar: prefix on uri
...
Signed-off-by: Robin Bygrave <robin.bygrave@gmail.com>
2016-06-09 20:12:32 +12:00
Greg Wilkins
6c21f0d30d
Fix #627 Use start.d or start.ini not both
...
Updated usage text
2016-06-09 16:51:26 +10:00
Greg Wilkins
383e81db38
Fix #627 Use start.d or start.ini not both
...
Updated start module to look for start.d and use it if it exists
Error or warning of both start.d and start.ini exist
updated jetty-distribution to use one or the other
2016-06-09 16:45:24 +10:00
Greg Wilkins
918399b69f
fixed module ordering problem
2016-06-08 18:27:28 +10:00
Greg Wilkins
5a91c4574a
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-06-08 16:49:21 +10:00
Greg Wilkins
86e5b1cf9b
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-06-08 16:48:50 +10:00
Greg Wilkins
d458d41632
more generous unit test timeouts
2016-06-08 16:48:19 +10:00
Greg Wilkins
3fafd6ee8f
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-06-08 16:25:29 +10:00
Jan Bartel
7314a9b86a
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-06-08 16:25:23 +10:00
Greg Wilkins
f59e680a94
Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x
2016-06-08 16:24:32 +10:00
Greg Wilkins
3a9dfd913a
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x
2016-06-08 16:24:09 +10:00
Jan Bartel
31a23d2671
Ignore poor test case ThreadMonitorTest
2016-06-08 16:23:10 +10:00
Greg Wilkins
2609c89d22
Issue #624 Fix onCompleted race
2016-06-08 16:22:53 +10:00
Jan Bartel
0c1c188cb7
Merge remote-tracking branch 'origin/jetty-9.4.x'
2016-06-08 15:01:38 +10:00
Jan Bartel
d52a1701ad
Add module for session data cache
2016-06-08 15:00:32 +10:00
Greg Wilkins
f4c13e5f54
Issue #623 Add gzip suffix to etags in 304 response
2016-06-08 14:33:49 +10:00