115 Commits

Author SHA1 Message Date
Greg Wilkins
8723408731 Merge remote-tracking branch 'origin/jetty-7' into jetty-8
Conflicts:
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
2012-11-02 13:17:53 +11:00
Greg Wilkins
65202e9abe 393363 Use Locale.ENGLISH for all toUpperCase and toLowerCase calls 2012-11-02 11:55:00 +11:00
Jesse McConnell
a8994178f5 [maven-release-plugin] prepare for next development iteration 2012-09-10 14:18:11 -05:00
Jesse McConnell
92180a9700 [maven-release-plugin] prepare release jetty-7.6.7.v20120910 2012-09-10 14:18:01 -05:00
Jesse McConnell
10e4027579 [maven-release-plugin] prepare for next development iteration 2012-09-10 13:59:34 -05:00
Jesse McConnell
57a6258f96 [maven-release-plugin] prepare release jetty-8.1.7.v20120910 2012-09-10 13:59:10 -05:00
Jesse McConnell
1ec8b2621b [maven-release-plugin] prepare release jetty-7.6.7.v20120910 2012-09-10 13:47:05 -05:00
Jesse McConnell
4180d7e1f5 prepare for release 2012-09-10 12:59:04 -05:00
Jesse McConnell
d37deeea74 [maven-release-plugin] prepare for next development iteration 2012-09-03 13:33:18 -05:00
Jesse McConnell
b418b0dd57 [maven-release-plugin] prepare for next development iteration 2012-09-03 13:33:16 -05:00
Jesse McConnell
41e9b1f6e2 [maven-release-plugin] prepare release jetty-7.6.6.v20120903 2012-09-03 13:33:10 -05:00
Jesse McConnell
6c0b0af2fe [maven-release-plugin] prepare release jetty-8.1.6.v20120903 2012-09-03 13:33:08 -05:00
Jesse McConnell
5de0cee1eb merge from master + license block standardization 2012-08-17 14:50:43 -05:00
Jesse McConnell
00ed549898 standardize license header blocks 2012-08-16 19:11:27 -05:00
Jan Bartel
c67b2d89c0 Merge remote-tracking branch 'origin/master' into jetty-8 2012-07-27 16:05:15 +10:00
Thomas Becker
37e0b8ffe4 spdy: StandardSession format toString method 2012-07-26 13:10:08 +02:00
Jesse McConnell
136514948f [maven-release-plugin] prepare for next development iteration 2012-07-16 13:24:49 -05:00
Jesse McConnell
1bbc677a09 [maven-release-plugin] prepare release jetty-8.1.5.v20120716 2012-07-16 13:24:42 -05:00
Jesse McConnell
f755d014cd [maven-release-plugin] prepare for next development iteration 2012-07-16 13:23:59 -05:00
Jesse McConnell
04b7e807a0 [maven-release-plugin] prepare release jetty-7.6.5.v20120716 2012-07-16 13:23:53 -05:00
Jesse McConnell
c00bb2d6ca reset for release 2012-07-16 12:55:22 -05:00
Jesse McConnell
f59b2a0632 reset release 2012-07-16 12:54:36 -05:00
Jesse McConnell
205e8f74f0 [maven-release-plugin] prepare for next development iteration 2012-07-13 10:20:48 -05:00
Jesse McConnell
c3b5269d60 [maven-release-plugin] prepare release jetty-8.1.5.v20120713 2012-07-13 10:20:23 -05:00
Jesse McConnell
12ecc10c6a [maven-release-plugin] prepare for next development iteration 2012-07-13 09:35:08 -05:00
Jesse McConnell
bf40110fb8 [maven-release-plugin] prepare release jetty-7.6.5.v20120713 2012-07-13 09:34:52 -05:00
Jesse McConnell
5222459aa7 Merge branch 'master' into jetty-8 2012-07-13 09:05:05 -05:00
Thomas Becker
198f713f7d spdy: spdy-proxy refactoring to allow multiple ProxyEngine implementations for different protocols. Header name fix to lowercase header names before creating the bytes to sent over the wire. 2012-07-13 11:53:56 +02:00
Jesse McConnell
81d72052c8 merged master to jetty-8 2012-07-11 14:04:49 -05:00
Jesse McConnell
aa941f5711 quick pass through to clean up missing or incorrect license blocks 2012-07-11 12:29:46 -05:00
Jesse McConnell
0fa17c13b1 Merge branch 'master' into jetty-8 2012-07-11 10:10:00 -05:00
Thomas Becker
ac7c3c8f0d spdy: move x-spdy-push header to internal request. fix StandardStream.toString() 2012-07-06 15:46:31 +02:00
Thomas Becker
091fd73c3e spdy: add StandardSession and StandardStream toString() improvements 2012-07-04 15:43:09 +02:00
Greg Wilkins
a519ecc1fb improved SPDY dump 2012-07-03 15:31:56 +02:00
Jesse McConnell
571b1da632 Merge branch 'master' into jetty-8 2012-06-14 15:46:59 -05:00
Simone Bordet
bb3fa1cd7a Added Session.getStream(int). 2012-06-12 00:31:00 +02:00
Simone Bordet
d786bca2e5 Made getSession() return ISession. 2012-06-12 00:30:39 +02:00
Simone Bordet
d54beaa750 Added attributes to Session. 2012-06-12 00:30:15 +02:00
Simone Bordet
457fdc74e5 Modified StandardStream to not depend on SynStreamFrame. 2012-06-11 14:32:14 +02:00
Simone Bordet
af836eb4b7 As per the Future contract, throw CancellationException if the Promise has been cancelled. 2012-06-11 14:23:53 +02:00
Simone Bordet
836c647fb8 Added utility method valuesAsString(). 2012-06-11 14:22:46 +02:00
Simone Bordet
4bb0a30839 Overridden allocate() to support direct buffers. 2012-06-11 14:21:03 +02:00
Simone Bordet
8894cdc31d Reviewed handling of the last stream id.
Now the last stream id is updated when a SYN is received, as the spec states.
2012-06-08 10:13:18 +02:00
Simone Bordet
7f39b8b7a4 Refactored atomic updates of max and min into utility class Atomics. 2012-06-08 09:59:36 +02:00
Jan Bartel
a7b1dd5e93 Merge remote-tracking branch 'origin/master' into jetty-8 2012-06-07 00:59:37 +02:00
Simone Bordet
20c0f23cc7 Improved exception logging. 2012-06-04 19:28:45 +02:00
Simone Bordet
f0c2fd2474 Improved error reporting in case of a write failure. 2012-06-04 19:28:45 +02:00
Jan Bartel
9149a69446 Merge remote-tracking branch 'origin/master' into jetty-8 2012-06-04 13:49:25 +02:00
Simone Bordet
c9251e5c73 Fixed bug in AbstractFrameBytes.compareTo(), avoiding NPE when comparing
FrameBytes that have a related stream, and those that don't (such as PING).
2012-06-03 22:53:06 +02:00
Simone Bordet
4b29f18703 Removed constructors that take the "compressed" parameter (compression has been removed from the specification).
Added constructor that takes byte[], offset and length.
2012-06-03 18:30:05 +02:00