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
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
8593ce5820
432473 web.xml declaration order of filters not preserved on calls to init()
2014-04-10 09:34:39 +10:00
Joakim Erdfelt
1b9f0cb945
Cleanup of Main.moduleIni() to .buildIni() with better documentation
2014-04-09 10:02:28 -07: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
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
Joakim Erdfelt
a9c01d3607
432321 - jetty-start / Allow defining extra start directories for common configurations
...
+ Initial impl of BaseHome with support for lookups on extra start dirs
2014-04-08 09:57:52 -07:00
Simone Bordet
5f8513e67e
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-08 17:38:04 +02:00
Joakim Erdfelt
e793c85eb4
Cleanup and documentation of StartArgs in prep for extra-start-dirs
2014-04-08 06:45:04 -07:00
Joakim Erdfelt
87f2deed65
Squelching prior notified loop detection
2014-04-08 06:11:42 -07:00
Joakim Erdfelt
9d0143b704
Making searchDepth configurable via System property
2014-04-08 06:08:39 -07:00
Joakim Erdfelt
ce75625f0f
Preparing BaseHome for extra-start-dirs
2014-04-08 06:08:21 -07:00
Simone Bordet
0ed7d30741
Fixed timeout value left over during debugging.
2014-04-08 13:58:21 +02:00
Simone Bordet
dd8120294d
Made the test more reliable.
2014-04-08 13:57:55 +02:00
Simone Bordet
2e7df0e16a
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-08 13:57:27 +02:00
Joakim Erdfelt
eb53a9ce6d
Minor fix for ConcurrentModificationException
2014-04-07 10:31:34 -07:00
Joakim Erdfelt
5ca59f6087
Fixing up test expectations based on reworked module setup for spdy + npn
2014-04-07 09:48:34 -07:00
Simone Bordet
2897027f53
Merged branch 'master' into 'jetty-9.2.x'.
2014-04-07 17:51:23 +02:00
Simone Bordet
cc0775133e
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-07 17:39:29 +02:00
Simone Bordet
b135920bfc
Restored HttpSender tests.
2014-04-07 17:39:29 +02:00
Simone Bordet
e56a76ef50
Restored HttpReceiver tests.
2014-04-07 17:39:28 +02:00
Jan Bartel
90f387bc34
431892 DefaultFileLocatorHelper.getBundleInstallLocation fails for equinox 3.10
2014-04-07 20:59:17 +10:00
Greg Wilkins
0a748205f0
432122 ignore frequently failing test
2014-04-07 18:00:50 +10:00
Greg Wilkins
2b2d3ac762
Fixed start.jar handling of expanded modules during --add-to-start
2014-04-07 13:11:41 +10:00
Greg Wilkins
6edb854c69
Merge remote-tracking branch 'origin/master' into jetty-9.2.x
...
Conflicts:
aggregates/jetty-all/pom.xml
examples/async-rest/async-rest-jar/pom.xml
examples/async-rest/async-rest-webapp/pom.xml
examples/async-rest/pom.xml
examples/embedded/pom.xml
examples/pom.xml
jetty-annotations/pom.xml
jetty-ant/pom.xml
jetty-client/pom.xml
jetty-continuation/pom.xml
jetty-deploy/pom.xml
jetty-distribution/pom.xml
jetty-fcgi/fcgi-client/pom.xml
jetty-fcgi/fcgi-server/pom.xml
jetty-fcgi/pom.xml
jetty-http-spi/pom.xml
jetty-http/pom.xml
jetty-io/pom.xml
jetty-jaas/pom.xml
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp/pom.xml
jetty-jspc-maven-plugin/pom.xml
jetty-maven-plugin/pom.xml
jetty-monitor/pom.xml
jetty-nosql/pom.xml
jetty-osgi/jetty-osgi-boot-jsp/pom.xml
jetty-osgi/jetty-osgi-boot-warurl/pom.xml
jetty-osgi/jetty-osgi-boot/pom.xml
jetty-osgi/jetty-osgi-httpservice/pom.xml
jetty-osgi/jetty-osgi-npn/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-plus/pom.xml
jetty-proxy/pom.xml
jetty-rewrite/pom.xml
jetty-runner/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-client/pom.xml
jetty-spdy/spdy-core/pom.xml
jetty-spdy/spdy-example-webapp/pom.xml
jetty-spdy/spdy-http-client-transport/pom.xml
jetty-spdy/spdy-http-common/pom.xml
jetty-spdy/spdy-http-server/pom.xml
jetty-spdy/spdy-npn-tests/pom.xml
jetty-spdy/spdy-server/pom.xml
jetty-spring/pom.xml
jetty-start/pom.xml
jetty-util-ajax/pom.xml
jetty-util/pom.xml
jetty-webapp/pom.xml
jetty-websocket/javax-websocket-client-impl/pom.xml
jetty-websocket/javax-websocket-server-impl/pom.xml
jetty-websocket/pom.xml
jetty-websocket/websocket-api/pom.xml
jetty-websocket/websocket-client/pom.xml
jetty-websocket/websocket-common/pom.xml
jetty-websocket/websocket-server/pom.xml
jetty-websocket/websocket-servlet/pom.xml
jetty-xml/pom.xml
pom.xml
tests/pom.xml
tests/test-continuation/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-sessions-common/pom.xml
tests/test-webapps/pom.xml
tests/test-webapps/test-jaas-webapp/pom.xml
tests/test-webapps/test-jetty-webapp/pom.xml
tests/test-webapps/test-jndi-webapp/pom.xml
tests/test-webapps/test-mock-resources/pom.xml
tests/test-webapps/test-proxy-webapp/pom.xml
tests/test-webapps/test-servlet-spec/pom.xml
tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
2014-04-07 12:59:15 +10:00
Greg Wilkins
64e11bc8e8
reverted version to 9.1.x pending merge of 9.2 branch
2014-04-07 12:52:43 +10:00
Greg Wilkins
086e39f6db
423392 Fix buffer overflow in AsyncGzipFilter
2014-04-07 12:32:46 +10:00
Jesse McConnell
4688c10361
Merge branch 'release-9'
2014-04-04 17:24:35 -05:00
Greg Wilkins
cf430665b5
Fixed start.jar handling of expanded modules during --add-to-start
2014-04-04 14:09:46 +11:00
Greg Wilkins
f9e2f1d6bc
429734 Implemented the HA ProxyProtocol
2014-04-04 12:42:06 +11:00
Greg Wilkins
4dbabd72f2
429734 Implemented the HA ProxyProtocol
2014-04-04 08:47:37 +11:00
Greg Wilkins
6e9879cc6b
removed debug
2014-04-03 19:12:49 +11:00
Greg Wilkins
303fa57eaf
improved protonego module structure to avoid ini files of parameterized modules
2014-04-03 16:50:33 +11:00
Jan Bartel
c62500c63d
Fix alpn-related poms for osgi and osgi test cases.
2014-04-03 16:41:24 +11:00
Greg Wilkins
0bbec3826c
430341 use apache jsp/jstl for maven plugins
2014-04-03 14:27:27 +11:00
Greg Wilkins
157a54ec5c
430341 Use apache jsp/jstl by default in 9.2.0
2014-04-03 14:16:13 +11:00
Jesse McConnell
34a1d3e109
set for dev
2014-04-02 16:25:26 -05:00
Jesse McConnell
dbb938ac71
[maven-release-plugin] prepare for next development iteration
2014-04-02 10:55:29 -05:00
Jesse McConnell
c616ece6c7
[maven-release-plugin] prepare release jetty-9.1.4.v20140401
2014-04-02 10:55:21 -05:00
Joakim Erdfelt
077887141f
Updating alpn and npn modules to protonego
2014-04-01 13:09:49 -07:00