Commit Graph

6382 Commits

Author SHA1 Message Date
Greg Wilkins dc4e525622 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
2013-01-21 17:04:22 +11:00
Jan Bartel fe48239b34 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-01-21 16:54:06 +11:00
Jan Bartel 91a94f8213 362226 HttpConnection "wait" call causes thread resource exhaustion 2013-01-21 16:43:57 +11:00
Greg Wilkins aba64046cf Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-01-21 12:13:10 +11:00
Greg Wilkins b36411d382 381521 Only set Vary header when content could be compressed 2013-01-21 12:09:46 +11:00
Jesse McConnell f244dee08c Merge branch 'release-9' 2013-01-20 11:03:52 -06:00
Jesse McConnell fcdc53f883 prep for dev 2013-01-20 11:03:31 -06:00
Jesse McConnell 94feb0d651 [maven-release-plugin] prepare for next development iteration 2013-01-19 19:54:23 -06:00
Jesse McConnell 4da026bca5 [maven-release-plugin] prepare release jetty-9.0.0.M5 2013-01-19 19:54:13 -06:00
Jesse McConnell 5d394859c5 set for release 2013-01-19 19:06:19 -06:00
Jesse McConnell f49017cd8e Merge branch 'master' into release-9 2013-01-19 19:04:50 -06:00
Jan Bartel 360615c51a 398582 Move lib/jta jar into lib/jndi 2013-01-20 11:07:01 +11:00
Jesse McConnell 3cd7c09347 [maven-release-plugin] prepare for next development iteration 2013-01-18 12:13:38 -06:00
Jesse McConnell d24ab1f133 [maven-release-plugin] prepare release jetty-9.0.0.M5 2013-01-18 12:13:29 -06:00
Jesse McConnell 38319f4cb6 set for release 2013-01-18 10:49:25 -06:00
Jesse McConnell 40111d9474 Merge branch 'master' into release-9 2013-01-18 10:46:52 -06:00
Joakim Erdfelt 2e216dddb7 Consolidating WebSocketPolicy.setMax*Size() into single setMaxMessageSize() 2013-01-18 09:27:56 -07:00
Thomas Becker 99c34d5227 398280: SslContextFactory _trustAll defaults to false now 2013-01-18 14:07:24 +01:00
Simone Bordet 1ca0f004c3 Updated signature of setConnectTimeout(int) to setConnectTimeout(long)
to comply with field type and getter type.
Removed check that was throwing an exception if connect timeout was set
after start.
2013-01-18 10:35:20 +01:00
Jan Bartel 0c3ff5be4a Improve --help output for jetty-runner 2013-01-18 14:44:33 +11:00
Joakim Erdfelt a36e31277a Updating javadoc external site references for the new snoracle reality 2013-01-17 16:40:16 -07:00
Joakim Erdfelt b938245b14 Adding some javadoc, cleaning up package namespaces where appropriate 2013-01-17 15:41:33 -07: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 b3f6739d51 Completed the implementation of DeferredContentProvider.
DeferredContentProvider is used to provide content after
Request.send(...) is called, a use case that is useful
in SPDY-to-HTTP proxies, where content arrives in SPDY
data frames at later times than the headers.
2013-01-17 12:53:39 +01:00
Simone Bordet 386fafe790 Avoid copying sensitive headers when copying a Request. 2013-01-17 12:53:39 +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
Thomas Becker 8c3edce565 use existing keystore 2013-01-17 12:51:07 +01:00
Thomas Becker c8f4332c34 add missing keystore 2013-01-17 12:39:46 +01:00
Thomas Becker 9ebea3938d 393385: Make hostname verification configurable in SslContextFactory and enable it by default (See http://www.ietf.org/rfc/rfc2818.txt section 3.1) 2013-01-17 10:28:15 +01:00
Greg Wilkins 46e13b305b Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-util/src/test/java/org/eclipse/jetty/util/URLEncodedTest.java
2013-01-17 11:00:20 +11:00
Greg Wilkins 9cf08249e0 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-01-17 09:16:40 +11:00
Joakim Erdfelt e0b3c1b926 Making sure cookies are set 2013-01-16 15:11:57 -07:00
Joakim Erdfelt 4660f35210 393733 - WebSocketClient interface should support multiple connections
+ Removing deprecated methods from Session
+ Fixing client side UpgradeConnection to handle extension via new
  ExtensionStack object
+ Making ExtensionStack.getNegotiatedExtensions() return
  List<ExtensionConfig> instead of List<String>
+ Fixing tests that relied on changes
2013-01-16 15:11:57 -07:00
Joakim Erdfelt c631d9b461 Removing noisy logging/debugging 2013-01-16 15:11:57 -07:00
Joakim Erdfelt 1dfee4c992 393733 - WebSocketClient interface should support multiple connections
+ Reworking Connection Timeout handling
2013-01-16 15:11:57 -07:00
Joakim Erdfelt f20f0481b4 93733 - WebSocketClient interface should support multiple connections
+ Cleaning up no longer used items in WebSocketClient
+ Adding back Connect Timeout handling (unreliable atm)
+ Making ConnectPromise a FuturePromise with Runnable, no longer need
  FutureTask
+ Making sure Session is properly opened
+ Removing need for EventDriver.awaitActiveSession()
2013-01-16 15:11:57 -07:00
Joakim Erdfelt acaa2aa4de 393733 - WebSocketClient interface should support multiple connections
* Initial pass at merging functions of WebSocketClientFactory into
  WebSocketClient itself, eliminating the need for the factory.
* Introducing ConnectPromise to separate the connect future from
  the client itself, hopefully allowing for multiple connections
  from the client instance.
2013-01-16 15:11:56 -07:00
Joakim Erdfelt eff1262e49 398105 - Clean up WebSocketPolicy 2013-01-16 15:11:56 -07:00
Greg Wilkins 747eeb87c1 398337 UTF-16 percent encoding in UTF-16 form content 2013-01-17 09:04:04 +11:00
Jan Bartel 0e617a091a Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2013-01-15 20:37:11 +11: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
Greg Wilkins 43f14e8ee9 jetty-9 fixed multiple Trie full attempts 2013-01-15 20:33:47 +11:00
Greg Wilkins c4e77feefa unit test uses fake JSP 2013-01-15 15:53:54 +11:00
Jan Bartel 0681168eed Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-01-15 14:47:53 +11:00
Jan Bartel 98146f2ca2 396500 HttpClient Exchange takes forever to complete when less content sent than Content-Length 2013-01-15 14:17:41 +11:00
Greg Wilkins bc36eff330 jetty-9 fixed null value handling 2013-01-14 18:12:14 +11:00
Greg Wilkins 3a52ceca50 jetty-9 fixed year in header 2013-01-14 18:04:18 +11:00
Greg Wilkins 2d7b96bab1 jetty-9 added Ternary Trie impl for connection field cache 2013-01-14 17:36:03 +11:00
Jan Bartel 284d950eee Update date on copyright header for ServletHandlerTest class 2013-01-14 13:47:07 +11:00