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

1157 Commits

Author SHA1 Message Date
Greg Wilkins
b3e1114313 Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	VERSION.txt
	jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/WebBundleTrackerCustomizer.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
	jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStreamParser.java
	jetty-util/src/main/java/org/eclipse/jetty/util/TypeUtil.java
	jetty-util/src/test/java/org/eclipse/jetty/util/MultiPartInputStreamTest.java
	jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java
 2012-11-30 12:04:00 +11:00
Greg Wilkins
d269015c7d Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2012-11-30 09:09:22 +11:00
Greg Wilkins
cfa1c1e2e4 395394 allow logging from boot classloader 2012-11-30 07:56:38 +11:00
Joakim Erdfelt
62ebbbac3c Making test more reliable on non-US machines 2012-11-29 10:23:20 -07:00
Joakim Erdfelt
916097f787 Validating that URIUtil.decodePath() can handle null characters 2012-11-29 10:20:41 -07:00
Jan Bartel
2d97e5b0ca Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2012-11-29 17:18:51 +11:00
Jan Bartel
2723c415bf 395215 Multipart mime with just LF and no CRLF 2012-11-29 16:48:21 +11:00
Jan Bartel
9f5801c3fd 395215 Multipart mime with just LF and no CRLF 2012-11-29 15:57:16 +11:00
Greg Wilkins
d78ec063ee 395220 New InputStream extension to allow a mix of EOL styles between headers and content 2012-11-29 13:40:25 +11:00
Greg Wilkins
249068551f 395220 New InputStream extension to allow a mix of EOL styles between headers and content 2012-11-29 13:29:24 +11:00
Simone Bordet
ee893d8526 Corrected changes introduced with Promise. 
Save creation of iterators for every append() and prepend() in StandardSession.
Removed PromisingCallback, only used by SPDY and better implemented otherwise.
 2012-11-23 13:16:32 +01:00
Jan Bartel
ba8057867e Merge remote-tracking branch 'origin/jetty-8' 2012-11-23 15:04:20 +11:00
Jan Bartel
8241089364 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2012-11-23 14:45:34 +11:00
Jan Bartel
769260f251 392417 Prevent Cookie parsing interpreting unicode chars 2012-11-23 12:29:53 +11:00
Greg Wilkins
9edac367c8 394854 optimised promise implementation 2012-11-23 12:18:52 +11:00
Greg Wilkins
7737dc8c76 394854 Implemented Promise 2012-11-23 12:18:51 +11:00
Jan Bartel
4befd6395b Merge remote-tracking branch 'origin/jetty-8' 2012-11-22 12:08:42 +11:00
Jan Bartel
4cf77cea31 394839 Allow multipart mime with no boundary 2012-11-22 09:55:12 +11:00
Thomas Becker
1dc3fcaf9b 394671 Fix setting loglevel on commandline, organize import, fix javadoc 2012-11-20 17:56:37 +01:00
Simone Bordet
a5df0ab456 Updated jetty-spring module. 2012-11-20 17:42:45 +01:00
Thomas Becker
9044819085 394671: Fix setting loglevel on commandline via -Dorg.eclipse.jetty.LEVEL=DEBUG 2012-11-20 16:21:42 +01:00
Greg Wilkins
b5c6555a4a 392237 Improved handling of SPDY async send 2012-11-16 10:45:08 +11:00
Jan Bartel
6aa01d4517 394357 Make JarResource constructors protected 2012-11-15 17:20:55 +11:00
Simone Bordet
c07bab8a05 394215 - Scheduled tasks throwing exceptions kill java.util.Timer thread. 
Wrapping the the task run() method into a try/catch to avoid that the Timer thread dies.
 2012-11-13 19:32:10 +01:00
Simone Bordet
ba40f7897d Completed port of ConnectHandler and ProxyServlet implementations. 2012-11-13 15:35:51 +01:00
Simone Bordet
9abc3988fb B64 coding and decoding now throws the unchecked UnsupportedCharsetException 
rather than the checked UnsupportedEncodingException.
 2012-11-13 11:29:54 +01:00
Greg Wilkins
8ff291d223 Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpContent.java
	jetty-overlay-deployer/src/main/java/org/eclipse/jetty/overlays/OverlayedAppProvider.java
	jetty-overlay-deployer/src/main/java/org/eclipse/jetty/overlays/TemplateContext.java
	jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
	jetty-server/src/main/java/org/eclipse/jetty/server/ResourceCache.java
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java
	jetty-server/src/test/java/org/eclipse/jetty/server/ResourceCacheTest.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/DefaultServlet.java
	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DefaultServletTest.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/main/java/org/eclipse/jetty/servlets/gzip/CompressedResponseWrapper.java
 2012-11-12 12:30:26 +11:00
Greg Wilkins
3d3b035b22 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 
Conflicts:
	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/DefaultServletTest.java
 2012-11-12 09:08:53 +11:00
Greg Wilkins
0f60eb751d 393947 additional tests 2012-11-11 10:25:10 +11:00
Greg Wilkins
75aedbbf45 393947 implement ETags and update gzip filter to handle them 2012-11-11 09:52:26 +11:00
Jan Bartel
8e47864bcf 392850 ContextLoaderListener not called in 9.0.0.M1 and M2 2012-11-08 14:02:35 +11:00
Jan Bartel
6b04056371 Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	VERSION.txt
	example-async-rest/async-rest-jar/pom.xml
	example-async-rest/async-rest-webapp/pom.xml
	example-async-rest/pom.xml
	example-jetty-embedded/pom.xml
	jetty-aggregate/jetty-all-server/pom.xml
	jetty-aggregate/jetty-all/pom.xml
	jetty-aggregate/jetty-client/pom.xml
	jetty-aggregate/jetty-plus/pom.xml
	jetty-aggregate/jetty-server/pom.xml
	jetty-aggregate/jetty-servlet/pom.xml
	jetty-aggregate/jetty-webapp/pom.xml
	jetty-aggregate/jetty-websocket/pom.xml
	jetty-aggregate/pom.xml
	jetty-ajp/pom.xml
	jetty-annotations/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-jaspi/pom.xml
	jetty-jmx/pom.xml
	jetty-jndi/pom.xml
	jetty-jsp/pom.xml
	jetty-monitor/pom.xml
	jetty-nested/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/pom.xml
	jetty-osgi/test-jetty-osgi-context/pom.xml
	jetty-osgi/test-jetty-osgi-webapp/pom.xml
	jetty-osgi/test-jetty-osgi/pom.xml
	jetty-overlay-deployer/pom.xml
	jetty-plus/pom.xml
	jetty-policy/pom.xml
	jetty-rewrite/pom.xml
	jetty-security/pom.xml
	jetty-server/pom.xml
	jetty-servlet/pom.xml
	jetty-servlets/pom.xml
	jetty-spdy/pom.xml
	jetty-spdy/spdy-core/pom.xml
	jetty-spdy/spdy-jetty-http-webapp/pom.xml
	jetty-spdy/spdy-jetty-http/pom.xml
	jetty-spdy/spdy-jetty/pom.xml
	jetty-start/pom.xml
	jetty-util/pom.xml
	jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStream.java
	jetty-webapp/pom.xml
	jetty-websocket/pom.xml
	jetty-xml/pom.xml
	pom.xml
	test-continuation/pom.xml
	test-jetty-nested/pom.xml
	test-jetty-servlet/pom.xml
	test-jetty-webapp/pom.xml
	tests/pom.xml
	tests/test-integration/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-mongodb-sessions/pom.xml
	tests/test-sessions/test-sessions-common/pom.xml
	tests/test-webapps/pom.xml
	tests/test-webapps/test-webapp-rfc2616/pom.xml
 2012-11-06 16:12:00 +11:00
Jesse McConnell
bb27f561c1 [maven-release-plugin] prepare for next development iteration 2012-11-05 12:24:06 -06:00
Jesse McConnell
1d767e99a3 [maven-release-plugin] prepare release jetty-8.1.8.v20121105 2012-11-05 12:23:59 -06:00
Jesse McConnell
70d591c430 [maven-release-plugin] prepare for next development iteration 2012-11-05 12:16:03 -06:00
Jesse McConnell
017826b4eb [maven-release-plugin] prepare release jetty-7.6.8.v20121105 2012-11-05 12:15:57 -06:00
Jesse McConnell
55de6fc6e4 add import for Locale 2012-11-05 11:31:11 -06:00
Jan Bartel
0c84eefdcc Rename AggregateLifeCycle to ContainerLifeCycle in javadoc 2012-11-05 12:16:39 +11:00
Greg Wilkins
52464a5ba6 Merge remote-tracking branch 'origin/jetty-8' 
Conflicts:
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ResourceAnnotationHandler.java
	jetty-client/src/test/java/org/eclipse/jetty/client/SslHttpExchangeTest.java
	jetty-client/src/test/java/org/eclipse/jetty/client/SslSecurityListenerTest.java
	jetty-deploy/src/main/java/org/eclipse/jetty/deploy/WebAppDeployer.java
	jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/ContextProvider.java
	jetty-http/src/main/resources/org/eclipse/jetty/http/mime.properties
	jetty-http/src/test/java/org/eclipse/jetty/http/HttpFieldsTest.java
	jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java
	jetty-jmx/src/main/java/org/eclipse/jetty/jmx/MBeanContainer.java
	jetty-jmx/src/main/java/org/eclipse/jetty/jmx/ObjectMBean.java
	jetty-overlay-deployer/src/main/java/org/eclipse/jetty/overlays/OverlayedAppProvider.java
	jetty-plus/src/main/java/org/eclipse/jetty/plus/annotation/Injection.java
	jetty-plus/src/main/java/org/eclipse/jetty/plus/security/DataSourceLoginService.java
	jetty-proxy/src/main/java/org/eclipse/jetty/proxy/ProxyServlet.java
	jetty-rewrite/src/main/java/org/eclipse/jetty/rewrite/handler/ProxyRule.java
	jetty-security/src/main/java/org/eclipse/jetty/security/authentication/FormAuthenticator.java
	jetty-server/src/main/java/org/eclipse/jetty/server/session/JDBCSessionIdManager.java
	jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/proxy/ProxyHTTPSPDYConnection.java
	jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/ServerHTTPSPDYAsyncConnection.java
	jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
	jetty-util/src/main/java/org/eclipse/jetty/util/Fields.java
	jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketClientFactory.java
	jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketConnectionRFC6455.java
	jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketClientTest.java
	jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketMessageRFC6455Test.java
	test-jetty-nested/src/main/java/org/eclipse/jetty/nested/Dump.java
	test-jetty-webapp/src/main/java/com/acme/Dump.java
 2012-11-02 14:08:05 +11:00
Greg Wilkins
e076e8a8f0 393363 Use Locale.ENGLISH for all toUpperCase and toLowerCase calls 2012-11-02 13:19:07 +11:00
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
Joakim Erdfelt
61c607076a Mux interrim work. 2012-10-30 16:17:03 -07:00
Simone Bordet
61ba84bda5 Added toString(). 2012-10-26 14:57:06 +02:00
Simone Bordet
31b77d9ade Cleaned up implementation. 2012-10-26 14:57:06 +02:00
Greg Wilkins
bf7a0ace22 392237 Added BlockingCallback optimisation 2012-10-25 22:36:13 +11:00
Joakim Erdfelt
3e07bccb71 Adding another UTF8 High Surrogate test 2012-10-19 11:18:06 -07:00
Joakim Erdfelt
a1d559e863 Attempting to get a grip on possible \ud807 UTF8 decoding as reported by W3C websocket working group 2012-10-19 11:15:19 -07:00
Greg Wilkins
2b13648b0e 392237 fixed many TODOs and many minor code cleanups 2012-10-19 16:17:30 +11:00
Greg Wilkins
f420f5016d 392237 Implemented HttpOutput.sendContent for large content 2012-10-19 10:16:30 +11:00