Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
7,378 Commits 72 Branches 465 Tags 369 MiB
Commit Graph

7378 Commits

Author SHA1 Message Date
Jesse McConnell c1082ad4d4 [maven-release-plugin] prepare release jetty-9.0.4.v20130621 2013-06-21 09:49:15 -05:00
Jesse McConnell b6df8a4978 set for release 2013-06-21 09:15:32 -05:00
Jesse McConnell 0ac65110d6 Merge branch 'master' into release-9 2013-06-21 08:48:07 -05:00
Thomas Becker 4ba9385ebc 411340 add comment why executeOnFillable defaults to true 2013-06-21 15:28:33 +02:00
Thomas Becker 918632d408 411340 SpdyConnection make executeOnFillable configurable and default to true 2013-06-21 14:45:16 +02:00
Thomas Becker b119bdfa24 fix typo in javadoc 2013-06-21 14:45:16 +02:00
Jan Bartel 4f6732a7e9 Use dependencyManagement to control servlet-api and jsp related jars; update to latest servlet-api and el jars post spec finalization. 2013-06-21 18:41:35 +10:00
Jan Bartel b006496198 Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-06-21 14:55:14 +10:00
Jan Bartel 8c580bd875 Fix spdy pom.xml 2013-06-21 14:54:35 +10:00
Jan Bartel f59ef8cfce Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-06-21 14:52:38 +10:00
Jan Bartel 8d7477218d Add profile for jdk1.7.0_25 2013-06-21 14:51:10 +10:00
Greg Wilkins f9b4636cdb Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-06-21 13:34:02 +10:00
Greg Wilkins 3cd59fe1b8 optimise out extra notify 2013-06-21 13:10:10 +10:00
Greg Wilkins 507cc074c6 Merge remote-tracking branch 'origin/servlet-3.1-api' into jetty-9.1 2013-06-21 13:04:54 +10:00
Greg Wilkins 3ded04813d Merge remote-tracking branch 'origin/master' into servlet-3.1-api 
Conflicts:
	jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/http/ServerHTTPSPDYTest.java
 2013-06-21 11:22:58 +10:00
Joakim Erdfelt 9959bbd946 JSR-356 - allow WebSocketContainer.connectToServer(Class<?>, URI) to work with classes that extend Endpoint (not just annotated classes) 2013-06-20 12:11:52 -07:00
Joakim Erdfelt feca821522 Using try-with-resources on test 2013-06-20 06:25:51 -07:00
Joakim Erdfelt 89b22d0c90 Adding timeouts on problematic tests to prevent CI abort 2013-06-19 20:53:23 -07:00
Greg Wilkins 60828fe8a3 javadoc and branchless hilo 2013-06-20 11:36:59 +10:00
Joakim Erdfelt 53278e5121 Removing erroneously added modules from commit eddb49941d 2013-06-19 17:56:11 -07:00
Joakim Erdfelt c3ded7579f Removing jetty-aggregate mistakenly brought in from jetty-8 merge 
+ jetty-9 has /aggregates/jetty-all instead
 2013-06-19 17:48:14 -07:00
Joakim Erdfelt 8b252ecd9f Updating dev version to 9.1.z 2013-06-19 17:17:14 -07:00
Greg Wilkins 0b804b3611 improved javadoc 2013-06-20 09:53:39 +10:00
Joakim Erdfelt 25a0639463 Updating version to 9.1 2013-06-19 15:26:53 -07:00
Joakim Erdfelt f8c457f75e Merge branch 'jetty-9.1' into javawebsocket-jsr 2013-06-19 15:07:15 -07:00
Simone Bordet 727cf815a2 Merged branch 'jetty-8' into 'master'. 2013-06-19 21:25:40 +02:00
Simone Bordet d7c5418718 Merged branch 'jetty-7' into 'jetty-8'. 2013-06-19 19:44:53 +02:00
Simone Bordet 0bca1974b7 411135 - HttpClient may send proxied https requests to the proxy instead of the target server. 
Made sure to always tunnel the connection if needs to be tunnelled.
 2013-06-19 19:43:49 +02:00
Thomas Becker 4085cfb602 411061 fix cookie handling in spdy. If two different HTTP headers with the same name are set, they should be translated to a single multiheader value according to: http://www.chromium.org/spdy/spdy-protocol/spdy-protocol-draft3#TOC-2.6.10-Name-Value-Header-Block. That applies for Set-Cookie headers for example. Before this changed duplicate header names have overwritten the previous one 2013-06-19 16:22:57 +02:00
Joakim Erdfelt bae9f3dc6a Bumping up to released javax.websocket artifacts 2013-06-18 13:11:45 -07:00
Joakim Erdfelt 931cfa10ce Merge branch 'master' into javawebsocket-jsr 
Conflicts:
	jetty-websocket/websocket-client/src/test/java/org/eclipse/jetty/websocket/client/TomcatServerQuirksTest.java
 2013-06-18 12:41:20 -07:00
Joakim Erdfelt 43867ff075 Reworking SSL tests 2013-06-18 08:37:16 -07:00
Thomas Becker ad458105f2 ReferrerPushStrategy fix javadoc 2013-06-18 17:34:20 +02:00
Joakim Erdfelt a6ef027232 Finish reverting change to ServletUpgradeRequest from websocket-ssl branch that was missed 2013-06-18 07:05:35 -07:00
Thomas Becker 117b086f26 PushStrategy.java remove newlines in javadoc 2013-06-18 16:00:59 +02:00
Simone Bordet f7c9d5424d 410995 - Avoid reverse DNS lookups when creating SSLEngines. 
Now using the host address, unless needClientAuth is true.
 2013-06-18 10:58:09 +02:00
Simone Bordet 9240039366 Refactored test so that's clear that host name verification happens on the client. 2013-06-18 10:54:15 +02:00
Greg Wilkins 0162b616b5 410911 Continuation isExpired handling. 
refactored Servlet3Continuation to hold list of listeners and to be an AsyncListener itself and process onTimeout
 2013-06-18 10:11:25 +10:00
Joakim Erdfelt be2cf578ce 400503 - WebSocket - squelch legitimate Exceptions during testing to avoid false positives 2013-06-17 16:34:21 -07:00
Jan Bartel 31082e1f8e Merge remote-tracking branch 'origin/master' into servlet-3.1-api 2013-06-18 08:37:49 +10:00
Joakim Erdfelt 2da8c9c306 Merge branch 'master' into javawebsocket-jsr 
Conflicts:
	jetty-spdy/spdy-http-server/src/test/java/org/eclipse/jetty/spdy/server/http/ReferrerPushStrategyTest.java
	jetty-util/src/main/java/org/eclipse/jetty/util/BufferUtil.java
	jetty-websocket/websocket-client/src/main/java/org/eclipse/jetty/websocket/client/io/UpgradeConnection.java
	jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/events/EventDriver.java
	jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/ServletWebSocketRequest.java
	jetty-websocket/websocket-server/src/main/java/org/eclipse/jetty/websocket/server/WebSocketServerFactory.java
	jetty-websocket/websocket-server/src/test/java/org/eclipse/jetty/websocket/server/WebSocketLoadRFC6455Test.java
 2013-06-17 10:54:10 -07:00
Joakim Erdfelt d3645ac28c Testing git setup 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2013-06-17 10:09:13 -07:00
Thomas Becker a05efd43d4 408904 Enhance CommandlineBuilder to not escape strings inside single quotes 2013-06-17 09:19:03 -07:00
Thomas Becker 00744e42fc 410341 suppress stacktraces that happen during test setup shutdown after successful test run 2013-06-17 09:19:03 -07:00
Thomas Becker 11760a7c83 @Ignore MaxConcurrentStreamsTest for now 2013-06-17 09:19:03 -07:00
Simone Bordet 593962c214 405188 - HTTP 1.0 with GET returns internal IP address. 
Introduced HostHeaderCustomizer.
 2013-06-17 09:19:03 -07:00
Simone Bordet 905090ff82 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-17 09:19:03 -07:00
Joakim Erdfelt 8624b2b3f4 Upgrading to jetty-test-helper 2.3 2013-06-17 09:19:02 -07:00
Thomas Becker 1efd637dec 409796 fix and cleanup ReferrerPushStrategy. There's more work to do here, so it remains @Ignore for now 2013-06-17 09:19:02 -07:00
Simone Bordet 261ff57e9f 410083 - Jetty clients submits incomplete URL to proxy. 
Made the request URI absolute in case the HttpClient is configured with a forward proxy.
 2013-06-17 09:19:02 -07:00