1436 Commits

Author SHA1 Message Date
Joakim Erdfelt
9da23cdba1 Fixing javadoc in jetty-util that JDK 1.7 complains about 2013-08-14 11:05:24 -07:00
Jesse McConnell
4383c9042d [maven-release-plugin] prepare for next development iteration 2013-08-13 14:20:56 -05:00
Jesse McConnell
160d34ec23 [maven-release-plugin] prepare release jetty-9.0.5.v20130813 2013-08-13 14:20:47 -05:00
Simone Bordet
d3a93a0d68 Merged branch 'master' into 'jetty-9.1'. 2013-08-13 16:13:31 +02:00
Thomas Becker
75f87a289a 414951 QueuedThreadPool fix constructor that missed to pass the idleTimeout 2013-08-13 13:35:06 +02:00
Greg Wilkins
1e25778d57 Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
	jetty-server/src/test/java/org/eclipse/jetty/server/HttpServerTestBase.java
2013-08-13 00:44:39 +10:00
Greg Wilkins
43946c62e0 414449 Added HttpParser strict mode for case sensitivity 2013-08-12 23:02:08 +10:00
Jan Bartel
3eeb20f5bd Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-08-12 12:12:50 +10:00
Greg Wilkins
c48cb240a1 414763 Added org.eclipse.jetty.util.log.stderr.ESCAPE option 2013-08-12 11:42:09 +10:00
Greg Wilkins
e0382bc4ae 414740 Removed the parent peeking Loader 2013-08-09 17:53:43 +10:00
Greg Wilkins
34cfc3ed10 Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpFields.java
	jetty-http/src/test/java/org/eclipse/jetty/http/HttpFieldsTest.java
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
2013-08-09 13:50:49 +10:00
Greg Wilkins
a779425994 414101 Do not escape special characters in cookies 2013-08-09 12:42:52 +10:00
Joakim Erdfelt
8636c7da45 Merge branch 'master' into jetty-9.1
Conflicts:
	jetty-maven-plugin/pom.xml
	pom.xml
2013-08-05 09:53:48 -07:00
Joakim Erdfelt
74991f90d6 Cleanup from merge 2013-08-05 09:13:32 -07:00
Joakim Erdfelt
e2d872fcc7 Merge branch 'jetty-8'
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/RequestLogHandler.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
	jetty-spdy/spdy-client/pom.xml
	jetty-spdy/spdy-core/pom.xml
	jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStreamParser.java
	jetty-util/src/test/java/org/eclipse/jetty/util/MultiPartInputStreamTest.java
	pom.xml
	tests/test-integration/src/test/java/org/eclipse/jetty/test/monitor/JmxServiceTest.java
	tests/test-integration/src/test/java/org/eclipse/jetty/test/monitor/ProgramConfigTest.java
	tests/test-integration/src/test/java/org/eclipse/jetty/test/monitor/XmlConfigTest.java
2013-08-05 08:47:24 -07:00
Jan Bartel
432964cf5f Merge remote-tracking branch 'origin/jetty-7' into jetty-8
Conflicts:
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
2013-08-05 18:03:11 +10:00
Jan Bartel
f3f2bce36c 414393 StringIndexOutofBoundsException with > 8k multipart content without CR or LF 2013-08-05 17:18:44 +10:00
Jesse McConnell
20bd1e0f96 [maven-release-plugin] prepare for next development iteration 2013-07-26 11:50:17 -05:00
Jesse McConnell
49c3b2c32a [maven-release-plugin] prepare release jetty-8.1.12.v20130726 2013-07-26 11:49:58 -05:00
Jesse McConnell
6ed360c480 reset for release 2013-07-26 11:23:57 -05:00
Jesse McConnell
1a5117e9ab [maven-release-plugin] prepare release jetty-8.1.12.v20130726 2013-07-26 11:18:24 -05:00
Jesse McConnell
650e8e93ae [maven-release-plugin] prepare for next development iteration 2013-07-26 10:57:33 -05:00
Jesse McConnell
e7e2fce56e [maven-release-plugin] prepare release jetty-7.6.12.v20130726 2013-07-26 10:57:26 -05:00
Jesse McConnell
d87a3884ad Merge branch 'jetty-8' into release-8 2013-07-26 10:38:24 -05:00
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
de2840ca1e [maven-release-plugin] prepare for next development iteration 2013-07-25 12:52:15 -05:00
Jesse McConnell
3e94867f7f [maven-release-plugin] prepare release jetty-8.1.12.v20130725 2013-07-25 12:52:07 -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
e0ad2c4ee1 [maven-release-plugin] prepare for next development iteration 2013-07-25 07:52:39 -05:00
Jesse McConnell
99712058ca [maven-release-plugin] prepare release jetty-8.1.11.v20130725 2013-07-25 07:52:32 -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