Commit Graph

4720 Commits

Author SHA1 Message Date
Greg Wilkins 9b8a78392c 410405 Avoid NPE for requestDispatcher(../)
Added extra tests for dotdot and encoded dotdot.
Also protected against dotdot in absolute URIs
2013-06-11 14:44:26 +10:00
Greg Wilkins ed04753111 410405 Avoid NPE for requestDispatcher(../) 2013-06-11 14:22:54 +10:00
Joakim Erdfelt 3db9299369 Merge branch 'jetty-7' into jetty-8 2013-06-04 11:24:44 -07:00
Joakim Erdfelt 4b458792c9 JDK5 build fix with Resource caching and path lookups 2013-06-04 10:42:32 -07:00
Joakim Erdfelt 559069cdd6 JDK5 fix for bad JarFile resource caching during deploy tests 2013-06-04 09:57:04 -07:00
Joakim Erdfelt 0c4a266d60 Fixing JDK5 test error with comparison of query string 2013-06-04 09:04:12 -07:00
Jan Bartel f65fc71288 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-06-04 10:37:16 +10:00
Jan Bartel 26c1e5bdbc 407342 ReloadedSessionMissingClassTest uses class compiled with jdk7 2013-06-04 10:34:52 +10:00
Jan Bartel 368523de87 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-06-03 15:29:07 +10:00
Jan Bartel 10845bfd28 409556 FileInputStream not closed in DirectNIOBuffer 2013-06-03 15:13:28 +10:00
Greg Wilkins 3849c893e1 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-05-31 11:07:40 +10:00
Greg Wilkins 3094f93ed9 408642 setContentType from addHeader 2013-05-31 11:06:33 +10:00
Greg Wilkins 219be496d9 408529 Etags set in 304 response 2013-05-31 10:59:34 +10:00
Jan Bartel c869aad145 409436 NPE on context restart using dynamic servlet registration 2013-05-30 15:16:43 +10:00
Jan Bartel af02e9b16d Update to version to 8.1.12-SNAPSHOT after last release 2013-05-30 10:52:39 +10:00
Greg Wilkins 4996278849 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-05-30 09:53:10 +10:00
Greg Wilkins ecbb532897 408909 GzipFilter setting of headers when reset and/or not compressed
defer commit until aggregate buffer overflows
2013-05-30 09:49:50 +10:00
Jan Bartel 54b62eafcb Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-05-29 10:54:53 +10:00
Jan Bartel 9f2a641dc0 409133 Empty <welcome-file> causes StackOverflowError 2013-05-29 10:21:53 +10:00
Greg Wilkins 34a0271fa3 Merge remote-tracking branch 'origin/jetty-7' into jetty-8
Conflicts:
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipWithPipeliningTest.java
2013-05-27 18:30:53 +10:00
Greg Wilkins 48c2a410b6 408909 GzipFilter setting of headers when reset and/or not compressed
updated some more test harnesses for etag tests
2013-05-27 17:48:08 +10:00
Greg Wilkins 6ef865b153 Merge remote-tracking branch 'origin/jetty-7' into jetty-8
Conflicts:
	VERSION.txt
	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-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java
	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-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
2013-05-27 16:47:27 +10:00
Greg Wilkins 16994cbd6c 408909 GzipFilter setting of headers when reset and/or not compressed
The gzip filter now sets deferred headers (content-length and etag) when it decides not to commit.
Also does not allow a reset after a decision to commit
2013-05-27 16:09:12 +10:00
Jesse McConnell 725dc261c8 Merge branch 'release-8' into jetty-8 2013-05-22 10:44:14 -05:00
Jesse McConnell 106a32a733 set for dev 2013-05-22 10:43:47 -05:00
Jesse McConnell a1a6f0e5f2 Merge branch 'release-7' into jetty-7 2013-05-22 10:39:24 -05:00
Jesse McConnell e5174f9cef set for dev 2013-05-22 10:38:56 -05:00
Jesse McConnell 742f6a063d [Bug 408600] set correct jetty.url in all pom files 2013-05-21 13:16:39 -05:00
Jesse McConnell bdbd92dbc9 [Bug 408600] set correct jetty.url in all pom files 2013-05-21 13:10:07 -05:00
Jesse McConnell 0858e69cb1 [maven-release-plugin] prepare for next development iteration 2013-05-20 07:19:34 -05:00
Jesse McConnell d469b77663 [maven-release-plugin] prepare release jetty-8.1.11.v20130520 2013-05-20 07:19:25 -05:00
Jesse McConnell 497c2f7819 [maven-release-plugin] prepare for next development iteration 2013-05-20 07:15:00 -05:00
Jesse McConnell b32d0260c9 [maven-release-plugin] prepare release jetty-7.6.11.v20130520 2013-05-20 07:14:52 -05:00
Jesse McConnell 3dcceaed35 Updating VERSION.txt top section 2013-05-20 06:51:30 -05:00
Jesse McConnell e5e4f58545 Merge branch 'jetty-8' into release-8 2013-05-20 06:50:06 -05:00
Jesse McConnell 13fb43ea6d Updating VERSION.txt top section 2013-05-20 06:48:15 -05:00
Jesse McConnell 4cba93e8d4 Merge branch 'jetty-7' into release-7 2013-05-20 06:47:08 -05:00
Jan Bartel 259aac6463 Merge remote-tracking branch 'origin/jetty-7' into jetty-8
Conflicts:
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
2013-05-20 17:18:28 +10:00
Jan Bartel 13c56e81f5 408446 Multipart parsing issue with boundry and charset in ContentType header 2013-05-20 15:45:53 +10:00
Jan Bartel 427c59e2f2 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-05-16 15:47:22 +10:00
Jan Bartel 51c1017b3d 408077 HashSessionManager leaves file handles open after being stopped 2013-05-16 15:39:50 +10:00
Jan Bartel 4a562f8d89 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-05-16 12:25:19 +10:00
Jan Bartel 8a1ea2f69c 407976 JDBCSessionIdManager potentially leaves server in bad state after startup 2013-05-16 12:18:04 +10:00
Jan Bartel 3f4a05fde3 407931 Add toggle for failing on servlet availability 2013-05-16 08:25:46 +10:00
Jesse McConnell 67f55ec8e5 Merge branch 'jetty-7' into release-7 2013-05-06 17:29:21 -05:00
Jan Bartel 488c1755e0 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-05-06 13:22:26 +10:00
Jan Bartel f10a1d709b 407173 java.lang.IllegalStateException: null when using JDBCSessionManager 2013-05-06 12:24:53 +10:00
Jan Bartel f4ee8ba48d Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-05-03 16:18:24 +10:00
Jan Bartel e2c217d405 407136 @PreDestroy called after Servlet.destroy() 2013-05-03 16:17:16 +10:00
Greg Wilkins e030088428 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-05-02 11:19:24 +10:00