Commit Graph

1158 Commits

Author SHA1 Message Date
Simone Bordet 2eb3925358 Merged branch 'master' into 'jetty-9.1'. 2013-07-26 14:18:10 +02:00
Simone Bordet bc096cace4 Moved new JSON classes to the right module. 2013-07-26 14:17:42 +02:00
Simone Bordet 9d571af7b0 Merged branch 'master' into 'jetty-9.1'. 2013-07-26 13:55:05 +02:00
Simone Bordet cea4ac5fe3 Merged branch 'jetty-8' into 'master'. 2013-07-26 13:51:26 +02:00
Simone Bordet b7b3ced092 Merged branch 'jetty-7' into 'jetty-8'. 2013-07-26 13:46:08 +02:00
Simone Bordet 5c7eb9e265 Reverted version to 7.6.12-SNAPSHOT. 2013-07-26 13:36:35 +02:00
Simone Bordet a0519a9693 413371 - Default JSON.Converters for List and Set.
Introduced a JSONCollectionConvertor that is able to convert
Collections, and hence both List and Set.

Code cleanups.
2013-07-26 13:09:11 +02:00
Greg Wilkins 4a5567433c 413372 JSON Enum uses name rather than toString() 2013-07-26 16:06:32 +10:00
Jesse McConnell 49045558ef [maven-release-plugin] prepare for next development iteration 2013-07-25 14:07:12 -05:00
Jesse McConnell 9b888d5c22 [maven-release-plugin] prepare release jetty-7.6.12.v20130725 2013-07-25 14:06:53 -05:00
Jesse McConnell bc679809f8 [maven-release-plugin] prepare for next development iteration 2013-07-25 11:25:58 -05:00
Jesse McConnell 39ec9b8051 [maven-release-plugin] prepare release jetty-7.6.12.v20130725 2013-07-25 11:25:51 -05:00
Jesse McConnell 767dbe6778 [maven-release-plugin] prepare for next development iteration 2013-07-25 07:48:09 -05:00
Jesse McConnell cfa6076c4f [maven-release-plugin] prepare release jetty-7.6.11.v20130725 2013-07-25 07:48:02 -05:00
Greg Wilkins b8f7637e7d Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-07-22 23:32:04 +10:00
Greg Wilkins 8f190476b7 413393 better logging of bad URLs in Resources 2013-07-22 23:30:43 +10:00
Greg Wilkins e4ef8ee1f4 413154 ContextHandlerCollection defers virtual host handling to ContextHandler 2013-07-22 22:10:13 +10:00
Greg Wilkins 8645849272 398467 Servlet 3.1 Non Blocking IO
Added ByteBuffer write and improved test harnesses
2013-07-18 12:53:07 +10:00
Greg Wilkins e758e0111b 412940 minor threadsafe fixes
hold lock for accessing elements size
2013-07-15 17:00:51 +10:00
Greg Wilkins 8d49f69aa4 412940 minor threadsafe fixes 2013-07-15 16:47:05 +10:00
Greg Wilkins 5d3760b17d simplified HttpInput lock design 2013-07-15 15:54:25 +10:00
Jan Bartel bd2add0ae9 Update to post-release (servlet 3.1/javaee) versions of javaee dependencies. WARNING: jetty-schemas from jetty-toolchain needs to be changed from SNAPSHOT to final release. 2013-07-12 13:53:58 +10:00
Greg Wilkins 981102fda5 398467 Servlet 3.1 Non Blocking IO
Asynchronous reads working.
2013-07-05 18:11:09 +10:00
Greg Wilkins 965918d8f2 Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-07-04 17:28:57 +10:00
Jan Bartel 091a419568 411755 MultiPartInputStreamParser fails on base64 encoded content 2013-07-04 11:11:44 +10:00
Jan Bartel 1762ab7de5 Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	jetty-util/src/main/java/org/eclipse/jetty/util/B64Code.java
	jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStreamParser.java
	jetty-util/src/test/java/org/eclipse/jetty/util/MultiPartInputStreamTest.java
2013-07-04 10:58:28 +10:00
Jan Bartel c934bbe45c 411755 MultiPartInputStreamParser fails on base64 encoded content 2013-07-04 10:22:22 +10:00
Greg Wilkins 32ec8255db 411538 Use Replacement character for bad parameter % encodings 2013-06-27 10:19:51 +10:00
Joakim Erdfelt 78b5f7df1f [maven-release-plugin] prepare for next development iteration 2013-06-25 08:29:26 -07:00
Joakim Erdfelt 5f2c937fcb [maven-release-plugin] prepare release jetty-9.0.4.v20130625 2013-06-25 08:29:18 -07:00
Joakim Erdfelt 31faf2fe20 Reverting failed release from friday 2013-06-25 07:42:45 -07: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 2013-06-21 09:49:15 -05: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
Greg Wilkins 60828fe8a3 javadoc and branchless hilo 2013-06-20 11:36:59 +10:00
Joakim Erdfelt 8b252ecd9f Updating dev version to 9.1.z 2013-06-19 17:17:14 -07:00
Joakim Erdfelt f8c457f75e Merge branch 'jetty-9.1' into javawebsocket-jsr 2013-06-19 15:07:15 -07: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
Greg Wilkins 4e4ffaa54c Merge remote-tracking branch 'origin/master' into servlet-3.1-api
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
2013-06-17 16:29:39 +10:00
Greg Wilkins 3ddb1d9727 Merge branch 'servlet-3.1-api' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into servlet-3.1-api 2013-06-17 11:25:45 +10:00
Greg Wilkins 969b90edeb extra test zip 2013-06-17 11:25:19 +10:00
Jesse McConnell 6c44b290a9 Add constructer fo fix broken test (suspect someone hasn't pushed) 2013-06-14 14:00:41 -05:00
Jesse McConnell eddb49941d [Bug 408600] set correct jetty.url in all pom files 2013-06-12 15:52:36 -05:00
Joakim Erdfelt 9d89bc564e Adding StacklessLogging try-with-resources compatible convenience class 2013-06-12 11:04:00 -07:00
Greg Wilkins 955e7e8d74 410559 Removed FillInterest race 2013-06-12 18:35:13 +10:00
Thomas Becker c5bf9c3d49 Increase buffer size of BufferUtil.writeTo to 4k 2013-06-12 08:43:25 +02:00
Greg Wilkins d2794584e1 Merge remote-tracking branch 'origin/master' into servlet-3.1-api
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
	jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
2013-06-07 15:48:22 +10:00
Thomas Becker d3b96328f9 409953 More efficient implementation of BufferUtil.writeTo(...) 2013-06-06 12:59:18 +02:00
Thomas Becker 4a10f4296c 409953 More efficient implementation of BufferUtil.writeTo(...) 2013-06-06 11:39:22 +02:00