Commit Graph

362 Commits

Author SHA1 Message Date
Greg Wilkins c1bcec61d5 jetty-9 jetty-io mostly working with all NIO buffers. Occassional failure in SSL stress test 2012-02-07 11:32:00 +11:00
Jesse McConnell 6b079ae3d8 merge from master 2012-02-01 17:25:08 -06:00
Thomas Becker 449302bcde 369349: fix --exec classpath issue, spaces in directory names fix
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2012-02-01 19:04:09 +11:00
Joakim Erdfelt fdaad62b63 Migrating old javax.* deps to new org.eclipse.jetty.orbit deps
+ Removed old deps in javax.*, geronimo, and asm in favor of
  new org.eclipse.jetty.orbit deps
+ Added enforcer rule to prevent reintroducing the old deps.
2012-01-31 15:21:58 -07:00
Thomas Becker 0f95f6d5e3 369988: Add DoSFilter.RateTracker.isRateExceeded unit test
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2012-01-31 11:03:55 +11:00
Jesse McConnell 6e44f4db5f [maven-release-plugin] prepare for next development iteration 2012-01-27 08:15:45 -06:00
Jesse McConnell 9d1ca3593e [maven-release-plugin] prepare release jetty-8.1.0.v20120127 2012-01-27 08:15:38 -06:00
Jesse McConnell ad6126553b [maven-release-plugin] prepare for next development iteration 2012-01-27 08:13:06 -06:00
Jesse McConnell 4e25f7bb05 [maven-release-plugin] prepare release jetty-7.6.0.v20120127 2012-01-27 08:13:00 -06:00
Jesse McConnell f2d0fd3cc8 revert back to 8.1.0-SNAPSHOT 2012-01-26 10:45:06 -06:00
Jesse McConnell 7ac9eb585f revert back to 7.6.0-SNAPSHOT 2012-01-26 10:42:11 -06:00
Jesse McConnell e98ae91ca6 [maven-release-plugin] prepare for next development iteration 2012-01-25 11:16:11 -06:00
Jesse McConnell fb30166a7f [maven-release-plugin] prepare release jetty-8.1.0.v20120125 2012-01-25 11:16:05 -06:00
Jesse McConnell c918bb4e3c Merge branch 'master' into jetty-8 2012-01-25 10:31:44 -06:00
Jesse McConnell 0c96fc40ea [maven-release-plugin] prepare for next development iteration 2012-01-25 09:31:06 -06:00
Jesse McConnell b455b7d94e [maven-release-plugin] prepare release jetty-7.6.0.v20120125 2012-01-25 09:30:55 -06:00
Simone Bordet f0a064b624 Fixed compilation problem. 2012-01-25 15:18:50 +01:00
Simone Bordet caa325c3ba Better check for WebSocket upgrades, since Connection headers may be of the form
Connection: keep-alive, Upgrade.
2012-01-24 21:21:43 +01:00
Jesse McConnell 8f9722bf4a Merge branch 'master' into jetty-8 2012-01-20 11:42:18 -06:00
Simone Bordet 45bede6fda 368992 - NPE in HttpGenerator.prepareBuffers() test case. 2012-01-20 16:57:42 +01:00
Greg Wilkins e1b12a633b Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
	jetty-distribution/pom.xml
	jetty-osgi/test-jetty-osgi/pom.xml
2012-01-20 13:00:32 +11:00
Greg Wilkins 50e551de64 368992: improved logging 2012-01-19 23:11:27 +11:00
Jesse McConnell c8870cfabb 366472: address test difference for jetty-8 related to cross origin filter test 2012-01-13 09:03:52 -06:00
Jesse McConnell 16e33c3d1e Merge branch 'master' into jetty-8 2012-01-13 08:21:29 -06:00
Simone Bordet c0d3266c59 366472: Javadocs. 2012-01-13 13:23:44 +01:00
Thomas Becker 30dade6b5a 366472: CrossDomainFilter accepts wildcard domains like *.example.com
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2012-01-13 11:28:32 +01:00
Greg Wilkins 04d703c062 365302: clean up old Logger mbeans 2012-01-13 13:59:49 +11:00
Jan Bartel 691efcc7ca Merge remote-tracking branch 'origin/master' into jetty-8 2012-01-11 16:35:57 +11:00
Greg Wilkins d0b81a185c 367638: 361316: protected multipart filter from DoS 2012-01-11 11:51:04 +11:00
Jan Bartel 1fbec51c8a Merge remote-tracking branch 'origin/master' into jetty-8 2012-01-10 16:08:59 +11:00
Thomas Becker 9e4fd4d385 365411: removed trailing whitespaces in ProxyServlet
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2012-01-06 15:46:31 +01:00
Thomas Becker 5e18130854 365411: Removed static logger from ProxyServlet
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2012-01-06 15:46:23 +01:00
Jan Bartel c3643d9937 Merge remote-tracking branch 'origin/master' into jetty-8 2011-12-21 12:37:23 +11:00
Simone Bordet 3e05c1e59d Merged from origin/master. 2011-12-16 21:30:45 +01:00
Joakim Erdfelt 2b626be186 Minor fixes for Windows build isues 2011-12-15 16:04:07 -07:00
Jan Bartel dfb96dfeeb 366342 Dont persist DosFilter trackers in http session 2011-12-13 11:07:26 +11:00
Joakim Erdfelt ec297a5456 Bug 366106 - IncludableGzipFilter does not honor minGzipSize init param setting
+ IncludableGzipFilter#IncludableGzipWrapper now properly copies
  minGzipSize, mimeTypes, and bufferSize configurables.
2011-12-08 14:30:38 -07:00
hmalphettes 89afbdf31d 360245 OSGi: javax.servlet packages version refactored 3.0 -> 2.6 2011-12-02 17:27:26 +08:00
Greg Wilkins de005c68fd Revert "Merge branch 'release-8'"
This reverts commit 9e72457941, reversing
changes made to df12605f0e.
2011-11-30 16:27:30 +11:00
Greg Wilkins 631b0ba1b6 [maven-release-plugin] prepare for next development iteration 2011-11-30 13:16:54 +11:00
Greg Wilkins 9d3745f999 [maven-release-plugin] prepare release jetty-8.1.0.RC0 2011-11-30 13:16:41 +11:00
Jan Bartel 127a5af8d7 Merge remote-tracking branch 'origin/master' into jetty-8 2011-11-17 10:59:54 +11:00
Jan Bartel be9597f8f2 349110 MultiPartFilter records the content-type in request params 2011-11-15 19:09:31 +11:00
Jan Bartel 0e541c4c24 363408 GzipFilter should not attempt to compress HTTP status 204 2011-11-14 17:29:32 +11:00
Jesse McConnell 2a6b8696d7 Merge branch 'master' into jetty-8 2011-11-08 15:59:55 -06:00
Greg Wilkins 7a082280f1 Merge remote-tracking branch 'origin/master' into jetty-7.6
Conflicts:
	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/pom.xml
	jetty-ajp/pom.xml
	jetty-annotations/pom.xml
	jetty-client/pom.xml
	jetty-client/src/main/java/org/eclipse/jetty/client/HttpConnection.java
	jetty-client/src/main/java/org/eclipse/jetty/client/SelectConnector.java
	jetty-continuation/pom.xml
	jetty-deploy/pom.xml
	jetty-distribution/pom.xml
	jetty-http-spi/pom.xml
	jetty-http/pom.xml
	jetty-http/src/main/java/org/eclipse/jetty/http/ssl/SslContextFactory.java
	jetty-io/pom.xml
	jetty-io/src/main/java/org/eclipse/jetty/io/nio/ChannelEndPoint.java
	jetty-io/src/main/java/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java
	jetty-jaspi/pom.xml
	jetty-jmx/pom.xml
	jetty-jndi/pom.xml
	jetty-jsp-2.1/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-logback/pom.xml
	jetty-osgi/jetty-osgi-boot-warurl/pom.xml
	jetty-osgi/jetty-osgi-boot/pom.xml
	jetty-osgi/jetty-osgi-equinoxtools/pom.xml
	jetty-osgi/jetty-osgi-httpservice/pom.xml
	jetty-osgi/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-start/pom.xml
	jetty-util/pom.xml
	jetty-util/src/test/java/org/eclipse/jetty/util/log/LogTest.java
	jetty-util/src/test/java/org/eclipse/jetty/util/log/NamedLogTest.java
	jetty-webapp/pom.xml
	jetty-websocket/pom.xml
	jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketConnectionD13.java
	jetty-xml/pom.xml
	pom.xml
	test-continuation-jetty6/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-sessions-common/pom.xml
	tests/test-webapps/pom.xml
	tests/test-webapps/test-webapp-rfc2616/pom.xml
2011-11-07 18:09:31 +11:00
Thomas Becker acaa24595b 359031: Javadoc
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2011-11-04 20:23:56 +01:00
Thomas Becker 3d0300e60d 359031: CGI servlet changed to allow relative paths to webapp
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2011-11-04 15:56:18 +01:00
Thomas Becker b9f45e9426 CGI.java code format
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2011-11-04 15:56:18 +01:00
Jesse McConnell d5320d95ba [maven-release-plugin] prepare for next development iteration 2011-10-24 15:02:30 -05:00