217 Commits

Author SHA1 Message Date
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
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
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
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
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
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