7455 Commits

Author SHA1 Message Date
Joakim Erdfelt
40fea41d4f 411545 - SslConnection.DecryptedEndpoint.fill() sometimes misses a few network bytes
+ Adding continuation in this rare SSL case to allow the remaining bytes
  to be read properly.
2013-06-24 14:57:48 -07:00
Thomas Becker
c3c9d927b4 410498 ignore type of exception in GoAwayTest.testDataNotProcessedAfterGoAway 2013-06-24 16:20:22 +02:00
Jan Bartel
26b4db5c7d Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2013-06-24 17:29:03 +10:00
Jan Bartel
7ce05f2c49 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
	test-jetty-servlet/src/main/java/org/eclipse/jetty/testing/HttpTester.java
2013-06-24 17:28:34 +10:00
Greg Wilkins
4d0a796f72 405424 X-Powered-By header 2013-06-24 17:09:44 +10:00
Jan Bartel
a7436bc774 Merge remote-tracking branch 'origin/jetty-7' into jetty-8
Conflicts:
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
2013-06-24 16:44:45 +10:00
Jan Bartel
0daddd1a3a 411458 MultiPartFilter getParameterMap doesn't preserve multivalued parameters
411459  MultiPartFilter.Wrapper getParameter should use charset encoding of part
2013-06-24 16:20:04 +10:00
Greg Wilkins
068e67a8df Code cleanups for direct RequestDispatcher access 2013-06-24 13:13:03 +10:00
Greg Wilkins
b2b2ce25fc Revert "Code cleanups for direct RequestDispatcher access"
This reverts commit 1ff665f76ac38faaa8831191b6b4be89fc1b2acf.
2013-06-24 13:11:04 +10:00
Greg Wilkins
1ff665f76a Code cleanups for direct RequestDispatcher access 2013-06-24 13:00:21 +10:00
Jesse McConnell
298b46a96f set for re-reelease 2013-06-21 15:35:58 -05:00
Jesse McConnell
8927c18840 reset versions for release 2013-06-21 15:28:26 -05:00
Jesse McConnell
bc5f2da148 set Version for re-release 2013-06-21 15:23:22 -05:00
Jesse McConnell
018a51a04e Merge branch 'master' into release-9 2013-06-21 15:18:46 -05:00
Joakim Erdfelt
ebe98022ab Making autobahn server disconnect happy 2013-06-21 12:46:10 -07:00
Joakim Erdfelt
73fd838b41 Addressing WebSocket server side disconnect issue that autobahn found 2013-06-21 12:10:06 -07:00
Jesse McConnell
4db892d6b3 update links on root context of distro 2013-06-21 11:29:02 -05:00
Jesse McConnell
57bfda2a08 [maven-release-plugin] prepare for next development iteration 2013-06-21 09:49:25 -05:00
Jesse McConnell
c1082ad4d4 [maven-release-plugin] prepare release jetty-9.0.4.v20130621 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
8c580bd875 Fix spdy pom.xml 2013-06-21 14:54:35 +10:00
Jan Bartel
8d7477218d Add profile for jdk1.7.0_25 2013-06-21 14:51:10 +10:00
Greg Wilkins
3cd59fe1b8 optimise out extra notify 2013-06-21 13:10:10 +10: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 eddb49941de7c1b28c6e1098ee18d8250a5d8908 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
Greg Wilkins
0b804b3611 improved javadoc 2013-06-20 09:53:39 +10: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
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
Joakim Erdfelt
d3645ac28c Testing git setup
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2013-06-17 10:09:13 -07:00
Jan Bartel
0e4fbcb1ca 410693 ServletContextHandler.setHandler does not relink handlers - check for null 2013-06-17 20:37:06 +10:00
Jan Bartel
6b9742ff86 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2013-06-17 16:54:47 +10:00
Jan Bartel
d47eb462e7 410693 ServletContextHandler.setHandler does not relink handlers 2013-06-17 16:53:22 +10:00
Greg Wilkins
6ed36160f0 410893 async support defaults to false for spec created servlets and filters
fixed up continuations for differen isAsyncStarted behaviour
2013-06-17 16:03:41 +10:00
Greg Wilkins
d6d5c04273 410893 async support defaults to false for spec created servlets and filters 2013-06-17 14:47:55 +10:00
Greg Wilkins
65a7f9f279 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/FilterHolder.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
2013-06-17 14:46:10 +10:00