Greg Wilkins
|
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 |
|
Greg Wilkins
|
4a49a5e3f0
|
398467 Servlet 3.1 Non Blocking IO
Handle bad listeners
|
2013-07-08 13:08:53 +10:00 |
|
Thomas Becker
|
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 |
|
Thomas Becker
|
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 474d9fec28917bcae9cb9cfdc504aa54243a9b50.
|
2013-07-05 10:42:43 +02:00 |
|
Greg Wilkins
|
981102fda5
|
398467 Servlet 3.1 Non Blocking IO
Asynchronous reads working.
|
2013-07-05 18:11:09 +10:00 |
|
Greg Wilkins
|
474d9fec28
|
Revert "412318 HttpChannel fix multiple calls to _transport.completed() if handle() is called multiple times while the channel is COMPLETED"
This reverts commit cb2eb030d18b6c92f3249794c02b100f0ee5cb33.
|
2013-07-05 09:21:10 +10:00 |
|
Thomas Becker
|
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 |
|
Greg Wilkins
|
965918d8f2
|
Merge remote-tracking branch 'origin/master' into jetty-9.1
|
2013-07-04 17:28:57 +10:00 |
|
Greg Wilkins
|
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 |
|
Greg Wilkins
|
606c042691
|
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
|
2013-07-04 15:52:39 +10:00 |
|
Greg Wilkins
|
cb0084260f
|
411216 RequestLogHandler handles async completion
|
2013-07-04 15:22:56 +10:00 |
|
Greg Wilkins
|
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 |
|
Greg Wilkins
|
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 |
|
Greg Wilkins
|
7ad4d80af2
|
411216 RequestLogHandler handles async completion
|
2013-07-04 14:32:47 +10:00 |
|
Thomas Becker
|
8b31188ca7
|
405424 add X-Powered-By and Server header to SPDY
|
2013-07-01 21:57:22 +02:00 |
|
Greg Wilkins
|
32ec8255db
|
411538 Use Replacement character for bad parameter % encodings
|
2013-06-27 10:19:51 +10:00 |
|
Greg Wilkins
|
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 |
|
Joakim Erdfelt
|
d857562059
|
Merge branch 'release-9'
|
2013-06-25 16:37:05 -07:00 |
|
Joakim Erdfelt
|
78b5f7df1f
|
[maven-release-plugin] prepare for next development iteration
|
2013-06-25 08:29:26 -07:00 |
|
Joakim Erdfelt
|
5f2c937fcb
|
[maven-release-plugin] prepare release jetty-9.0.4.v20130625
|
2013-06-25 08:29:18 -07:00 |
|
Joakim Erdfelt
|
31faf2fe20
|
Reverting failed release from friday
|
2013-06-25 07:42:45 -07:00 |
|
Greg Wilkins
|
4d0a796f72
|
405424 X-Powered-By header
|
2013-06-24 17:09:44 +10:00 |
|
Greg Wilkins
|
c0facf57f6
|
398467 simplified AbstractConnection fill interest handling
|
2013-06-24 14:36:22 +10:00 |
|
Greg Wilkins
|
068e67a8df
|
Code cleanups for direct RequestDispatcher access
|
2013-06-24 13:13:03 +10:00 |
|
Greg Wilkins
|
b2b2ce25fc
|
Revert "Code cleanups for direct RequestDispatcher access"
This reverts commit 1ff665f76ac38faaa8831191b6b4be89fc1b2acf.
|
2013-06-24 13:11:04 +10:00 |
|
Greg Wilkins
|
1ff665f76a
|
Code cleanups for direct RequestDispatcher access
|
2013-06-24 13:00:21 +10:00 |
|
Jesse McConnell
|
57bfda2a08
|
[maven-release-plugin] prepare for next development iteration
|
2013-06-21 09:49:25 -05:00 |
|
Jesse McConnell
|
c1082ad4d4
|
[maven-release-plugin] prepare release jetty-9.0.4.v20130621
|
2013-06-21 09:49:15 -05:00 |
|
Greg Wilkins
|
f9b4636cdb
|
Merge remote-tracking branch 'origin/master' into jetty-9.1
|
2013-06-21 13:34:02 +10:00 |
|
Greg Wilkins
|
3cd59fe1b8
|
optimise out extra notify
|
2013-06-21 13:10:10 +10:00 |
|
Greg Wilkins
|
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 |
|
Greg Wilkins
|
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 |
|
Greg Wilkins
|
d6d5c04273
|
410893 async support defaults to false for spec created servlets and filters
|
2013-06-17 14:47:55 +10:00 |
|
Jan Bartel
|
59889bc149
|
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
|
2013-06-17 13:17:14 +10:00 |
|
Jan Bartel
|
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 |
|
Jesse McConnell
|
eddb49941d
|
[Bug 408600] set correct jetty.url in all pom files
|
2013-06-12 15:52:36 -05:00 |
|
Thomas Becker
|
f116d76290
|
410337 throw EofException instead of EOFException in HttpOutput.write() if HttpOutpyt is closed
|
2013-06-12 10:54:57 +02:00 |
|
Jan Bartel
|
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 |
|
Thomas Becker
|
91f6170c40
|
remove debug logging
|
2013-06-11 16:26:27 +02:00 |
|
Thomas Becker
|
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 |
|
Greg Wilkins
|
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 |
|
Greg Wilkins
|
2d661f18dd
|
410405 Avoid NPE for requestDispatcher(../)
Test double encoded dot dot
|
2013-06-11 15:30:40 +10:00 |
|
Greg Wilkins
|
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 |
|
Jan Bartel
|
d967ee2c3a
|
408806 getParameter returns null on Multipart request if called before request.getPart()/getParts()
|
2013-06-11 14:45:41 +10:00 |
|
Greg Wilkins
|
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 |
|
Greg Wilkins
|
ed04753111
|
410405 Avoid NPE for requestDispatcher(../)
|
2013-06-11 14:22:54 +10:00 |
|
Greg Wilkins
|
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 |
|
Greg Wilkins
|
3de2ba33f1
|
fixed merge
|
2013-06-11 10:52:15 +10:00 |
|
Greg Wilkins
|
5d17bdcc27
|
fixed double dispatch in continuation tests
|
2013-06-11 10:50:15 +10:00 |
|
Simone Bordet
|
27bc0b9d73
|
405188 - HTTP 1.0 with GET returns internal IP address.
Introduced HostHeaderCustomizer.
|
2013-06-10 10:29:05 +02:00 |
|