Greg Wilkins
97d723c516
deprecate FileResource
2014-08-01 10:45:11 +10:00
Greg Wilkins
fa9b60c77e
Merge remote-tracking branch 'origin/jetty-http2' into pathresource
2014-08-01 10:17:42 +10:00
Greg Wilkins
78165ce5ff
fixed merge
2014-08-01 09:51:57 +10:00
Greg Wilkins
b439549793
Merge remote-tracking branch 'origin/master' into jetty-http2
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java
2014-08-01 09:50:20 +10:00
Greg Wilkins
785c45d899
Merge remote-tracking branch 'origin/master' into pathresource
2014-08-01 09:49:59 +10:00
Joakim Erdfelt
3c716a72e7
Ignoring bad/canonical uri alias
2014-07-31 16:45:36 -07:00
Greg Wilkins
f970ffc0ac
Misc cleanups done whilst fixing 435322
2014-08-01 09:02:44 +10:00
Greg Wilkins
77b8077910
435322 Fix AsyncGzipFilter missing callback on empty content
2014-08-01 09:02:10 +10:00
Joakim Erdfelt
b44a29e86b
Merge branch 'pathresource' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into pathresource
2014-07-31 15:17:01 -07:00
Joakim Erdfelt
33435fad3d
Making bad alias discovery more obvious (temporary)
2014-07-31 15:16:44 -07:00
Joakim Erdfelt
a0908bf9d8
Minor documentation updates
2014-07-31 13:56:02 -07:00
Joakim Erdfelt
6048343fee
Enhancing NTFS Stream tests
2014-07-31 10:09:53 -07:00
Joakim Erdfelt
971e1f0aaa
When test failure occurs, give more details
2014-07-31 08:41:35 -07:00
Greg Wilkins
0dbf684298
Added alias tests to FileSystemResourceTest
2014-07-31 15:22:12 +10:00
Greg Wilkins
252933891c
Merge branch 'master' into pathresource
...
Conflicts:
jetty-util/src/test/java/org/eclipse/jetty/util/resource/ResourceTest.java
2014-07-31 14:05:26 +10:00
Greg Wilkins
9c3eedfea8
Updates to hpack for hpack-09 draft
2014-07-31 13:26:23 +10:00
Greg Wilkins
a14b2be0e6
Merge branch 'jetty-http2' into refset
2014-07-31 11:58:30 +10:00
Greg Wilkins
70dafa8eb3
simplified HttpTransport API
2014-07-31 11:53:51 +10:00
Greg Wilkins
e415de44c6
Eat what you kill strategy avoids double dispatch
2014-07-31 08:58:19 +10:00
Greg Wilkins
489830a0b2
Prototype execution strategy
2014-07-30 18:08:54 +10:00
Greg Wilkins
5d8780cb4e
Record some TODOs
2014-07-28 15:27:40 +10:00
Greg Wilkins
8905b979ec
RFC7238 Permanent Redirect 308 defined
2014-07-28 15:27:17 +10:00
Greg Wilkins
093eea62b9
Revert "RFC7238 Permanent Redirect 308 defined"
...
This reverts commit 5d289c0a7b
.
Keep RFC723x changes in 9.3 branch
2014-07-28 15:24:44 +10:00
Greg Wilkins
5d289c0a7b
RFC7238 Permanent Redirect 308 defined
2014-07-28 14:58:03 +10:00
Greg Wilkins
a1696c0139
updates for hpack huffman and examples
2014-07-25 19:38:16 +10:00
Simone Bordet
b0d607a56d
Improved failure handling of AsyncProxyServlet.
2014-07-25 10:54:06 +02:00
Greg Wilkins
c13be6d932
Merge branch 'jetty-http2' into refset
...
Conflicts:
jetty-http2/http2-hpack/src/test/java/org/eclipse/jetty/http2/hpack/HpackEncoderTest.java
2014-07-25 18:33:10 +10:00
Greg Wilkins
66980f2449
Merge remote-tracking branch 'origin/master' into jetty-http2
...
Conflicts:
VERSION.txt
aggregates/jetty-all/pom.xml
apache-jsp/pom.xml
apache-jstl/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
examples/quickstart/pom.xml
jetty-alpn/jetty-alpn-client/pom.xml
jetty-alpn/jetty-alpn-server/pom.xml
jetty-alpn/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-alpn/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-quickstart/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-alpn-tests/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-mongodb-sessions/pom.xml
tests/test-sessions/test-sessions-common/pom.xml
tests/test-webapps/pom.xml
tests/test-webapps/test-dispatch-webapp/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-07-25 17:37:53 +10:00
Greg Wilkins
eaf374fa58
refactored Dispatcher for new HttpURI
2014-07-25 17:28:35 +10:00
Jan Bartel
f8bf40107a
436862 Update jetty-osgi to asm-5 and spifly-1.0.1
2014-07-25 15:32:41 +10:00
Greg Wilkins
22e57ef7b7
refactored Request to use new HttpURI
2014-07-25 15:03:51 +10:00
Joakim Erdfelt
12beb9758f
Merge branch 'release-9'
2014-07-24 11:09:26 -07:00
Joakim Erdfelt
87e18ab06a
Updating VERSION.txt top section
2014-07-24 11:09:01 -07:00
Greg Wilkins
30123607c6
Major refactor of metadata and HttpURI
...
This refactor strives to remove duplication between the Metadata class and the HttpURI class.
Both classes have been made mutable (as they partially were anyway so best not to pretend).
HttpURI now holds the decomposed strings rather than a single string with indexes. This allows it to be rebuilt after changing just parts of the URI. It is now a lot more similar to the
JVM URI class and we could consider replacing it (after checking peformance).
Next step is to refactor the Request class to prevent it duplicating these fields.
2014-07-24 15:49:52 +10:00
Joakim Erdfelt
cb42ef2167
[maven-release-plugin] prepare for next development iteration
2014-07-23 11:18:01 -07:00
Joakim Erdfelt
dc62cb5ac7
[maven-release-plugin] prepare release jetty-9.2.2.v20140723
2014-07-23 11:17:55 -07:00
Joakim Erdfelt
223ad1e519
Fixing groupId
2014-07-23 10:51:46 -07:00
Joakim Erdfelt
faf0775b50
Fixing quickstart dependency loop
2014-07-23 10:50:00 -07:00
Joakim Erdfelt
17a9fb2a3d
Fixing build
...
+ Quick start example is now in /examples/quickstart/ to avoid
dependency loop
+ Forgotten tests are now versioned correctly at 9.3.0
2014-07-23 10:47:19 -07:00
Simone Bordet
5ee49578e9
Better wait times for tests: 555s -> 5s.
2014-07-23 18:47:49 +02:00
Joakim Erdfelt
f63ec00028
Bumping up release plugin version
2014-07-23 09:33:10 -07:00
Joakim Erdfelt
e7aa5edd37
Updating VERSION.txt top section
2014-07-23 08:50:31 -07:00
Joakim Erdfelt
07830b6f76
Merge branch 'master' into release-9
2014-07-23 08:49:22 -07:00
Simone Bordet
67e788bc58
Replaced usage of Continuation with AsyncContext.
2014-07-23 14:56:31 +02:00
Simone Bordet
5956b9e013
411323 - DosFilter/QoSFilter should use AsyncContext rather than Continuations.
2014-07-23 14:07:14 +02:00
Simone Bordet
103cdbf6ef
Guarded calls to LOG.debug() with if (LOG.isDebugEnabled()) to reduce allocation of varargs Object[].
2014-07-23 11:35:47 +02:00
Greg Wilkins
2f41275b0f
fixed merge syntax errors
2014-07-23 16:57:36 +10:00
Greg Wilkins
192e8e8ed1
expanded tabs in indents
2014-07-23 16:54:05 +10:00
Greg Wilkins
fa3d7d0f7e
Merge remote-tracking branch 'origin/master' into jetty-http2
...
Conflicts:
jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextDispatchWithQueryStrings.java
2014-07-23 16:53:13 +10:00
Greg Wilkins
3a6879d3e8
expanded tabs in indents
2014-07-23 16:49:05 +10:00