Jan Bartel
|
c183c6fad5
|
Merge branch 'jetty-9.1' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9.1
|
2013-08-29 12:59:50 +10:00 |
|
Jan Bartel
|
280000e88a
|
Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
VERSION.txt
aggregates/jetty-all/pom.xml
examples/async-rest/async-rest-jar/pom.xml
examples/async-rest/async-rest-webapp/pom.xml
examples/async-rest/pom.xml
examples/embedded/pom.xml
examples/pom.xml
jetty-annotations/pom.xml
jetty-ant/pom.xml
jetty-client/pom.xml
jetty-continuation/pom.xml
jetty-deploy/pom.xml
jetty-distribution/pom.xml
jetty-http-spi/pom.xml
jetty-http/pom.xml
jetty-io/pom.xml
jetty-jaas/pom.xml
jetty-jaspi/pom.xml
jetty-jmx/pom.xml
jetty-jndi/pom.xml
jetty-jsp/pom.xml
jetty-jspc-maven-plugin/pom.xml
jetty-maven-plugin/pom.xml
jetty-monitor/pom.xml
jetty-nosql/pom.xml
jetty-osgi/jetty-osgi-boot-jsp/pom.xml
jetty-osgi/jetty-osgi-boot-warurl/pom.xml
jetty-osgi/jetty-osgi-boot/pom.xml
jetty-osgi/jetty-osgi-httpservice/pom.xml
jetty-osgi/jetty-osgi-npn/pom.xml
jetty-osgi/pom.xml
jetty-osgi/test-jetty-osgi-context/pom.xml
jetty-osgi/test-jetty-osgi-webapp/pom.xml
jetty-overlay-deployer/pom.xml
jetty-plus/pom.xml
jetty-proxy/pom.xml
jetty-rewrite/pom.xml
jetty-runner/pom.xml
jetty-security/pom.xml
jetty-server/pom.xml
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
jetty-servlet/pom.xml
jetty-servlets/pom.xml
jetty-spdy/pom.xml
jetty-spdy/spdy-client/pom.xml
jetty-spdy/spdy-core/pom.xml
jetty-spdy/spdy-example-webapp/pom.xml
jetty-spdy/spdy-http-server/pom.xml
jetty-spdy/spdy-server/pom.xml
jetty-spring/pom.xml
jetty-start/pom.xml
jetty-util-ajax/pom.xml
jetty-util/pom.xml
jetty-webapp/pom.xml
jetty-websocket/pom.xml
jetty-websocket/websocket-api/pom.xml
jetty-websocket/websocket-client/pom.xml
jetty-websocket/websocket-common/pom.xml
jetty-websocket/websocket-server/pom.xml
jetty-websocket/websocket-servlet/pom.xml
jetty-xml/pom.xml
pom.xml
tests/pom.xml
tests/test-continuation/pom.xml
tests/test-loginservice/pom.xml
tests/test-sessions/pom.xml
tests/test-sessions/test-hash-sessions/pom.xml
tests/test-sessions/test-jdbc-sessions/pom.xml
tests/test-sessions/test-sessions-common/pom.xml
tests/test-webapps/pom.xml
tests/test-webapps/test-jaas-webapp/pom.xml
tests/test-webapps/test-jetty-webapp/pom.xml
tests/test-webapps/test-jetty-webapp/src/main/config/demo/webapps/test.xml
tests/test-webapps/test-jndi-webapp/pom.xml
tests/test-webapps/test-mock-resources/pom.xml
tests/test-webapps/test-proxy-webapp/pom.xml
tests/test-webapps/test-servlet-spec/pom.xml
tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
tests/test-webapps/test-webapp-rfc2616/pom.xml
|
2013-08-29 12:59:32 +10:00 |
Greg Wilkins
|
d66778ad06
|
415826 start.jar module --enable and --disable
morphed mechanism into --initialize based templates
|
2013-08-28 09:30:03 +10:00 |
|
Greg Wilkins
|
d2ff475834
|
Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
jetty-util/src/main/java/org/eclipse/jetty/util/resource/FileResource.java
tests/test-webapps/test-jetty-webapp/src/main/config/webapps.demo/test.xml
|
2013-08-23 17:17:34 +10:00 |
|
Greg Wilkins
|
b33b5f2f5d
|
413684 deprecated unsafe alias checkers
|
2013-08-23 16:49:42 +10:00 |
|
Greg Wilkins
|
59540abeda
|
Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
jetty-util/src/main/java/org/eclipse/jetty/util/IteratingCallback.java
|
2013-08-22 22:58:58 +10:00 |
|
Greg Wilkins
|
c4583918a3
|
415330 Avoid multiple callbacks at EOF
|
2013-08-22 21:31:29 +10:00 |
|
Greg Wilkins
|
16191da3ac
|
reduced test times
|
2013-08-22 21:31:29 +10:00 |
|
Greg Wilkins
|
15f3a4e7c7
|
reduced test times
|
2013-08-22 18:17:50 +10:00 |
|
Jan Bartel
|
48ae7ec3f6
|
Merge remote-tracking branch 'origin/master' into jetty-9.1
|
2013-08-22 07:56:22 +10:00 |
David Harrigan
|
e351f04002
|
bug 415302
Patch to protect against null input's.
-=david=-
Signed-off-by: David Harrigan <dharrigan@gmail.com>
|
2013-08-22 07:47:10 +10:00 |
|
Greg Wilkins
|
669f26566f
|
Merge remote-tracking branch 'origin/master' into jetty-9.1
|
2013-08-16 11:44:30 +10:00 |
|
Greg Wilkins
|
2761abb658
|
415194 Deployer gives management of context to context collection
|
2013-08-16 11:40:23 +10:00 |
|
Greg Wilkins
|
484aa94cd0
|
415131 Avoid autoboxing on debug
|
2013-08-15 22:57:43 +10:00 |
Joakim Erdfelt
|
9da23cdba1
|
Fixing javadoc in jetty-util that JDK 1.7 complains about
|
2013-08-14 11:05:24 -07: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 |
|
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
|
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 |
|
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 |
|
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 |
|
Greg Wilkins
|
507cc074c6
|
Merge remote-tracking branch 'origin/servlet-3.1-api' into jetty-9.1
|
2013-06-21 13:04:54 +10:00 |