Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-02-23 07:37:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,400 Commits 55 Branches 466 Tags
Commit Graph

725 Commits

Author SHA1 Message Date
Greg Wilkins
97eec14651 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-03-11 12:47:10 +11:00
Greg Wilkins
59f8d375b9 402833 Test harness for global error page and hide exception message from reason string 2013-03-11 12:12:07 +11:00
Joakim Erdfelt
bbf44a5d32 Merge branch 'release-9' 2013-03-09 06:16:25 -07:00
Joakim Erdfelt
897c35c2cb [maven-release-plugin] prepare for next development iteration 2013-03-08 11:33:23 -07:00
Joakim Erdfelt
cc6196af50 [maven-release-plugin] prepare release jetty-9.0.0.v20130308 2013-03-08 11:33:15 -07:00
Joakim Erdfelt
7fc38f6c0f [maven-release-plugin] prepare for next development iteration 2013-03-07 19:14:19 -07:00
Joakim Erdfelt
96d045442f [maven-release-plugin] prepare release jetty-9.0.0.v20130307 2013-03-07 19:14:11 -07:00
Greg Wilkins
ae7248b6d2 Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
	jetty-server/src/main/java/org/eclipse/jetty/server/AsyncContinuation.java
	jetty-server/src/main/java/org/eclipse/jetty/server/Request.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/AbstractDoSFilterTest.java
 2013-03-08 11:21:05 +11:00
Greg Wilkins
face3b3584 392129 fixed handling of timeouts after startAsync 2013-03-08 09:35:08 +11:00
Jesse McConnell
778ee1411b [maven-release-plugin] prepare for next development iteration 2013-03-06 10:21:46 -06:00
Jesse McConnell
d916078711 [maven-release-plugin] prepare release jetty-9.0.0.v20130306 2013-03-06 10:21:38 -06:00
Greg Wilkins
c396622770 401495 removed unused getOutputStream 2013-03-04 17:38:00 +11:00
Greg Wilkins
41f7df18a6 402185 updated javascript mime-type 2013-03-04 16:52:49 +11:00
Simone Bordet
951d8c8472 Added @Name annotation to JMX-enabled operation. 2013-03-01 11:46:10 +01:00
Simone Bordet
a3400f0092 Fixed merge error. 2013-02-27 19:50:46 +01:00
Simone Bordet
849398d840 Merged branch 'jetty-8'. 2013-02-27 18:29:26 +01:00
Simone Bordet
9ec88ef1c9 Merged branch 'jetty-8'. 2013-02-27 18:23:40 +01:00
Simone Bordet
f28bd1d010 Merged branch jetty-7. 2013-02-27 17:30:22 +01:00
Simone Bordet
90bab0eb66 401908 - Enhance DosFilter to allow dynamic configuration of attributes. 2013-02-27 16:23:17 +01:00
Joakim Erdfelt
29b2118870 [maven-release-plugin] prepare for next development iteration 2013-02-26 09:20:45 -07:00
Joakim Erdfelt
2b82b54f6d [maven-release-plugin] prepare release jetty-9.0.0.RC2 2013-02-26 09:20:45 -07:00
Joakim Erdfelt
95f166b374 Merge branch 'jetty-7' into jetty-8 2013-02-21 17:34:19 -07:00
Jan Bartel
6a48749f0c Merge remote-tracking branch 'origin/jetty-7' into jetty-8 
Conflicts:
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
 2013-02-22 11:32:57 +11:00
Joakim Erdfelt
3d179bc418 Making testcase JDK 1.5 compatible 2013-02-21 17:23:17 -07:00
Greg Wilkins
bed3ea04f8 401382 Prevent parseAvailable from parsing next chunk when previous has not been consumed. Handle no content-type in chunked request. 2013-02-21 14:57:36 +11:00
Greg Wilkins
27cad4960b 401382 Prevent parseAvailable from parsing next chunk when previous has not been consumed 2013-02-21 12:43:18 +11:00
Greg Wilkins
28af8a1432 fixed merge 2013-02-15 16:12:39 +11:00
Greg Wilkins
71d70922da Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-io/src/main/java/org/eclipse/jetty/io/ByteArrayBuffer.java
	jetty-osgi/test-jetty-osgi-context/src/main/java/com/acme/osgi/Activator.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipFilterDefaultTest.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java
 2013-02-15 15:00:22 +11:00
Greg Wilkins
68f3319719 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-02-15 12:14:48 +11:00
Greg Wilkins
2581eb130a 381521 allow compress methods to be configured 2013-02-15 12:12:12 +11:00
Joakim Erdfelt
4dc3ed38c2 [maven-release-plugin] prepare for next development iteration 2013-02-05 10:00:36 -07:00
Joakim Erdfelt
ed24f78498 [maven-release-plugin] prepare release jetty-9.0.0.RC0 2013-02-05 10:00:36 -07:00
Jesse McConnell
e073ceb06d [maven-release-plugin] prepare for next development iteration 2013-02-05 10:00:36 -07:00
Jesse McConnell
2f2ad287af [maven-release-plugin] prepare release jetty-9.0.0.RC0 2013-02-05 10:00:35 -07:00
Jesse McConnell
5c58878c3c [maven-release-plugin] prepare for next development iteration 2013-01-31 11:34:38 -06:00
Jesse McConnell
ebbe37294f [maven-release-plugin] prepare release jetty-8.1.9.v20130131 2013-01-31 11:34:30 -06:00
Jesse McConnell
a5e1e04af1 [maven-release-plugin] prepare for next development iteration 2013-01-31 08:42:20 -06:00
Jesse McConnell
b7fb18fd65 [maven-release-plugin] prepare release jetty-7.6.9.v20130131 2013-01-31 08:42:12 -06:00
Greg Wilkins
ac7fbaf62b jetty-9 added ServerSentEvent support 2013-01-31 12:21:18 +11:00
Jesse McConnell
e26c60e073 Merge jetty-8 to master 2013-01-29 14:06:47 -06:00
Jesse McConnell
3b6cab63e2 Merge branch 'jetty-7' into jetty-8 2013-01-29 13:42:29 -06:00
Greg Wilkins
9b383c5780 381521 Only set Vary header when content could be compressed 2013-01-26 11:03:46 +11:00
Greg Wilkins
5435cd3365 385306 added getURI method 2013-01-25 13:52:32 +11:00
Greg Wilkins
7fd04a186f cleanup after merge 2013-01-25 11:47:47 +11:00
Greg Wilkins
ff350c3740 Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-client/src/main/java/org/eclipse/jetty/client/BlockingHttpConnection.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/gzip/AbstractCompressedStream.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java
 2013-01-25 11:46:03 +11:00
Greg Wilkins
fd25e3a742 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 
Conflicts:
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java
 2013-01-24 14:30:45 +11:00
Greg Wilkins
161a14d9d0 381521 Only set Vary header when content could be compressed 2013-01-24 14:07:25 +11:00
Greg Wilkins
dc4e525622 Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
 2013-01-21 17:04:22 +11:00
Greg Wilkins
aba64046cf Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-01-21 12:13:10 +11:00
Greg Wilkins
b36411d382 381521 Only set Vary header when content could be compressed 2013-01-21 12:09:46 +11:00