ed594425d3
Merge branch 'jetty-9.2.x'
...
Conflicts:
jetty-server/src/main/config/etc/jetty.xml
jetty-server/src/main/config/modules/server.mod
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpConfiguration.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
2014-11-25 12:09:21 -07:00
8330fa73e0
452188 Delay dispatch until content optimisation.
...
Renamed property "delayDispatchUntilContent".
2014-11-20 17:06:10 +01:00
aeccef2154
Merge remote-tracking branch 'origin/jetty-9.2.x'
...
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
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-cdi/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-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java
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-quickstart/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-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-11-19 13:37:48 +11:00
04f74f73a5
452188 Delay dispatch until content optimisation
2014-11-19 11:11:48 +11:00
758ce66c8d
Merge remote-tracking branch 'origin/jetty-9.2.x'
...
Conflicts:
jetty-websocket/pom.xml
tests/test-sessions/test-mongodb-sessions/pom.xml
2014-10-10 08:53:43 +11:00
0f01f7edbd
446107 - NullPointerException in ProxyServlet when extended by Servlet
...
without a package
+ Adding null check
2014-10-08 14:38:16 -07:00
8d2efaf7eb
445167 - Allow configuration of dispatch after select.
...
Introduced parameter "dispatchIO" in the relevant factories so that
they can be configured by users and connections will be created
taking into account this parameter.
For less configurable connection factories, this parameter is
currently hardcoded to either true or false depending on the case.
For example, ALPN and NPN connections have it to false, since they
don't do any blocking operation in onFillable().
2014-09-26 10:13:16 +02:00
1e33c32513
Merged branch 'jetty-9.2.x' into 'master'.
2014-09-23 18:48:16 +02:00
dd8be028bb
444863 - ProxyServlet does not filter headers listed by the Connection header.
2014-09-23 18:47:27 +02:00
ee0f90b6b9
444416 - AsyncProxyServlet recursion.
...
Implemented reading of content using IteratingCallback to avoid
recursion.
2014-09-23 11:33:44 +02:00
08e1f39bf9
444416 Interative Callback pattern in AsyncProxyServlet
2014-09-23 11:33:43 +02:00
ddcf878c32
444416 - AsyncProxyServlet recursion.
...
Implemented reading of content using IteratingCallback to avoid
recursion.
2014-09-22 18:21:35 +02:00
ca07a9947e
444416 Interative Callback pattern in AsyncProxyServlet
2014-09-18 16:20:08 +10:00
5be1fb6270
Merge remote-tracking branch 'origin/master' into jetty-http2
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
2014-09-03 15:19:54 +10:00
e03b511415
trying to catch intermittent test failure
2014-09-03 15:00:40 +10:00
ee3ab1f8ea
Merged branch 'master' into 'jetty-http2'.
2014-09-01 11:57:09 +02:00
9dbd2cd9d8
442950 - Embedded Jetty client requests to localhost hangs with high cpu usage (NIO OP_CONNECT Solaris/Sparc).
...
Now checking the return value of SocketChannel.connect() to determine
whether to register the channel (true) or finish the connect (false).
2014-09-01 11:28:59 +02:00
7406a280b3
Adding some extra proxy tests around spaces in query parameters
2014-08-01 14:50:54 -07:00
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
b0d607a56d
Improved failure handling of AsyncProxyServlet.
2014-07-25 10:54:06 +02:00
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
eaf374fa58
refactored Dispatcher for new HttpURI
2014-07-25 17:28:35 +10:00
5ee49578e9
Better wait times for tests: 555s -> 5s.
2014-07-23 18:47:49 +02:00
103cdbf6ef
Guarded calls to LOG.debug() with if (LOG.isDebugEnabled()) to reduce allocation of varargs Object[].
2014-07-23 11:35:47 +02:00
e199b671bb
440020 Abort bad proxy responses with sendError(-1)
2014-07-23 16:31:19 +10:00
987800c419
440122 - Remove usages of ForkInvoker.
2014-07-22 16:36:15 +02:00
1678f93ce9
439788 - CORS filter headers gone between 9.2.0.M0 and 9.2.1 .v20140609 for ProxyServlet requests.
...
Removed the offending code that was added only to avoid duplicate
Date headers, but sending of those headers is configurable from
HttpConfiguration.
2014-07-21 23:22:28 +02:00
cae4204150
440020 - ProxyServlet does not handle correctly failure after committed response to client.
...
Fixed by introducing a request attribute "org.eclipse.jetty.server
.Response.failure" used by HttpChannel to immediately close the
connection when it sees it.
2014-07-21 16:48:21 +02:00
745f757552
Guarded calls to LOG.debug() with if (LOG.isDebugEnabled()) to reduce allocation of varargs Object[].
2014-07-15 18:49:14 +02:00
55ca09a00e
438190 findbug improvements
2014-07-10 14:41:32 +10:00
7fbf521d4e
438204 correctly wrap IPv6 hostnames in URIs generated by jetty
2014-07-03 10:11:16 +10:00
3ff4195dbc
Guarded calls to LOG.debug() with if (LOG.isDebugEnabled()) to reduce allocation of varargs Object[].
2014-06-25 12:26:45 +02:00
9e1cac33d0
Made ProxyServlet and AsyncProxyServlet more extensible by adding
...
factory methods for relevant objects used in the implementation.
2014-05-21 09:11:40 +02:00
d75b9177c5
432939 - Jetty Client ContentResponse should have methods such as getContentType() and getMediaType().
...
Introduced ContentResponse.getMediaType() and ContentResponse .getEncoding(),
as well as BufferingResponseListener.getMediaType() to make the media
type and the encoding available to applications.
2014-05-15 10:58:49 +02:00
e67df36773
Removed redundant assignment.
2014-05-06 13:58:14 +02:00
a9134a9b94
Made handling of client error more robust, avoiding
...
IllegalStateExceptions when trying to complete the response.
2014-05-05 16:18:41 +02:00
0e594e55c3
Dispatching execution of blocking code to a different thread to avoid
...
to block the selector thread.
2014-05-05 15:40:28 +02:00
871b330ba8
434056 - Support content consumed asynchronously.
...
Implemented content consumed asynchronously for FastCGI (on the client).
2014-05-04 23:15:54 +02:00
4369e1d242
Better fix for the duplicate Date header.
2014-05-04 15:27:09 +02:00
a405454276
431642 - Implement ProxyServlet using Servlet 3.1 async I/O.
...
Added more tests for failure cases.
2014-05-03 10:29:19 +02:00
906dc83691
431642 - Implement ProxyServlet using Servlet 3.1 async I/O.
...
Implemented correctly AsyncProxyServlet, tests passing.
2014-04-30 15:34:30 +02:00
ca67a9e10d
Merged branch 'master' into '431642'.
2014-04-29 15:59:23 +02:00
63d59feb0f
433370 - PATCH method does not work with ProxyServlet.
...
Fixed by using Request.method(String) rather than
Request.method(HttpMethod).
2014-04-24 11:21:56 +02:00
76a1e032eb
Allow subclasses to override the proxied request content.
2014-04-23 22:26:22 +02:00
1185febb74
Merged branch 'master' into '431642'.
2014-04-18 15:19:18 +02:00
04f4e6fb5b
Merged branch 'master' into '431642'.
2014-04-18 15:08:53 +02:00
7c8c45c397
432993 - Improve handling of ProxyTo and Prefix parameters in ProxyServlet.Transparent.
...
Fixed case of empty context path and missing Prefix parameter.
2014-04-17 13:27:34 +02:00
4975cae881
Further progress on 431642 (async proxy servlet).
2014-04-11 09:45:21 +02:00
860ea9c329
Made easier for subclasses to customize the response code in case of
...
rewrite failed.
2014-04-01 15:50:41 +02:00
a96d7c388c
Initial implementation of 431642 (async proxy servlet).
2014-04-01 15:45:52 +02:00
Joakim Erdfelt
Simone Bordet
Greg Wilkins