Simone Bordet
9983f4680e
Merged branch 'jetty-9.2.x' into 'master'.
2015-04-21 12:38:04 +02:00
Simone Bordet
f73f2c22e3
Moved TransparentDelegate to AbstractProxyServlet.
...
Added AsyncMiddleManServlet.Transparent.
2015-04-21 12:16:10 +02:00
Joakim Erdfelt
09b5f680b7
464727 - Update Javadoc for Java 8 DocLint
...
Eliminate empty tag warnings
+ Changed <p/> to <p>
+ Changed <br/> to <br>
2015-04-15 14:38:35 -07:00
Simone Bordet
599ab9bb1b
460671 - Rationalize property names.
...
Property format is now "jetty.<module|component>.<propertyName>".
Updated all references with new properties.
2015-04-13 16:21:48 +02:00
Simone Bordet
4a9d9eae94
Merged branch 'jetty-9.2.x' into 'master'.
2015-04-09 15:58:26 +02:00
Simone Bordet
4fbdafb9e9
464292 - Implement stream-based transformer for AsyncMiddleManServlet.
...
Introduced AfterContentTransformer with a transform(Source, Sink)
method that offers an InputStream to read the original content from,
and an OutputStream to write transformed content to.
2015-04-09 15:15:27 +02:00
Simone Bordet
18938047e9
Removed deprecated APIs.
2015-04-08 18:40:32 +02:00
Simone Bordet
3f3e7391a6
Merged branch 'jetty-9.2.x' into 'master'.
2015-04-08 18:14:10 +02:00
Simone Bordet
990a045588
Deprecated filterResponseHeader() in favour of filterServerResponseHeader().
2015-04-08 18:11:24 +02:00
Greg Wilkins
1cb0449be3
Organised imports
2015-03-26 12:32:15 +11:00
Jesse McConnell
da4f95f3d3
[maven-release-plugin] prepare for next development iteration
2015-03-25 09:08:27 -05:00
Jesse McConnell
e92fd438fd
[maven-release-plugin] prepare release jetty-9.2.11.M0
2015-03-25 09:08:21 -05:00
Simone Bordet
0bcf1fade3
Removed forgotten System.err.println() debug statements.
2015-03-13 00:37:39 +01:00
Simone Bordet
64de5c861c
Removed forgotten System.err.println() debug statements.
2015-03-12 12:42:26 +01:00
Jesse McConnell
e3fd0056cf
[maven-release-plugin] prepare for next development iteration
2015-03-10 08:00:22 -05:00
Jesse McConnell
9d648f4000
[maven-release-plugin] prepare release jetty-9.2.10.v20150310
2015-03-10 08:00:14 -05:00
Simone Bordet
b7715fb3eb
Merged branch 'jetty-9.2.x' into 'master'.
2015-03-07 23:26:59 +01:00
Simone Bordet
7c915bcba2
461643 - HttpContent.advance() race.
...
Fixed by correctly synchronizing on ContentProvider.iterator.hasNext()
and ContentProvider.iterator.next() for those ContentProviders that
require it, such as DeferredContentProvider.
2015-03-07 23:13:21 +01:00
Simone Bordet
d63ed9864d
445518 - Provide different error callbacks to ProxyServlet.
...
Method names have been rationalized, and the old names deprecated.
Now methods have "clientRequest", "proxyRequest", "serverResponse" and
"proxyResponse" in their names to indicate the operation they belong to.
2015-03-07 22:32:59 +01:00
Greg Wilkins
9b5205ba40
Merge remote-tracking branch 'origin/jetty-9.2.x'
...
Conflicts:
jetty-util/src/main/java/org/eclipse/jetty/util/BufferUtil.java
2015-03-06 12:45:55 +11:00
Joakim Erdfelt
a07ad75a6c
Adding license header
2015-03-05 12:55:58 -07:00
Joakim Erdfelt
d582fdbd51
Adding code to simulate multiple (browser) clients against the proxy
2015-03-05 12:49:25 -07:00
Simone Bordet
213d6e1fbd
Added test for large chunked gzipped content.
2015-03-02 19:18:29 +01:00
Jesse McConnell
1659d83978
[maven-release-plugin] prepare for next development iteration
2015-02-24 10:38:33 -06:00
Jesse McConnell
dc0c3f4c52
[maven-release-plugin] prepare release jetty-9.2.9.v20150224
2015-02-24 10:38:28 -06:00
Joakim Erdfelt
bdf5854610
Merge branch 'jetty-9.2.x'
...
Conflicts:
VERSION.txt
2015-02-19 15:02:27 -07:00
Joakim Erdfelt
0bbe17186e
460371 - AsyncMiddleManServlet.GZipContentTransformer fails if last transform has no output
...
+ Making fix simpler, as prior complexity was introduced to satisfy
different test case dealing with discarded content.
That test case was improperly testing for no decompressed content.
Once that assertion was corrected, the ultimate fix is easier.
2015-02-19 14:07:43 -07:00
Joakim Erdfelt
0242c28bd9
460371 - AsyncMiddleManServlet.GZipContentTransformer fails if last transform has no output
...
+ Ensure that content that has been started to be gzipped is .close()
properly when the transform finished == true.
If no content has been gzipped, the .close() and .reset() are not
called, ever.
2015-02-19 12:17:17 -07:00
Jesse McConnell
ce5db2ca55
[maven-release-plugin] prepare for next development iteration
2015-02-17 16:02:22 -06:00
Jesse McConnell
26b7597928
[maven-release-plugin] prepare release jetty-9.2.8.v20150217
2015-02-17 16:02:16 -06:00
Simone Bordet
1f90d62d3f
Merged branch 'jetty-9.2.x' into 'master'.
2015-02-12 23:11:05 +01:00
Simone Bordet
d788df9a57
Added serverResponse parameter to filterServerResponseHeader().
2015-02-12 23:10:37 +01:00
Simone Bordet
38b5c11d25
Fixed merge conflict.
2015-02-12 14:40:43 +01:00
Simone Bordet
465f6f7da8
Merged branch 'jetty-9.2.x' into 'master'.
2015-02-12 14:32:24 +01:00
Simone Bordet
968ed9f0ae
Small updates to ProxyServletTest.
2015-02-12 14:27:09 +01:00
Simone Bordet
c449f1fa20
459769 - AsyncMiddleManServlet race condition on last download content.
...
Fixed by coordinating the notification of the proxying termination
between the last write performed from onSuccess() and the onComplete()
event using a CountingCallback.
2015-02-12 14:20:09 +01:00
Simone Bordet
b399649a1a
Merged branch 'jetty-9.2.x' into 'master'.
2015-02-10 15:30:20 +01:00
Simone Bordet
4462e6a01e
459352 - AsyncMiddleManServlet should set "Host:" header correctly in proxy to remote request headers.
...
Fixed by removing the host header during the copy, so that HttpClient
correctly sets it by looking at the request target.
2015-02-10 15:29:44 +01:00
Simone Bordet
7dffe4f082
459542 - AsyncMiddleManServlet race condition on first download content.
...
Fixed the race condition by submitting a zero length buffer to write
from onWritePossible() which will succeed the callback without
causing races.
2015-02-10 13:16:41 +01:00
Simone Bordet
12e2f9e6c8
459542 - AsyncMiddleManServlet race condition on first download content.
...
Fixed the race condition by submitting a zero length buffer to write
from onWritePossible() which will succeed the callback without
causing races.
2015-02-10 13:10:57 +01:00
Simone Bordet
99da9ce98e
Merged branch 'jetty-9.2.x' into 'master'.
2015-02-06 21:45:22 +01:00
Greg Wilkins
21e8cf68b6
allow InetSocketAddress to be translated in ConnectHandler
2015-02-06 11:17:36 +11:00
Greg Wilkins
2563ef6871
458527 - Implement an async proxy servlet that can perform content transformations.
...
Handle jetty-9.3 isReady at EOF behaviour
2015-02-04 16:27:29 +11:00
Simone Bordet
7d7fba4948
Merged branch 'jetty-9.2.x' into 'master'.
2015-01-29 17:10:10 +01:00
Simone Bordet
ebe95fb022
455436 - ProxyServlet sends two User-Agent values.
2015-01-29 17:09:30 +01:00
Simone Bordet
961a90d16c
Merged branch 'jetty-9.2.x' into 'master'.
2015-01-29 14:11:21 +01:00
Simone Bordet
a52703cba9
458527 - Implement an async proxy servlet that can perform content transformations.
2015-01-27 15:29:47 +01:00
Jesse McConnell
aa22842c20
[maven-release-plugin] prepare for next development iteration
2015-01-16 17:48:29 -06:00
Jesse McConnell
8c58a9abc4
[maven-release-plugin] prepare release jetty-9.2.7.v20150116
2015-01-16 17:48:23 -06:00
Jesse McConnell
81bb8411d1
[maven-release-plugin] prepare for next development iteration
2015-01-16 12:06:36 -06:00
Jesse McConnell
7865f88b81
[maven-release-plugin] prepare release jetty-9.2.7.v20150116
2015-01-16 12:06:30 -06:00
Jesse McConnell
db991355a2
[maven-release-plugin] prepare for next development iteration
2015-01-16 10:41:45 -06:00
Jesse McConnell
6930abb8d3
[maven-release-plugin] prepare release jetty-9.2.7.v20140116
2015-01-16 10:41:39 -06:00
Jesse McConnell
9225b124a4
[maven-release-plugin] prepare for next development iteration
2015-01-16 08:21:35 -06:00
Jesse McConnell
ebd563e64d
[maven-release-plugin] prepare release 9.2.7.v20140116
2015-01-16 08:21:29 -06:00
Simone Bordet
86c2d01e80
Merged branch 'jetty-9.2.x' into 'master'.
2015-01-09 12:59:17 +01:00
Simone Bordet
fd13361132
Fixed test assumption.
2015-01-09 12:58:14 +01:00
Simone Bordet
8a27385bc3
Merged branch 'jetty-9.2.x' into 'master'.
2015-01-09 12:51:13 +01:00
Simone Bordet
adae3193d8
457130 - HTTPS request with IP host and HTTP proxy throws IllegalArgumentException.
...
Fixed by handling the case of non-URI request target.
2015-01-09 11:49:13 +01:00
Greg Wilkins
e1cc5fb487
Merge remote-tracking branch 'origin/master' into jetty-9.3-ewyk
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
jetty-server/src/main/java/org/eclipse/jetty/server/QueuedHttpInput.java
jetty-util/src/main/java/org/eclipse/jetty/util/thread/NonBlockingThread.java
2015-01-08 15:21:01 +01:00
Joakim Erdfelt
a3201a3c81
Happy New Year 2015
2015-01-07 17:06:59 -07:00
Joakim Erdfelt
6a0668b7a1
Happy New Year 2015
2015-01-07 17:03:30 -07:00
Greg Wilkins
629035ba7a
Merge remote-tracking branch 'origin/jetty-9.2.x'
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
2015-01-07 23:42:10 +01:00
Greg Wilkins
2b530939a7
456956 Reduce ThreadLocal.remove() weak reference garbage
...
reduced calls to getCurrentConnection
2015-01-07 20:56:06 +01:00
Simone Bordet
c3582ceae2
Fixed test to be more reliable.
2015-01-05 13:32:55 +01:00
Greg Wilkins
3d66b1d207
ensure onAllDataRead always called
2015-01-02 19:17:26 +01:00
Simone Bordet
5bed6323c1
Reworked buffer releasing to ensure that it is always executed before
...
fillInterested() is called.
This is needed to avoid race conditions where fillInterested()
triggers a new thread entering onFillable() and acquiring a new buffer
while the previous thread is releasing the previous buffer.
2015-01-02 18:43:07 +01:00
Greg Wilkins
3af9b145a3
Deprecated the AbstractConnection dispatchIO mechanism
2015-01-01 16:18:13 +01:00
Greg Wilkins
cdd2b0a9d2
refacted SelectorManager to have a ManagedSelector
2014-12-17 16:29:24 +01:00
Jan Bartel
bc22ba72dc
[maven-release-plugin] prepare for next development iteration
2014-12-05 16:45:12 +01:00
Jan Bartel
1cc075cf98
[maven-release-plugin] prepare release jetty-9.2.6.v20141205
2014-12-05 16:45:01 +01:00
Jesse McConnell
127b48c932
[maven-release-plugin] prepare for next development iteration
2014-12-03 09:00:57 -06:00
Jesse McConnell
028f4b9610
[maven-release-plugin] prepare release jetty-9.2.6.v20141203
2014-12-03 09:00:46 -06:00
Jesse McConnell
1263d1f3c8
[maven-release-plugin] prepare for next development iteration
2014-12-03 08:26:47 -06:00
Jesse McConnell
5c7f706496
[maven-release-plugin] prepare release jetty-9.2.6.v20141203
2014-12-03 08:26:35 -06:00
Joakim Erdfelt
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
Simone Bordet
8330fa73e0
452188 Delay dispatch until content optimisation.
...
Renamed property "delayDispatchUntilContent".
2014-11-20 17:06:10 +01:00
Greg Wilkins
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
Greg Wilkins
04f74f73a5
452188 Delay dispatch until content optimisation
2014-11-19 11:11:48 +11:00
Jesse McConnell
09846e324d
[maven-release-plugin] prepare for next development iteration
2014-11-12 17:13:19 -06:00
Jesse McConnell
97d2bd95a6
[maven-release-plugin] prepare release jetty-9.2.5.v20141112
2014-11-12 17:13:14 -06:00
Jesse McConnell
5d0595cabd
[maven-release-plugin] prepare for next development iteration
2014-11-03 13:46:58 -06:00
Jesse McConnell
772ff0bfd4
[maven-release-plugin] prepare release jetty-9.2.4.v20141103
2014-11-03 13:46:52 -06:00
Jesse McConnell
1c4a08b35b
[maven-release-plugin] prepare for next development iteration
2014-10-31 09:58:16 -05:00
Jesse McConnell
a4ff7bf841
[maven-release-plugin] prepare release jetty-9.2.4.v20141031
2014-10-31 09:58:10 -05:00
Jesse McConnell
e1b73a64eb
[maven-release-plugin] prepare for next development iteration
2014-10-30 11:28:41 -05:00
Jesse McConnell
5770cc1179
[maven-release-plugin] prepare release jetty-9.2.4.v20141030
2014-10-30 11:28:35 -05:00
Jesse McConnell
58eb6740ec
[maven-release-plugin] prepare for next development iteration
2014-10-28 14:20:30 -05:00
Jesse McConnell
19a44846cf
[maven-release-plugin] prepare release jetty-9.2.4.v20141028
2014-10-28 14:20:24 -05:00
Greg Wilkins
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
Joakim Erdfelt
0f01f7edbd
446107 - NullPointerException in ProxyServlet when extended by Servlet
...
without a package
+ Adding null check
2014-10-08 14:38:16 -07:00
Simone Bordet
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
Simone Bordet
1e33c32513
Merged branch 'jetty-9.2.x' into 'master'.
2014-09-23 18:48:16 +02:00
Simone Bordet
dd8be028bb
444863 - ProxyServlet does not filter headers listed by the Connection header.
2014-09-23 18:47:27 +02:00
Simone Bordet
ee0f90b6b9
444416 - AsyncProxyServlet recursion.
...
Implemented reading of content using IteratingCallback to avoid
recursion.
2014-09-23 11:33:44 +02:00
Greg Wilkins
08e1f39bf9
444416 Interative Callback pattern in AsyncProxyServlet
2014-09-23 11:33:43 +02:00
Simone Bordet
ddcf878c32
444416 - AsyncProxyServlet recursion.
...
Implemented reading of content using IteratingCallback to avoid
recursion.
2014-09-22 18:21:35 +02:00
Greg Wilkins
ca07a9947e
444416 Interative Callback pattern in AsyncProxyServlet
2014-09-18 16:20:08 +10:00
Joakim Erdfelt
9249ebb6ef
Using 9.2.4-SNAPSHOT for branch
2014-09-11 06:10:44 -07:00
Jesse McConnell
9bfeb2221f
[maven-release-plugin] prepare release jetty-9.2.3.v20140905
2014-09-05 09:19:23 -05:00