Commit Graph

65 Commits

Author SHA1 Message Date
Joakim Erdfelt a12fd9ea03 Happy New Year - 2014! 2014-01-02 14:50:14 -07:00
Simone Bordet dbd404fa03 Fixed jetty-proxy module definition and XML.
The module definition had the wrong dependencies and the XML file was
starting a new Server instance instead of configuring the default one.
Updated properties to match the new configuration.
2013-11-05 23:53:56 +01:00
Greg Wilkins f567bddad9 global clean up imports 2013-11-04 13:48:03 +11:00
Greg Wilkins eb3bb660b5 Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
	jetty-client/src/main/java/org/eclipse/jetty/client/util/DigestAuthentication.java
	jetty-client/src/test/java/org/eclipse/jetty/client/HttpReceiverTest.java
	jetty-client/src/test/java/org/eclipse/jetty/client/HttpSenderTest.java
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpField.java
	jetty-server/src/test/java/org/eclipse/jetty/server/AbstractHttpTest.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/AbstractDoSFilterTest.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/generator/HeadersBlockGenerator.java
	jetty-spdy/spdy-core/src/main/java/org/eclipse/jetty/spdy/parser/HeadersBlockParser.java
	jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/ClientUpgradeRequest.java
	jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketFrame.java
	jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/WebSocketSession.java
	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/DeflateCompressionMethodTest.java
	jetty-websocket/websocket-common/src/test/java/org/eclipse/jetty/websocket/common/extensions/compress/PerMessageDeflateExtensionTest.java
2013-11-03 18:22:09 +11:00
Mikhail Mazursky 6b0269a16d [Bug 420930] Use Charset to specify character encoding
Signed-off-by: Mikhail Mazursky <mikhail.mazursky@gmail.com>
2013-11-02 14:44:36 +06:00
Simone Bordet b1e277af21 Refactored addition of proxy headers into two methods,
to allow subclasses to override this behavior more easily.
2013-10-31 10:12:58 +01:00
Joakim Erdfelt ed4d8241ca 418923 - Missing parameterization of etc/jetty-proxy.xml 2013-10-30 09:29:57 -07:00
Joakim Erdfelt 5965e695fa Cleaning up modules 2013-10-24 14:06:50 -07:00
Simone Bordet 41eed8f836 419904 - Data corruption on proxy PUT requests.
Fixed InputStreamContentProvider to not reuse the byte[] to read from
the stream.
2013-10-22 12:40:32 +02:00
Simone Bordet 25f2fcc691 Avoid to specify a content in the proxied request if there is none in
the original request.
2013-10-21 22:42:49 +02:00
Simone Bordet eaefd17652 420012 - Improve ProxyServlet.Transparent configuration in case prefix="/". 2013-10-21 22:41:39 +02:00
Simone Bordet e408bd64c7 Improved HttpClient's proxy configuration by using Strings as
included and excluded addresses. This allows to pass in Strings such
as 127.0.0.1/8 or other wildcard formats.
2013-10-17 10:44:39 +02:00
Simone Bordet 3886cc2dc5 Merged branch 'jetty-9.1' into 'http_client_connection_factories'. 2013-10-08 15:08:07 +02:00
Simone Bordet 25d9b8704f 417356 - Add SOCKS support to jetty client.
Big refactoring to allow for additional proxy schemes that work at a
lower level than HTTP.

Introduced client-side ConnectionFactory, and binding that to a
HttpDestination, so that connections to that destination will use the
same ConnectionFactory.

The destination's ConnectionFactory is now initialized from the proxy
configuration and the transport, which is now itself a
ConnectionFactory.

The proxy configuration has also changed becoming polymorphic by
introducing a new ProxyConfiguration.Proxy abstract class,
which is implemented as HTTPProxy and can be implemented in future as
SOCKS4Proxy (and possibly others).
2013-10-08 15:06:39 +02:00
Joakim Erdfelt 4a27f3bf4e Fixing javadoc error 2013-10-03 11:09:41 -07:00
Greg Wilkins 2ef92d5477 fixed proxy tests 2013-10-01 10:39:08 +10:00
Greg Wilkins 6146f0cc9c cleanup threadpool usage 2013-09-30 14:07:17 +10:00
Simone Bordet 4663fa4992 Renamed "Empty" inner classes to "Adapter" to comply with the rest of
the codebase.
2013-09-04 13:15:23 +02:00
Jesse McConnell ac30f5c9bd update other jetty mods to new format 2013-08-29 16:39:28 -05:00
Jesse McConnell 450cdb3ef4 add servlet/s mod 2013-08-22 12:21:52 -05:00
Jesse McConnell 725e405dac first pass for mod files for distribution 2013-08-22 11:53:58 -05:00
Jan Bartel 2c3ecf9e38 414731 Request.getCookies() should return null if there are no cookies 2013-08-09 18:08:16 +10:00
Greg Wilkins 89acff6bdf Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-08-08 11:06:14 +10:00
Greg Wilkins 95416bce76 413568 Made AJP worker name generic 2013-08-08 10:51:43 +10:00
Simone Bordet 9d571af7b0 Merged branch 'master' into 'jetty-9.1'. 2013-07-26 13:55:05 +02:00
Greg Wilkins ea7854eccf removed delicate external test 2013-07-26 16:09:50 +10:00
Joakim Erdfelt c0f0341a03 3rd party External Proxy no longer stable 2013-07-25 11:45:21 -07:00
Simone Bordet 743c78cc0c 412846 - jetty Http Client Connection through Proxy is failing with Timeout.
The problem was due to the fact that the server replied with HTTP/1.0
to the CONNECT request; because of this, the parser was not set in the
"head response mode".

Now we are setting the parser in the head response mode also if the
request method is a CONNECT.
2013-07-25 16:38:22 +02:00
Simone Bordet 727cf815a2 Merged branch 'jetty-8' into 'master'. 2013-06-19 21:25:40 +02:00
Simone Bordet a2815c0611 410246 - HttpClient with proxy does not tunnel HTTPS requests.
Modified HttpClient to tunnel properly requests, and ported tests from Jetty 7 to test this behavior.
2013-06-08 00:38:11 +02:00
Simone Bordet 4c3a777ed5 408782 - Transparent Proxy - rewrite URL is ignoring query strings. 2013-06-06 15:38:51 +02:00
Jesse McConnell 74a4077dad Add package-info.java files to all jetty packages. 2013-05-21 15:09:49 -05:00
Jesse McConnell b959a742d0 [Bug 404508] enable overlay deployer 2013-05-20 09:20:40 -05:00
Simone Bordet 7037bca94d Introduced Request.header(HttpHeader, String) to simplify code. 2013-03-04 17:05:18 +01:00
Greg Wilkins 056be85766 less verbose exception 2013-03-04 16:40:18 +11:00
Simone Bordet e6fed09129 402075 - Massive old gen growth when hit by lots of non persistent connections.
Replaced usages of TimerScheduler with ScheduledExecutorScheduler.
2013-03-01 15:19:51 +01:00
Greg Wilkins 2d310ac82e 401642 Less verbose INFOs 2013-02-25 14:42:30 +11:00
Simone Bordet 209d5bc12f 399721 - Change <Ref id= ...> to <Ref refid= ...> 2013-02-01 13:03:11 +01:00
Greg Wilkins 5435cd3365 385306 added getURI method 2013-01-25 13:52:32 +11:00
Simone Bordet 44e64aa309 Removed TimedResponseListener, since the timeout mechanism is now
provided by Request.timeout(...) for both blocking and asynchronous send().
2013-01-17 16:15:34 +01:00
Simone Bordet cda27ae4a1 398285 - ProxyServlet mixes cookies from different clients.
Now ProxyServlet's HttpClient uses HttpCookieStore.Empty, so it never stores cookies.
2013-01-17 12:53:40 +01:00
Simone Bordet 6cbac985e5 398285 - ProxyServlet mixes cookies from different clients.
Now ProxyServlet's HttpClient uses HttpCookieStore.Empty, so it never stores cookies.
2013-01-17 12:53:39 +01:00
Jan Bartel 9934cd707a Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/ProxyServlet.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/ProxyServletTest.java
2013-01-15 20:35:46 +11:00
Jesse McConnell e1c516c7d1 merge from jetty-8 and update license blocks. 2013-01-11 17:04:53 -06:00
Greg Wilkins 27c31fb403 jetty-9 organised imports. Cleaned up some TODOs 2013-01-11 16:37:32 +11:00
Simone Bordet c9f4513a89 Reworked HTTP client API, removing usage of Future. 2012-12-19 16:27:20 +01:00
Greg Wilkins 6f098dd69c jetty-9 use DateCache timer to set Date header once per second 2012-12-10 12:58:14 +11:00
Greg Wilkins a20d984d30 jetty-9 Added Trie for cached string lookup. HttpFields does not use StringMap 2012-12-08 01:41:00 +11:00
Simone Bordet b2e878a7e8 + Introduced Request.content(ContentProvider content, String contentType)
+ Introduced a new renamings to clarify concepts
+ Vastly improved Javadocs.
2012-12-04 16:18:09 +01:00
Greg Wilkins 9a4e5f3301 jetty-9 Added proxy test webapp. Refined no servlet context handling 2012-11-26 16:57:37 +11:00