Greg Wilkins
|
2e444d2f17
|
Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
jetty-io/src/main/java/org/eclipse/jetty/io/AbstractConnection.java
jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestBase.java
jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/proxy/ProxyHTTPSPDYConnection.java
|
2013-09-02 17:00:07 +10:00 |
|
Greg Wilkins
|
eec9d405e5
|
416321 handle failure during blocked committing write
|
2013-09-02 14:56:22 +10:00 |
|
Greg Wilkins
|
07ae3615ed
|
416321 handle failure during blocked committing write
|
2013-09-02 14:44:23 +10:00 |
|
Greg Wilkins
|
317a3f27df
|
416321 improved test harnesses
|
2013-09-02 12:24:51 +10:00 |
Thomas Becker
|
d51268977b
|
fix merge issue
|
2013-08-30 18:00:47 +02:00 |
|
Thomas Becker
|
566065dd34
|
cleanup import in HttpConnection
|
2013-08-30 17:21:53 +02:00 |
|
Thomas Becker
|
a9955ebc91
|
cleanup import in HttpConnection
|
2013-08-30 17:15:14 +02:00 |
|
Greg Wilkins
|
4d6fd407b5
|
Merge remote-tracking branch 'origin/master' into jetty-9.1
|
2013-08-30 14:45:42 +10:00 |
|
Greg Wilkins
|
4358302ce0
|
416102 - Clean up of async sendContent process
|
2013-08-30 14:45:21 +10:00 |
|
Greg Wilkins
|
b5d3aeab0f
|
Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
|
2013-08-30 14:41:33 +10:00 |
|
Greg Wilkins
|
5fce6408d0
|
Merge branch 'jetty-9.1' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9.1
|
2013-08-30 14:38:41 +10:00 |
|
Greg Wilkins
|
79fb4287bb
|
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
|
2013-08-30 14:37:55 +10:00 |
|
Greg Wilkins
|
47c679dabb
|
416102 - Clean up of async sendContent process
|
2013-08-30 14:37:43 +10:00 |
Jesse McConnell
|
ac30f5c9bd
|
update other jetty mods to new format
|
2013-08-29 16:39:28 -05:00 |
|
Thomas Becker
|
e8130f4201
|
415605 fix status code logging for async requests
|
2013-08-29 13:25:04 +02:00 |
|
Greg Wilkins
|
12c7da97e2
|
Merge remote-tracking branch 'origin/master' into jetty-9.1
|
2013-08-29 16:57:24 +10:00 |
|
Greg Wilkins
|
9bf83d427b
|
416103 Added AllowSymLinkAliasChecker.java
|
2013-08-29 16:44:38 +10:00 |
|
Greg Wilkins
|
2b7462e9a9
|
416103 Added AllowSymLinkAliasChecker.java
|
2013-08-29 16:17:15 +10:00 |
Jan Bartel
|
c183c6fad5
|
Merge branch 'jetty-9.1' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9.1
|
2013-08-29 12:59:50 +10:00 |
|
Jan Bartel
|
280000e88a
|
Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
VERSION.txt
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-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-overlay-deployer/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-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
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-server/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/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-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-jetty-webapp/src/main/config/demo/webapps/test.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
|
2013-08-29 12:59:32 +10:00 |
|
Greg Wilkins
|
aec807804d
|
415826 start.jar replace --enable with --module-ini
Added --module-ini and --module-start-ini
jetty.base is set from user.dir
jetty.home is set from start.jar dir
|
2013-08-29 12:37:50 +10:00 |
|
Jan Bartel
|
35d379a335
|
416096 DefaultServlet leaves open file descriptors with file sizes greater than response buffer
|
2013-08-29 12:16:38 +10:00 |
|
Greg Wilkins
|
c84063a5f8
|
415826 start.jar replace --enable with --initialize
refactored impl to be clearer when creating ini
|
2013-08-28 23:53:32 +10:00 |
|
Greg Wilkins
|
c1bd267c17
|
415826 start.jar replace --enable with --initialize
|
2013-08-28 15:41:27 +10:00 |
|
Greg Wilkins
|
73cf943b5c
|
Merge branch 'jetty-9.1' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9.1
|
2013-08-28 09:30:42 +10:00 |
|
Greg Wilkins
|
d66778ad06
|
415826 start.jar module --enable and --disable
morphed mechanism into --initialize based templates
|
2013-08-28 09:30:03 +10:00 |
|
Jan Bartel
|
ac0e30bbb7
|
415745 Include followed by forward using a PrintWriter incurs unnecessary delay
|
2013-08-27 17:33:16 +10:00 |
|
Jesse McConnell
|
ef166c23e6
|
Merge branch 'release-9'
|
2013-08-23 18:58:01 -05:00 |
|
Jesse McConnell
|
28a0c5ce98
|
updatre base mod with optional jmx dependency
|
2013-08-23 17:28:38 -05:00 |
Joakim Erdfelt
|
2e94149ea3
|
Merge branch 'jetty-9.1' into jetty-9.1-altstart
|
2013-08-23 11:49:41 -07:00 |
Simone Bordet
|
bfd68d7e61
|
Using old ArrayByteBufferPool defaults to make the
HttpManyWaysToCommitTest tests pass.
See also https://bugs.eclipse.org/bugs/show_bug.cgi?id=415773.
|
2013-08-23 17:43:16 +02:00 |
|
Simone Bordet
|
9314f6d7ee
|
Cleanup of unused code, variables, tabs, etc.
|
2013-08-23 17:41:44 +02:00 |
|
Greg Wilkins
|
b3c9adac56
|
fixed header
|
2013-08-23 20:09:00 +10:00 |
|
Greg Wilkins
|
fb82dad812
|
413684 deprecated unsafe alias checkers
Added extra test harness
|
2013-08-23 19:55:19 +10:00 |
|
Greg Wilkins
|
c3691b60b0
|
Merge remote-tracking branch 'origin/jetty-8'
|
2013-08-23 17:17:57 +10:00 |
|
Greg Wilkins
|
d2ff475834
|
Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
jetty-util/src/main/java/org/eclipse/jetty/util/resource/FileResource.java
tests/test-webapps/test-jetty-webapp/src/main/config/webapps.demo/test.xml
|
2013-08-23 17:17:34 +10:00 |
|
Greg Wilkins
|
2a178a29fd
|
413684 deprecated unsafe alias checkers
removed debugs
|
2013-08-23 17:11:57 +10:00 |
|
Greg Wilkins
|
b33b5f2f5d
|
413684 deprecated unsafe alias checkers
|
2013-08-23 16:49:42 +10:00 |
|
Greg Wilkins
|
a6b6891d8b
|
415641 Remove remaining calls to deprecated HttpTranspoert.send
Actually removed the impl of the deprecated method that is no longer called.
|
2013-08-23 10:23:52 +10:00 |
|
Jesse McConnell
|
5c87965ff1
|
server depends on xml..
|
2013-08-22 12:23:29 -05:00 |
|
Jesse McConnell
|
725e405dac
|
first pass for mod files for distribution
|
2013-08-22 11:53:58 -05:00 |
|
Greg Wilkins
|
59540abeda
|
Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
jetty-util/src/main/java/org/eclipse/jetty/util/IteratingCallback.java
|
2013-08-22 22:58:58 +10:00 |
|
Greg Wilkins
|
c4583918a3
|
415330 Avoid multiple callbacks at EOF
|
2013-08-22 21:31:29 +10:00 |
|
Simone Bordet
|
4f21d42b78
|
Fixed recycling of fields, now correctly restored to their initial
values.
|
2013-08-21 22:22:05 +02:00 |
|
Jan Bartel
|
ad8db51ed5
|
415314 Jetty should not commit response on output if < Response.setBufferSize() bytes are written
|
2013-08-19 17:52:39 +10:00 |
|
Joakim Erdfelt
|
3c28bf8c60
|
Revert "415062 SelectorManager wakeup optimisation"
This reverts commit edbf6e07aa.
|
2013-08-16 14:38:10 -07:00 |
|
Greg Wilkins
|
edbf6e07aa
|
415062 SelectorManager wakeup optimisation
|
2013-08-16 16:35:38 +10:00 |
|
Jan Bartel
|
c80100b4a9
|
[maven-release-plugin] prepare for next development iteration
|
2013-08-15 19:13:27 +10:00 |
|
Jan Bartel
|
e7e7e45500
|
[maven-release-plugin] prepare release jetty-9.0.5.v20130815
|
2013-08-15 19:13:13 +10:00 |
|
Jan Bartel
|
716430bb03
|
[maven-release-plugin] rollback the release of jetty-9.0.5.v20130815
|
2013-08-15 18:03:49 +10:00 |