Joakim Erdfelt
db2c6c20b9
Test failure fix
2014-04-15 10:16:52 -07:00
Joakim Erdfelt
cad7d3f5ed
Attempt to work out websocket close notification issue that simone raised
2014-04-15 10:14:03 -07:00
Joakim Erdfelt
de8485d53e
Merge branch 'master' into extra-start-dirs
2014-04-15 08:09:21 -07:00
Simone Bordet
f2e2eec4d5
Merged branch 'jetty-9.1.x' into 'master'.
2014-04-15 09:04:20 +02:00
Simone Bordet
361d8e5bd2
432528 - IllegalStateException when using DeferredContentProvider.
...
Fixed by using the correct idiom for calling the IteratingCallback.
2014-04-15 09:03:30 +02:00
Simone Bordet
d6e538a9d2
Avoid duplicating existing headers when copying requests.
2014-04-15 09:03:30 +02:00
Jan Bartel
e252b52eb3
432483 make osgi.serviceloader support for javax.servlet.ServletContainerInitializer optional
...
(cherry picked from commit 31043d2570
)
Conflicts:
jetty-annotations/pom.xml
2014-04-12 09:15:53 +10:00
Jan Bartel
31043d2570
432483 make osgi.serviceloader support for javax.servlet.ServletContainerInitializer optional
2014-04-12 09:12:25 +10:00
Joakim Erdfelt
7cd3f9983f
Compile fix
2014-04-11 16:03:49 -07:00
Joakim Erdfelt
8f733169f5
432321 - jetty-start / Allow defining extra start directories for common configurations
...
+ Final work for unit testing happiness
+ BaseHome is now configured via ConfigSources (as intended)
+ StartArgs now parses the ConfigSources list (in reverse)
+ CommandLineConfigSource now does all of the ${jetty.base} and
${jetty.home} determination (from properties and env, with
fallbacks)
2014-04-11 14:26:35 -07:00
Simone Bordet
3717115059
Merged branch 'jetty-9.1.x' into 'master'.
2014-04-11 17:02:26 +02:00
Simone Bordet
5eeda38f0a
432270 - Slow requests with response content delimited by EOF fail.
...
Fixed also in the FastCGI module.
2014-04-11 16:18:38 +02:00
Simone Bordet
4975cae881
Further progress on 431642 (async proxy servlet).
2014-04-11 09:45:21 +02:00
Jan Bartel
eb45d45dbf
432483 jetty-annotations bundle does not start if there are no bundles that provide a service javax.servlet.ServletContainerInitializer
...
(cherry picked from commit f2f5353a29
)
2014-04-11 17:27:58 +10:00
Jan Bartel
f2f5353a29
432483 jetty-annotations bundle does not start if there are no bundles that provide a service javax.servlet.ServletContainerInitializer
2014-04-11 17:25:08 +10:00
Greg Wilkins
deb7102e0e
404511 removed deprecated StringMap
2014-04-11 10:57:39 +10:00
Greg Wilkins
5a0811b328
432468 Improve command CGI path handling
2014-04-11 10:48:24 +10:00
Joakim Erdfelt
eff78efe3c
432321 - jetty-start / Allow defining extra start directories for common configurations
...
+ Integration of ConfigSources with rest of startup.
2014-04-10 16:45:11 -07:00
Joakim Erdfelt
4f49bb9584
Merge branch 'master' into extra-start-dirs
2014-04-10 11:55:52 -07:00
Joakim Erdfelt
682a01792f
432321 - jetty-start / Allow defining extra start directories for common configurations
...
+ Introduction of ConfigSources (a properly ordered list of ConfigSource
impls) to aide in initial setup of configuration sources, prior to
being parsed by StartArgs for the final runtime configuration of
the jetty server.
2014-04-10 11:54:27 -07:00
Simone Bordet
aebab6919c
Improved IllegalStateException reporting.
2014-04-10 09:04:40 +02:00
Simone Bordet
dfa2d05bcc
432270 - Slow requests with response content delimited by EOF fail.
...
Better handling of the idle case, and closing the connection only
if the response can be failed.
2014-04-10 09:04:11 +02:00
Simone Bordet
8e24cdf913
Fixed timeout value left over during debugging.
2014-04-10 09:03:46 +02:00
Simone Bordet
74d66a87f6
Made the test more reliable.
2014-04-10 09:03:19 +02:00
Simone Bordet
3cd7dfd445
432270 - Slow requests with response content delimited by EOF fail.
...
Fixed by using a flag to determine the need to close the connection,
and by closing the connection only at exchange termination.
2014-04-10 09:00:17 +02:00
Simone Bordet
e3662a9b23
432145 - Pending request is not failed when HttpClient is stopped.
...
Fixed by fixing the code in close() to also abort pending exchanges.
Reviewed for HTTP, FastCGI and SPDY transports.
2014-04-10 08:59:30 +02:00
Greg Wilkins
0e458c80f4
reverted version to SNAPSHOT
2014-04-10 16:37:25 +10:00
Greg Wilkins
9f3e986119
431519 Fixed NetworkTrafficListener
2014-04-10 16:24:20 +10:00
Greg Wilkins
ef400675aa
431519 Fixed NetworkTrafficListener
2014-04-10 16:20:10 +10:00
Greg Wilkins
866960d5d7
431094 Consistent handling of utf8 decoding errors
2014-04-10 15:52:15 +10:00
Greg Wilkins
7adba8d033
431094 Consistent handling of utf8 decoding errors
2014-04-10 15:14:46 +10:00
Greg Wilkins
4785121a53
431642 Allow for immediate return from content callback in HttpParser
2014-04-10 12:59:07 +10:00
Greg Wilkins
9a7af6cbd3
readded websocket to demo base
2014-04-10 12:59:07 +10:00
Jan Bartel
02994483dc
Only test osgi with annotations in jdk < 1.8
2014-04-10 12:11:07 +10:00
Jan Bartel
a5bd46fd57
409105 Upgrade jetty-osgi build/test to use more recent pax junit test framework
2014-04-10 11:23:13 +10:00
Jan Bartel
268ca92ce2
432473 web.xml declaration order of filters not preserved on calls to init()
2014-04-10 09:39:58 +10:00
Jan Bartel
8593ce5820
432473 web.xml declaration order of filters not preserved on calls to init()
2014-04-10 09:34:39 +10:00
Jesse McConnell
e1d07f908c
[maven-release-plugin] prepare for next development iteration
2014-04-09 12:26:35 -05:00
Jesse McConnell
fdae77842c
[maven-release-plugin] prepare release jetty-9.2.0.M0
2014-04-09 12:26:29 -05:00
Joakim Erdfelt
1b9f0cb945
Cleanup of Main.moduleIni() to .buildIni() with better documentation
2014-04-09 10:02:28 -07:00
Jesse McConnell
96a9cadeba
Merge branch 'master' into release-9
2014-04-09 11:54:53 -05:00
Joakim Erdfelt
5ecf564dfa
432321 - jetty-start / Allow defining extra start directories for common configurations
...
+ Identified test cases for extra-start-dir logic
+ Working on layered ConfigSource approach to handling extra-start-dir
2014-04-09 09:51:20 -07:00
Simone Bordet
44fe5daa69
Restored proper logging level.
2014-04-09 18:33:23 +02:00
Jesse McConnell
f32e8bd3c0
[maven-release-plugin] prepare for next development iteration
2014-04-09 10:44:51 -05:00
Jesse McConnell
47906076f6
[maven-release-plugin] prepare release jetty-9.2.0.M0
2014-04-09 10:44:41 -05:00
Jesse McConnell
7a2ea8c6dc
set for release
2014-04-09 09:56:58 -05:00
Jesse McConnell
7e846e513d
Merge branch 'master' into release-9
2014-04-09 09:55:39 -05:00
Jesse McConnell
f50fe43fb6
Merge branch 'jetty-9.2.x'
2014-04-09 08:29:10 -05:00
Simone Bordet
7e3c7f3588
Temporary commit to understand why HttpReceiverOverHTTPTest.test_Receive_GZIPResponseContent_Fragmented() fails.
...
To be reverted.
2014-04-09 01:33:20 +02:00
Simone Bordet
a8de18379c
Improved IllegalStateException reporting.
2014-04-09 00:08:30 +02:00