Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-02-24 00:17:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,454 Commits 55 Branches 466 Tags
Commit Graph

8454 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joakim Erdfelt
646b4c929b Fixing invalid javadoc 2013-10-10 07:31:56 -07: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
180d9a55df 418792 - Session getProtocolVersion always returns null 
+ Backporting just the getProtocolVersion from jetty 9.1
 2013-10-07 16:45:21 -07:00
Joakim Erdfelt
90b7a3fc23 Use servlet context temp directory from ${jetty.base}/work, not ${jetty.home}/work 2013-10-07 12:02:05 -07:00
Joakim Erdfelt
a1775c4415 Fixing javadoc 2013-10-07 11:59:04 -07:00
Joakim Erdfelt
9daf520994 Adding @Test(timeout=60000) to prevent build hang 2013-10-04 15:27:10 -07: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
Greg Wilkins
a0601be95a Merge remote-tracking branch 'origin/master' into jetty-9.1 
Conflicts:
	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ErrorPageTest.java
 2013-10-04 16:14:12 +10:00
Greg Wilkins
7cb553557e 418636 Name anonymous filter and holders with classname-hashcode 
Conflicts:
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java
 2013-10-04 16:12:53 +10:00
Greg Wilkins
52752ae142 418636 Name anonymous filter and holders with classname-hashcode 
Conflicts:
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java
	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ErrorPageTest.java
 2013-10-04 16:10:47 +10:00
Jan Bartel
d505350a9f 418596 Faults in JARs during class scanning should report the jar that caused the problem 2013-10-04 11:02:06 +10:00
Joakim Erdfelt
a0ddb2c5d7 418632 - WebSocket / Jsr annotated @OnMessage with InputStream fails to be called 
+ Fixed load order issue with binary vs text
+ Fixed decoder assignment for InputStream
+ Added unit tests to prevent regression of this feature
 2013-10-03 16:07:49 -07:00
Greg Wilkins
d535cb9c92 continuations is an optional module 2013-10-04 08:22:27 +10:00
Joakim Erdfelt
8d5013e15f 418625 - WebSocket / Jsr RemoteEndpoint.sendObject(java.nio.HeapByteBuffer) doesn't find encoder 
+ Adding fallback lookup using isAssignable(type) if basic map based
  lookup fails first.  Remembers successful isAssignable(type) match
  for future lookups via basic map approach.
 2013-10-03 14:05:04 -07:00
Joakim Erdfelt
1620b34a6e 418441 - Use of OPTIONS= in Jetty 9.1 should display WARNING message 2013-10-03 11:53:37 -07:00
Joakim Erdfelt
4a27f3bf4e Fixing javadoc error 2013-10-03 11:09:41 -07:00
Joakim Erdfelt
d2c3d7cf09 418603 - cannot specify a custom ServerEndpointConfig.Configurator 
+ Fixing bad assumption on annotations possibly being null
 2013-10-03 09:13:37 -07:00
Joakim Erdfelt
562cf009f0 Fixing javadoc 2013-10-03 09:13:37 -07:00
Greg Wilkins
2d53fe8744 cleaned up demo 2013-10-03 18:43:06 +10:00
Jan Bartel
8b305e208c 397049 Cannot Provide Custom Credential to JDBCLoginService 2013-10-03 16:21:34 +10: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
Jesse McConnell
6a3bed9dd0 [maven-release-plugin] prepare for next development iteration 2013-09-30 21:18:26 -05:00
Jesse McConnell
31585683cf [maven-release-plugin] prepare release jetty-9.1.0.RC0 jetty-9.1.0.RC0 2013-09-30 21:18:14 -05:00
Jesse McConnell
785fecb2bb set for release 2013-09-30 20:49:56 -05:00
Jesse McConnell
29aaba8631 Merge branch 'jetty-9.1' into release-9.1 2013-09-30 20:48:34 -05: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
Jesse McConnell
727c64a5e9 Merge branch 'jetty-9.1' into release-9.1 2013-09-30 18:19:56 -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
Jesse McConnell
856a24b65a [maven-release-plugin] prepare for next development iteration 2013-09-30 14:46:09 -05:00
Jesse McConnell
f466f03c6a [maven-release-plugin] prepare release jetty-9.0.6.v20130930 jetty-9.0.6.v20130930 2013-09-30 14:46:00 -05:00
Jesse McConnell
6ec630f044 set for release 2013-09-30 12:35:22 -05:00
Jesse McConnell
0b3f431d27 set version back to 9.0.6-SNAPSHOT 2013-09-30 12:33:06 -05:00
Jesse McConnell
af2e6ff911 Merge branch 'master' into release-9 2013-09-30 12:28:04 -05: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