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
Simone Bordet
8eaedc4a5e
Code cleanups.
...
Removed unused parameters, and renamed property "executeOnFillable"
to "dispatchIO", for similarity with HttpClient and for better
description (it names the concept, not the implementation detail).
2013-10-04 16:40:27 +02:00
Joakim Erdfelt
499d811ba7
Merge branch 'master' into jetty-9.1
2013-09-30 20:00:26 -07:00
Joakim Erdfelt
1315096192
Disabling broken external server test
2013-09-30 20:00:02 -07:00
Greg Wilkins
2d7f1a2272
ignore test dependent on external server
2013-10-01 11:18:09 +10:00
Greg Wilkins
2ef92d5477
fixed proxy tests
2013-10-01 10:39:08 +10:00
Jesse McConnell
3fb3616b21
remove overlay deployer for 9.1 while it gets reconsidered in new module system
2013-09-30 19:11:34 -05:00
Jan Bartel
8cb1001007
Merge remote-tracking branch 'origin/master' into jetty-9.1
2013-10-01 09:12:43 +10:00
Jan Bartel
a6f0883ca3
Remove explicit port number from jetty-client SslBytesClientTest
2013-10-01 09:05:05 +10:00
Jan Bartel
4a917b464f
Fix JNDI test for change to ContextHandler
2013-10-01 08:04:25 +10:00
Joakim Erdfelt
c829d7dbaa
Fixing test failure on testAttributes because of Executors assumption
2013-09-30 14:09:49 -07:00
Greg Wilkins
6146f0cc9c
cleanup threadpool usage
2013-09-30 14:07:17 +10:00
Greg Wilkins
b636c58af6
fixed test.xml overlay
2013-09-30 13:56:37 +10:00
Jan Bartel
92233ebf83
417561 Refactor annotation related code: change log messages
2013-09-30 13:27:05 +10:00
Jan Bartel
afb1b69171
Add some more timing instrumentation to annotation related processing
2013-09-30 13:27:05 +10:00
Jan Bartel
df336f3476
417561 Refactor annotation related code - remove unneeded log statements
2013-09-30 13:27:05 +10:00
Jan Bartel
0400289826
417561 Refactor annotation related code - make annotation phase able to be multithreaded
2013-09-30 13:27:05 +10:00
Greg Wilkins
0fd656dcbe
Merge remote-tracking branch 'origin/master' into jetty-9.1
2013-09-30 13:20:54 +10:00
Greg Wilkins
5f02620603
Merge remote-tracking branch 'origin/master' into jetty-9.1
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java
2013-09-30 13:20:13 +10:00
Greg Wilkins
a59439241f
418227 Null cookie value test
2013-09-30 12:59:34 +10:00
Greg Wilkins
f07722909f
reduced routine exception verbosity
2013-09-30 12:45:16 +10:00
Jan Bartel
cb554948a2
417574 Setting options with _JAVA_OPTIONS breaks run-forked with <waitForChild>true</waitForChild>
2013-09-30 12:23:14 +10:00
Joakim Erdfelt
a03221abd0
Merge branch 'master' into jetty-9.1
2013-09-27 11:40:54 -07:00
Joakim Erdfelt
8d312b9e5d
418212 - org.eclipse.jetty.spdy.server.http.SSLExternalServerTest hangs
...
+ Adding timeout on test
2013-09-27 11:40:35 -07:00
Joakim Erdfelt
273f61210e
418212 - org.eclipse.jetty.spdy.server.http.SSLExternalServerTest hangs
...
+ Adding timeout on test
2013-09-27 11:39:52 -07:00
Greg Wilkins
7dec90fafb
some demo cleanups
2013-09-27 17:47:31 +10:00
Greg Wilkins
0fac295cd8
418014 Handle NTFS canonical exceptions during alias check
...
replaced URL returns with URI
2013-09-27 15:50:36 +10:00
Greg Wilkins
080781ec0e
Merge remote-tracking branch 'origin/master' into jetty-9.1
2013-09-27 13:37:55 +10:00
Greg Wilkins
458e511ce2
418014 Handle NTFS canonical exceptions during alias check
2013-09-27 13:37:00 +10:00
Joakim Erdfelt
1ccba6e172
Clean up class + param order consistency
2013-09-26 10:30:29 -07:00
Joakim Erdfelt
b966545a95
417152 - WebSocket / Do all setup in websocket specific ServletContainerInitializer
...
+ removing etc/jetty-websockets.xml (now irrelevant)
2013-09-26 10:13:12 -07:00
Joakim Erdfelt
1fcede8b8b
Merge branch 'master' into jetty-9.1
...
Conflicts:
jetty-util/src/test/java/org/eclipse/jetty/util/MultiMapTest.java
2013-09-26 06:07:06 -07:00
Joakim Erdfelt
e92f0965c7
Removing scope test
2013-09-26 06:06:23 -07:00
Greg Wilkins
b52d7f09b0
418068 WebSocketClient has lazy or injected Executor
2013-09-26 18:06:55 +10:00
Greg Wilkins
643b6c3c77
removed ExecutorCallback
2013-09-26 18:06:10 +10:00
Joakim Erdfelt
948d97c60c
Fixing various javadoc errors
2013-09-25 10:08:39 -07:00
Joakim Erdfelt
ac40e7ab6a
Fixing various javadoc errors
2013-09-25 08:11:32 -07:00
Joakim Erdfelt
a50054c74b
Fixing typo in usage.txt
2013-09-24 11:53:23 -07:00
Joakim Erdfelt
edf0e4f707
Removing websocket.mod ini-template, as using the mod is the same as the ini-template
2013-09-24 09:02:04 -07:00
Joakim Erdfelt
937a91a0db
417938 - Startup / Sort properties presented in --list-config alphabetically
2013-09-24 09:00:30 -07:00
Joakim Erdfelt
a20b39e9ab
Fixing build error
2013-09-23 14:11:04 -07:00
Joakim Erdfelt
cd236bc016
417152 - WebSocket / Do all setup in websocket specific ServletContainerInitializer
...
+ Removed WebSocketConfiguration class entirely + annotation handlers
+ Renamed ServerAppliationConfigListener to
WebSocketServerContainerInitializer
+ Embedded jetty code that used to use:
WebSocketContainer.configureContext(context) now uses
WebSocketServerContainerInitializer.configureContext(context)
2013-09-23 13:30:14 -07:00
Joakim Erdfelt
cc9c19fd9d
Merge branch 'master' into jetty-9.1
2013-09-23 11:18:04 -07:00
Joakim Erdfelt
0e34cdf7d8
417831 - Remove jetty-logging.properties from distro/resources
2013-09-23 11:17:32 -07:00
Thomas Becker
2ef4a4fb1c
fix SimpleHTTPBenchmarkTest
2013-09-23 15:07:47 +02:00
Thomas Becker
bfb90523d6
SPDY remove unnecessary flush calls
2013-09-23 14:39:49 +02:00
Greg Wilkins
4708c907c1
417284 Precompiled regex in HttpField
2013-09-23 15:19:41 +10:00
Greg Wilkins
857d534d8d
417239 re-implemented Request.getContentRead()
2013-09-23 15:10:46 +10:00
Greg Wilkins
f2f8ec54c6
Merge remote-tracking branch 'origin/master' into jetty-9.1
...
Conflicts:
aggregates/jetty-all/pom.xml
examples/embedded/src/main/java/org/eclipse/jetty/embedded/MinimalServlets.java
examples/embedded/src/main/java/org/eclipse/jetty/embedded/SecuredHelloHandler.java
2013-09-23 13:38:43 +10:00
Greg Wilkins
d96df5d1c7
improved low resources messages
2013-09-23 13:30:09 +10:00