4d6fd407b5
Merge remote-tracking branch 'origin/master' into jetty-9.1
2013-08-30 14:45:42 +10:00
4358302ce0
416102 - Clean up of async sendContent process
2013-08-30 14:45:21 +10:00
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
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
79fb4287bb
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2013-08-30 14:37:55 +10:00
47c679dabb
416102 - Clean up of async sendContent process
2013-08-30 14:37:43 +10:00
ac30f5c9bd
update other jetty mods to new format
2013-08-29 16:39:28 -05:00
e8130f4201
415605 fix status code logging for async requests
2013-08-29 13:25:04 +02:00
12c7da97e2
Merge remote-tracking branch 'origin/master' into jetty-9.1
2013-08-29 16:57:24 +10:00
9bf83d427b
416103 Added AllowSymLinkAliasChecker.java
2013-08-29 16:44:38 +10:00
2b7462e9a9
416103 Added AllowSymLinkAliasChecker.java
2013-08-29 16:17:15 +10:00
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
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
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
35d379a335
416096 DefaultServlet leaves open file descriptors with file sizes greater than response buffer
2013-08-29 12:16:38 +10:00
c84063a5f8
415826 start.jar replace --enable with --initialize
...
refactored impl to be clearer when creating ini
2013-08-28 23:53:32 +10:00
c1bd267c17
415826 start.jar replace --enable with --initialize
2013-08-28 15:41:27 +10:00
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
d66778ad06
415826 start.jar module --enable and --disable
...
morphed mechanism into --initialize based templates
2013-08-28 09:30:03 +10:00
ac0e30bbb7
415745 Include followed by forward using a PrintWriter incurs unnecessary delay
2013-08-27 17:33:16 +10:00
ef166c23e6
Merge branch 'release-9'
2013-08-23 18:58:01 -05:00
28a0c5ce98
updatre base mod with optional jmx dependency
2013-08-23 17:28:38 -05:00
2e94149ea3
Merge branch 'jetty-9.1' into jetty-9.1-altstart
2013-08-23 11:49:41 -07:00
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
9314f6d7ee
Cleanup of unused code, variables, tabs, etc.
2013-08-23 17:41:44 +02:00
b3c9adac56
fixed header
2013-08-23 20:09:00 +10:00
fb82dad812
413684 deprecated unsafe alias checkers
...
Added extra test harness
2013-08-23 19:55:19 +10:00
c3691b60b0
Merge remote-tracking branch 'origin/jetty-8'
2013-08-23 17:17:57 +10:00
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
2a178a29fd
413684 deprecated unsafe alias checkers
...
removed debugs
2013-08-23 17:11:57 +10:00
b33b5f2f5d
413684 deprecated unsafe alias checkers
2013-08-23 16:49:42 +10:00
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
5c87965ff1
server depends on xml..
2013-08-22 12:23:29 -05:00
725e405dac
first pass for mod files for distribution
2013-08-22 11:53:58 -05:00
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
c4583918a3
415330 Avoid multiple callbacks at EOF
2013-08-22 21:31:29 +10:00
4f21d42b78
Fixed recycling of fields, now correctly restored to their initial
...
values.
2013-08-21 22:22:05 +02:00
ad8db51ed5
415314 Jetty should not commit response on output if < Response.setBufferSize() bytes are written
2013-08-19 17:52:39 +10:00
3c28bf8c60
Revert "415062 SelectorManager wakeup optimisation"
...
This reverts commit edbf6e07aa
2013-08-16 14:38:10 -07:00
edbf6e07aa
415062 SelectorManager wakeup optimisation
2013-08-16 16:35:38 +10:00
c80100b4a9
[maven-release-plugin] prepare for next development iteration
2013-08-15 19:13:27 +10:00
e7e7e45500
[maven-release-plugin] prepare release jetty-9.0.5.v20130815
2013-08-15 19:13:13 +10:00
716430bb03
[maven-release-plugin] rollback the release of jetty-9.0.5.v20130815
2013-08-15 18:03:49 +10:00
3d13c15d35
[maven-release-plugin] prepare release jetty-9.0.5.v20130815
2013-08-15 17:22:03 +10:00
7947b35134
Reset version for rerun of 9.0.5
2013-08-15 16:47:03 +10:00
b378049d1a
Fixing malformed Javadoc warnings in jetty-server
2013-08-14 12:46:25 -07:00
ffad720991
Fixing Javadoc errors that JDK 1.7 complains about
2013-08-14 11:50:07 -07:00
34032552ea
Avoid boxing of primitive int variables in logging statements.
2013-08-14 14:33:05 +02:00
4383c9042d
[maven-release-plugin] prepare for next development iteration
2013-08-13 14:20:56 -05:00
160d34ec23
[maven-release-plugin] prepare release jetty-9.0.5.v20130813
2013-08-13 14:20:47 -05:00
d3a93a0d68
Merged branch 'master' into 'jetty-9.1'.
2013-08-13 16:13:31 +02:00
9a7b0f5c10
412938 Request.setCharacterEncoding now throws UnsupportedEncodingException instead of UnsupportedCharsetException
2013-08-13 13:50:42 +02:00
75f87a289a
414951 QueuedThreadPool fix constructor that missed to pass the idleTimeout
2013-08-13 13:35:06 +02:00
c27e58b785
413901 isAsyncStarted remains true while original request is dispatched
2013-08-13 10:39:26 +10:00
80b422c0e4
413901 isAsyncStarted remains true while original request is dispatched
2013-08-13 10:38:44 +10:00
6a831dc2ca
Fixed erroneous warning message when the context path is "/".
2013-08-12 22:46:28 +02:00
0cc46e8beb
414891 - Errors thrown by ReadListener and WriteListener not handled correctly.
...
Now correctly catching Throwable to handle all exception cases.
2013-08-12 18:52:14 +02:00
1e25778d57
Merge remote-tracking branch 'origin/master' into jetty-9.1
...
Conflicts:
jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestBase.java
2013-08-13 00:44:39 +10:00
43946c62e0
414449 Added HttpParser strict mode for case sensitivity
2013-08-12 23:02:08 +10:00
3eeb20f5bd
Merge remote-tracking branch 'origin/master' into jetty-9.1
2013-08-12 12:12:50 +10:00
8cf2744226
414833 HttpSessionListener.destroy must be invoked in reverse order
2013-08-12 12:11:06 +10:00
2c3ecf9e38
414731 Request.getCookies() should return null if there are no cookies
2013-08-09 18:08:16 +10:00
06ef5b7930
Merge remote-tracking branch 'origin/master' into jetty-9.1
...
Conflicts:
jetty-annotations/src/test/java/org/eclipse/jetty/annotations/TestAnnotationParser.java
jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
2013-08-09 15:59:29 +10:00
3e79877bcc
414727 Ensure asynchronously flushed resources are closed
2013-08-09 14:42:10 +10:00
34cfc3ed10
Merge remote-tracking branch 'origin/master' into jetty-9.1
...
Conflicts:
jetty-http/src/main/java/org/eclipse/jetty/http/HttpFields.java
jetty-http/src/test/java/org/eclipse/jetty/http/HttpFieldsTest.java
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
2013-08-09 13:50:49 +10:00
12f1d0f16e
414625 final static version fields
2013-08-09 12:45:39 +10:00
a779425994
414101 Do not escape special characters in cookies
2013-08-09 12:42:52 +10:00
21e7b67cc7
414635 Modular start.d and jetty.base property
2013-08-08 17:53:52 +10:00
89acff6bdf
Merge remote-tracking branch 'origin/master' into jetty-9.1
2013-08-08 11:06:14 +10:00
95416bce76
413568 Made AJP worker name generic
2013-08-08 10:51:43 +10:00
7c292c1799
Merge remote-tracking branch 'origin/master' into jetty-9.1
2013-08-06 09:21:40 +10:00
a900010f81
414235 RequestLogHandler configured on a context fails to handle forwarded requests
2013-08-06 09:14:28 +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
47a8809ec7
413018 ServletContext.addListener() should throw IllegalArgumentException if arg is not correct type of listener
2013-08-02 12:26:54 +10: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
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
fb04ee8fbd
QueuedHttpInput fix javadoc
2013-07-26 17:38:47 +02:00
b02535698a
Double dispatch warning should be logged at debug level
2013-07-26 17:38:46 +02:00
9d571af7b0
Merged branch 'master' into 'jetty-9.1'.
2013-07-26 13:55:05 +02:00
5c7eb9e265
Reverted version to 7.6.12-SNAPSHOT.
2013-07-26 13:36:35 +02:00
c76de0b584
404468 Ported jetty-http-spi to Jetty-9
2013-07-26 11:40:12 +10: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
bc679809f8
[maven-release-plugin] prepare for next development iteration
2013-07-25 11:25:58 -05:00
39ec9b8051
[maven-release-plugin] prepare release jetty-7.6.12.v20130725
2013-07-25 11:25:51 -05:00
1d77a139fd
Merge remote-tracking branch 'origin/master' into jetty-9.1
2013-07-25 23:06:33 +10:00
e0ad2c4ee1
[maven-release-plugin] prepare for next development iteration
2013-07-25 07:52:39 -05:00
99712058ca
[maven-release-plugin] prepare release jetty-8.1.11.v20130725
2013-07-25 07:52:32 -05:00
767dbe6778
[maven-release-plugin] prepare for next development iteration
2013-07-25 07:48:09 -05:00
cfa6076c4f
[maven-release-plugin] prepare release jetty-7.6.11.v20130725
2013-07-25 07:48:02 -05:00
50a67eac6a
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-client/src/main/java/org/eclipse/jetty/client/HttpExchange.java
jetty-client/src/test/java/org/eclipse/jetty/client/IdleTimeoutTest.java
jetty-http/src/main/java/org/eclipse/jetty/http/HttpGenerator.java
2013-07-25 13:22:14 +10:00
72b077921d
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-07-25 11:26:35 +10:00
2f08ba2948
413684 - Trailing slash shows JSP source
...
Fixed alias checkers. Non existent directory does check for none existence. Prefix and Suffix check look for none empty/trivial prefix/suffixes
2013-07-25 11:01:23 +10:00
eb126ebaee
Merge remote-tracking branch 'origin/master' into jetty-9.1
2013-07-24 16:38:39 +10:00
e4a7203225
413486 SessionCookieConfig setters should throw IllegalStateException if called after context started
2013-07-24 16:32:21 +10:00
9f7de94f99
413486 SessionCookieConfig setters should throw IllegalStateException if called after context started
2013-07-24 15:14:54 +10:00
b8f7637e7d
Merge remote-tracking branch 'origin/master' into jetty-9.1
2013-07-22 23:32:04 +10:00
e4ef8ee1f4
413154 ContextHandlerCollection defers virtual host handling to ContextHandler
2013-07-22 22:10:13 +10:00
8e83b574a2
412935 setLocale is not an explicit set of character encoding
2013-07-19 14:33:53 +10:00
be00279e7e
413291 Avoid SPDY double dispatch
...
reduced warning to only when debug is on
2013-07-19 11:16:51 +10:00
48bedc3fd4
413020 Second call to HttpSession.invalidate() should throw exception
...
413019 HttpSession.getCreateTime() should throw exception after session is invalidated
2013-07-18 15:02:16 +10:00
8645849272
398467 Servlet 3.1 Non Blocking IO
...
Added ByteBuffer write and improved test harnesses
2013-07-18 12:53:07 +10:00
bad2f113e5
412940 minor threadsafe fixes
...
better protect event and listeners
2013-07-15 17:48:50 +10:00
cbc0a114f4
412940 minor threadsafe fixes
2013-07-15 16:40:27 +10:00
5d3760b17d
simplified HttpInput lock design
2013-07-15 15:54:25 +10:00
9f5f7e9ead
398467 Servlet 3.1 Non Blocking IO
...
fixed lock issue detected by Threadsafe from contemplateltd.com
2013-07-15 15:24:14 +10:00
987aa846cc
398467 Servlet 3.1 Non Blocking IO
...
ensure that EOF is checked after all calls to nextContent
2013-07-15 14:28:22 +10:00
b2be8a5781
turned off debugging
2013-07-15 14:12:00 +10:00
bd2add0ae9
Update to post-release (servlet 3.1/javaee) versions of javaee dependencies. WARNING: jetty-schemas from jetty-toolchain needs to be changed from SNAPSHOT to final release.
2013-07-12 13:53:58 +10:00
3add75f135
398467 Servlet 3.1 Non Blocking IO
...
prevent fillInterest from HTTP after upgrade
2013-07-12 13:01:46 +10:00
cd97b3dcbf
398467 Servlet 3.1 Non Blocking IO
...
fixed more tests
2013-07-11 15:57:42 +10:00
56f2f9c93f
Merge remote-tracking branch 'origin/master' into jetty-9.1
2013-07-11 15:20:43 +10:00
7b162460d7
412608 EOF Chunk not sent on inputstream static content
...
removed debug.
cleaned up imports.
2013-07-11 15:17:08 +10:00
a65ca7b5cd
Merge remote-tracking branch 'origin/master' into jetty-9.1
2013-07-11 14:45:16 +10:00
fdb9d22734
412608 EOF Chunk not sent on inputstream static content
...
Reworked loop to handle the case of a partial read before EOF
2013-07-11 14:41:46 +10:00
fde47b1083
412637 ShutdownMonitorThread already started
2013-07-10 17:21:43 +10:00
e35914e400
Merge remote-tracking branch 'origin/master' into jetty-9.1
...
Conflicts:
jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java
2013-07-09 00:32:41 +10:00
809c3aa472
412442 Avoid connection timeout after FIN-FIN close
2013-07-08 23:23:40 +10:00
70b285eabd
398467 Servlet 3.1 Non Blocking IO
...
fixed some tests
2013-07-08 14:59:08 +10:00
83b55418f5
Merge remote-tracking branch 'origin/master' into jetty-9.1
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java
2013-07-08 13:58:35 +10:00
4a49a5e3f0
398467 Servlet 3.1 Non Blocking IO
...
Handle bad listeners
2013-07-08 13:08:53 +10:00
2d911612a0
412318 HttpChannel fix multiple calls to _transport.completed() if handle() is called multiple times while the channel is COMPLETED
2013-07-05 12:02:52 +02:00
5d1225b60e
Revert "Revert "412318 HttpChannel fix multiple calls to _transport.completed() if handle() is called multiple times while the channel is COMPLETED""
...
This reverts commit 474d9fec28
2013-07-05 10:42:43 +02:00
981102fda5
398467 Servlet 3.1 Non Blocking IO
...
Asynchronous reads working.
2013-07-05 18:11:09 +10:00
474d9fec28
Revert "412318 HttpChannel fix multiple calls to _transport.completed() if handle() is called multiple times while the channel is COMPLETED"
...
This reverts commit cb2eb030d1
2013-07-05 09:21:10 +10:00
cb2eb030d1
412318 HttpChannel fix multiple calls to _transport.completed() if handle() is called multiple times while the channel is COMPLETED
2013-07-04 15:46:14 +02:00
965918d8f2
Merge remote-tracking branch 'origin/master' into jetty-9.1
2013-07-04 17:28:57 +10:00
bce8eaabe0
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/handler/RequestLogHandler.java
2013-07-04 17:28:22 +10:00
606c042691
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-07-04 15:52:39 +10:00
cb0084260f
411216 RequestLogHandler handles async completion
2013-07-04 15:22:56 +10:00
c33db24d94
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/handler/RequestLogHandler.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java
tests/test-continuation/src/test/java/org/eclipse/jetty/continuation/ContinuationTest.java
2013-07-04 15:00:47 +10:00
8d455056ec
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
...
Conflicts:
test-continuation/src/test/java/org/eclipse/jetty/continuation/ContinuationTest.java
2013-07-04 14:40:45 +10:00
7ad4d80af2
411216 RequestLogHandler handles async completion
2013-07-04 14:32:47 +10:00
8b31188ca7
405424 add X-Powered-By and Server header to SPDY
2013-07-01 21:57:22 +02:00
32ec8255db
411538 Use Replacement character for bad parameter % encodings
2013-06-27 10:19:51 +10:00
e4716e05e1
Merge remote-tracking branch 'origin/master' into jetty-9.1
...
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-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-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-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-server/src/test/java/org/eclipse/jetty/websocket/server/ab/Fuzzer.java
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-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-06-27 09:12:28 +10:00
d857562059
Merge branch 'release-9'
2013-06-25 16:37:05 -07:00
78b5f7df1f
[maven-release-plugin] prepare for next development iteration
2013-06-25 08:29:26 -07:00
5f2c937fcb
[maven-release-plugin] prepare release jetty-9.0.4.v20130625
2013-06-25 08:29:18 -07:00
31faf2fe20
Reverting failed release from friday
2013-06-25 07:42:45 -07:00
4d0a796f72
405424 X-Powered-By header
2013-06-24 17:09:44 +10:00
c0facf57f6
398467 simplified AbstractConnection fill interest handling
2013-06-24 14:36:22 +10:00
068e67a8df
Code cleanups for direct RequestDispatcher access
2013-06-24 13:13:03 +10:00
b2b2ce25fc
Revert "Code cleanups for direct RequestDispatcher access"
...
This reverts commit 1ff665f76a
2013-06-24 13:11:04 +10:00
1ff665f76a
Code cleanups for direct RequestDispatcher access
2013-06-24 13:00:21 +10:00
57bfda2a08
[maven-release-plugin] prepare for next development iteration
2013-06-21 09:49:25 -05:00
c1082ad4d4
[maven-release-plugin] prepare release jetty-9.0.4.v20130621
2013-06-21 09:49:15 -05:00
f9b4636cdb
Merge remote-tracking branch 'origin/master' into jetty-9.1
2013-06-21 13:34:02 +10:00
3cd59fe1b8
optimise out extra notify
2013-06-21 13:10:10 +10:00
3ded04813d
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/http/ServerHTTPSPDYTest.java
2013-06-21 11:22:58 +10:00
4e4ffaa54c
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
2013-06-17 16:29:39 +10:00
d6d5c04273
410893 async support defaults to false for spec created servlets and filters
2013-06-17 14:47:55 +10:00
59889bc149
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2013-06-17 13:17:14 +10:00
232eb4491a
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletContextHandler.java
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
jetty-webapp/src/main/java/org/eclipse/jetty/webapp/WebAppContext.java
2013-06-17 13:13:59 +10:00
eddb49941d
[Bug 408600] set correct jetty.url in all pom files
2013-06-12 15:52:36 -05:00
f116d76290
410337 throw EofException instead of EOFException in HttpOutput.write() if HttpOutpyt is closed
2013-06-12 10:54:57 +02:00
64d979a780
409449 Ensure servlets, filters and listeners added via dynamic registration, annotations or descriptors are cleaned on context restarts
2013-06-12 15:41:03 +10:00
91f6170c40
remove debug logging
2013-06-11 16:26:27 +02:00
beba00c5e0
410337 HttpOutput calls now HttpChannel.close() instead of closing the endPoint directly. That way the different implementations of HttpChannel can decide if the endPoint should be shutdown or not.
2013-06-11 16:17:15 +02:00
6150f29382
Merge branch 'jetty-8' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-8
2013-06-11 15:50:29 +10:00
2d661f18dd
410405 Avoid NPE for requestDispatcher(../)
...
Test double encoded dot dot
2013-06-11 15:30:40 +10:00
2b1e6bf0de
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
jetty-server/src/test/java/org/eclipse/jetty/server/HttpConnectionTest.java
2013-06-11 15:11:23 +10:00
d967ee2c3a
408806 getParameter returns null on Multipart request if called before request.getPart()/getParts()
2013-06-11 14:45:41 +10:00
9b8a78392c
410405 Avoid NPE for requestDispatcher(../)
...
Added extra tests for dotdot and encoded dotdot.
Also protected against dotdot in absolute URIs
2013-06-11 14:44:26 +10:00
ed04753111
410405 Avoid NPE for requestDispatcher(../)
2013-06-11 14:22:54 +10:00
d660cfcff6
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java
tests/test-continuation/src/test/java/org/eclipse/jetty/continuation/ContinuationBase.java
2013-06-11 11:17:04 +10:00
3de2ba33f1
fixed merge
2013-06-11 10:52:15 +10:00
5d17bdcc27
fixed double dispatch in continuation tests
2013-06-11 10:50:15 +10:00
27bc0b9d73
405188 - HTTP 1.0 with GET returns internal IP address.
...
Introduced HostHeaderCustomizer.
2013-06-10 10:29:05 +02:00
d2794584e1
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
2013-06-07 15:48:22 +10:00
82b73c065f
409953 return buffer.slice() instead of buffer.asReadOnlyBuffer() in ResourceCache to avoid using inefficent path in BufferUtil.writeTo
2013-06-06 14:09:27 +02:00
b274fdb0d6
409403 fix IllegalStateException when SPDY is used and the response is written through BufferUtil.writeTo byte by byte
2013-06-05 15:31:24 +02:00
e65e4e168d
409842 - Suspended request completed by a request thread does not set read interest.
...
HttpConnection.completed() now performs the right check about the current connection.
2013-06-05 11:34:12 +02:00
bacff75b31
Replace reponse.commit with response.closeOutput
2013-06-04 10:51:49 +10:00
7bb3a7be28
409556 Resource files not closed
...
Made Resource a closeable so that it is easier to close in a try(){} block. Deprecated release() and made it close() instead.
FileResource no longer extends URLResource as it can more efficiently implement all the methods with pure File operations and have no
connections or streams that need to be release/closed
2013-06-03 18:21:11 +10:00
41ac4a0877
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2013-05-31 18:46:10 +10:00
0e11c82307
fixed merge
2013-05-31 18:07:01 +10:00
842309e656
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
jetty-server/src/test/java/org/eclipse/jetty/server/ResponseTest.java
jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java
2013-05-31 18:06:34 +10:00
3849c893e1
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-05-31 11:07:40 +10:00
3094f93ed9
408642 setContentType from addHeader
2013-05-31 11:06:33 +10:00
b9014f29dc
fixed bad merge
2013-05-31 10:01:13 +10:00
b59949253d
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/EncodingHttpWriter.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
jetty-server/src/main/java/org/eclipse/jetty/server/Iso88591HttpWriter.java
jetty-server/src/main/java/org/eclipse/jetty/server/Utf8HttpWriter.java
2013-05-30 17:17:54 +10:00
d8f2350f50
398467 Servlet 3.1 Non Blocking IO
...
Removed double dispatch due to HttpPArser content handler returning true for deferred dispatch.
2013-05-30 16:15:04 +10:00
76457d4807
409441 jetty.xml threadpool arg injection
...
Do not use arg injection for ThreadPool
2013-05-30 11:59:36 +10:00
af02e9b16d
Update to version to 8.1.12-SNAPSHOT after last release
2013-05-30 10:52:39 +10:00
c961d65697
398467 Servlet 3.1 Non Blocking IO
...
completed removal of HttpOutput.closeIfAllContentWritten
2013-05-30 09:09:47 +10:00
579f8994ca
398467 Servlet 3.1 Non Blocking IO
...
continue after double dispatch with just a logged error
2013-05-29 09:37:43 +10:00
ddd187882f
398467 Servlet 3.1 Non Blocking IO
...
removed experiment input handling
2013-05-28 23:30:49 +10:00
ce662c7ddc
398467 Servlet 3.1 Non Blocking IO
...
cleaned up test harness
2013-05-28 23:29:38 +10:00
f03bc398f8
398467 Servlet 3.1 Non Blocking IO
...
Looking at async input
2013-05-28 23:28:07 +10:00
942f8a5c40
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
2013-05-28 22:51:31 +10:00
6f0195e0de
398467 Servlet 3.1 Non Blocking IO
...
Fixed handling of empty writes
fixed double close sendContent
2013-05-28 22:46:16 +10:00
288a452881
398467 Servlet 3.1 Non Blocking IO
...
some cleanup/fixes of SPDY tests. More work needed
2013-05-25 17:07:30 +10:00
c7be106423
398467 Servlet 3.1 Non Blocking IO
...
Working async writes after HttpChannelState refactor
2013-05-25 15:45:16 +10:00
94d1f4a020
398467 Servlet 3.1 Non Blocking IO
...
Check point progress as I dispair at the insane complexity of servlet 3.1 specification
2013-05-24 14:34:27 +10:00
6f8ed5e809
398467 Servlet 3.1 Non Blocking IO
...
Refactored HttpChannel to be ready to control onWritePossible callbacks
2013-05-23 17:34:28 +10:00
db2615ab29
408723 Jetty Maven plugin reload ignores web.xml listeners
2013-05-23 17:28:12 +10:00
15e0d50b79
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2013-05-23 09:50:27 +10:00
79486b5949
408720 NPE in AsyncContext.getRequest()
...
Do not null the _event during the complete method
2013-05-23 09:48:06 +10:00
725dc261c8
Merge branch 'release-8' into jetty-8
2013-05-22 10:44:14 -05:00
a1a6f0e5f2
Merge branch 'release-7' into jetty-7
2013-05-22 10:39:24 -05:00
74a4077dad
Add package-info.java files to all jetty packages.
2013-05-21 15:09:49 -05:00
742f6a063d
[Bug 408600] set correct jetty.url in all pom files
2013-05-21 13:16:39 -05:00
bdbd92dbc9
[Bug 408600] set correct jetty.url in all pom files
2013-05-21 13:10:07 -05:00
0858e69cb1
[maven-release-plugin] prepare for next development iteration
2013-05-20 07:19:34 -05:00
d469b77663
[maven-release-plugin] prepare release jetty-8.1.11.v20130520
2013-05-20 07:19:25 -05:00
497c2f7819
[maven-release-plugin] prepare for next development iteration
2013-05-20 07:15:00 -05:00
b32d0260c9
[maven-release-plugin] prepare release jetty-7.6.11.v20130520
2013-05-20 07:14:52 -05:00
cf71e9559b
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2013-05-17 17:19:54 +10:00
b6d1158c22
408167 JDBCSessionManager don't mark session as dirty if same attribute value set
2013-05-17 17:18:54 +10:00
d703319c87
398467 Servlet 3.1 Non Blocking IO
...
simplified write
2013-05-17 16:35:58 +10:00
5397f16559
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
2013-05-17 14:09:17 +10:00
8a6ab9ab9d
408117 isAsyncStarted is false on redispatch
2013-05-17 11:41:22 +10:00
b22d280e2a
398467 Servlet 3.1 Non Blocking IO
...
Cleaned up exceptions and HttpOutput.write
2013-05-16 19:00:00 +10:00
67a1b2a18f
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/session/HashSessionManager.java
jetty-server/src/main/java/org/eclipse/jetty/server/session/HashedSession.java
2013-05-16 16:06:41 +10:00
427c59e2f2
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-05-16 15:47:22 +10:00
51c1017b3d
408077 HashSessionManager leaves file handles open after being stopped
2013-05-16 15:39:50 +10:00
01768562ca
398467 Servlet 3.1 Non Blocking IO
...
fixed ResourceHandler
2013-05-16 14:27:32 +10:00
76b767fc22
Merge remote-tracking branch 'origin/jetty-8'
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionIdManager.java
2013-05-16 12:33:08 +10:00
4a562f8d89
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-05-16 12:25:19 +10:00
8a1ea2f69c
407976 JDBCSessionIdManager potentially leaves server in bad state after startup
2013-05-16 12:18:04 +10:00
76d4859eda
398467 Servlet 3.1 Non Blocking IO
...
Improved sendContent API and javadoc. Added FastFileServer example
2013-05-16 09:26:37 +10:00
cbac0ea5fa
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2013-05-16 07:24:49 +10:00
c03cb95e8a
removed debug prints
2013-05-14 17:57:52 +10:00
4dd80e9128
398467 Servlet 3.1 Non Blocking IO
...
More refinements to avoid duplicate code and optimise common paths
2013-05-14 17:52:46 +10:00
0116f45ff0
398467 Servlet 3.1 Non Blocking IO
...
Asynchronous default servlet
2013-05-14 10:09:09 +10:00
9f3e4dc5b7
398467 Servlet 3.1 Non Blocking IO
...
Added callbacks to HttpOutput
2013-05-14 10:09:09 +10:00
73bee3af4b
407708 - HttpUpgradeHandler must support injection
2013-05-13 17:47:53 +10:00
fe582e544a
398467 Non Blocking IO
...
Working towards 3.1 by exposing more of the underlying async IO operations.
added async support to write in HttpChannel
2013-05-10 20:11:19 +10:00
ccc7a71c74
398467 Non Blocking IO
...
Working towards 3.1 by exposing more of the underlying async IO operations.
2013-05-10 19:45:32 +10:00
09476ac235
406923 Accept CRLF or LF but not CR as line termination
...
Better handling of FF character
2013-05-09 15:01:50 +10:00
3d600ed95e
[maven-release-plugin] prepare for next development iteration
2013-05-06 18:13:04 -05:00
d832f3dc7e
[maven-release-plugin] prepare release jetty-9.0.3.v20130506
2013-05-06 18:12:55 -05:00
b182f09b2c
405944 Check annotation and resource injection is supported for AsyncListener
2013-05-06 16:32:38 +10:00
8d0cf5e949
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
2013-05-06 14:46:28 +10:00
e7564c9dcd
Merge remote-tracking branch 'origin/jetty-8'
2013-05-06 13:30:53 +10:00
488c1755e0
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
2013-05-06 13:22:26 +10:00
9ec10734e5
fixed warn output
2013-05-06 13:04:39 +10:00
f10a1d709b
407173 java.lang.IllegalStateException: null when using JDBCSessionManager
2013-05-06 12:24:53 +10:00
11dccd7677
reduced test output
2013-05-06 11:43:37 +10:00
98d260dd92
407075 Do not dispatch from complete
...
Call HttpChannel.handle directly from thread calling complete
2013-05-06 11:14:53 +10:00
215f3f1f56
406617 Spin in Request.recycle
...
Improved output in warning
2013-05-06 09:40:49 +10:00
fe1b71f4a0
Reduced build logging for Travis.
2013-05-04 00:26:29 +02:00
Greg Wilkins
Jesse McConnell
Thomas Becker
Jan Bartel
Joakim Erdfelt
Simone Bordet