Commit Graph

4556 Commits

Author SHA1 Message Date
Joakim Erdfelt a9f6f30242 Merge branch 'jetty-7' into jetty-8 2013-02-05 18:08:15 -07:00
Joakim Erdfelt 14e24c97aa 400040 - NullPointerException in HttpGenerator.prepareBuffers
+ Adding safety check on _header use
2013-02-05 18:07:23 -07:00
Joakim Erdfelt 65c2112964 Making Jsp tests work on JDK's less than 7 2013-02-05 18:00:58 -07:00
Jan Bartel 0569957e3a Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-02-01 22:23:04 +11:00
Jan Bartel d7920f236f 398649 ServletContextListener.contextDestroyed() is not called on ContextHandler unregistration 2013-02-01 18:58:46 +11:00
Greg Wilkins e8de7bd905 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-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-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-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-02-01 18:22:04 +11:00
Greg Wilkins 1610329d3e 399703 made encoding error handling consistent 2013-02-01 15:31:55 +11:00
Jesse McConnell 64051768c5 Merge branch 'release-8' into jetty-8 2013-01-31 13:20:58 -06:00
Jesse McConnell 1101aec2d1 set for dev 2013-01-31 13:20:34 -06: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 0a1fbc7ea0 set for release 2013-01-31 11:08:08 -06:00
Jesse McConnell ac145f0296 Merge branch 'jetty-8' into release-8 2013-01-31 11:07:03 -06:00
Jesse McConnell b679565178 Merge branch 'release-7' into jetty-7 2013-01-31 10:41:20 -06:00
Jesse McConnell 81d3c76780 prep for dev 2013-01-31 10:41:05 -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
Jesse McConnell ade2e15318 Set for release 2013-01-31 08:03:42 -06:00
Jesse McConnell 2e2c07dad9 Set for release 2013-01-31 08:02:54 -06:00
Jesse McConnell 50f5fe6716 Merge branch 'jetty-7' into release-7 2013-01-31 08:01:58 -06:00
Jesse McConnell f0c6b9bc82 Merge branch 'jetty-7' into jetty-8 2013-01-29 15:51:56 -06:00
Jesse McConnell c87cc4d4f0 resolve compilation issues with statistics servlet post patch application 2013-01-29 15:48:33 -06:00
KARASZI István dd4a80288b [Bug 391249] fix for invalid XML node dispatchedTimeMean in statistics servlet
Signed-off-by: Jesse McConnell <jesse.mcconnell@gmail.com>
2013-01-29 15:43:02 -06:00
KARASZI István 840f147019 [Bug 391248] fixing localhost checking in statistics servlet
Signed-off-by: Jesse McConnell <jesse.mcconnell@gmail.com>
2013-01-29 15:41:39 -06:00
Jesse McConnell 1910fb8ce4 [Bug 391345] fix missing br tag in statistics servlet 2013-01-29 14:55:22 -06:00
Jesse McConnell ddce31a323 [Bug 396574] add JETTY_HOME as a location for pid to be found 2013-01-29 14:48:25 -06:00
Jesse McConnell 01f7bc1e12 Merge branch 'jetty-7' into jetty-8 2013-01-29 14:08:25 -06:00
Jesse McConnell b9b7e76b7c [Bug 396574] add /Users/jesse/installs/jetty as a location for pid to be found 2013-01-29 14:07:27 -06:00
Jesse McConnell 3b6cab63e2 Merge branch 'jetty-7' into jetty-8 2013-01-29 13:42:29 -06:00
Jesse McConnell 35ebe6cea3 [Bug 394541] remove continuation jar from distro, add as dep to test-jetty-webapp 2013-01-29 13:34:45 -06:00
Thomas Becker 988206c36a 393968 fix typo in javadoc 2013-01-28 16:11:33 +01:00
Greg Wilkins 9b383c5780 381521 Only set Vary header when content could be compressed 2013-01-26 11:03:46 +11:00
Jesse McConnell f16fc7e7b7 Merge branch 'jetty-7' into jetty-8 2013-01-25 16:53:18 -06:00
Jesse McConnell 1a31067369 Add note about getCanonicalFile check and fix IdleSession test in test hash sessions 2013-01-25 16:25:59 -06:00
Jesse McConnell b3043276bc add corresponding correct file removal check 2013-01-25 16:12:08 -06:00
Jesse McConnell 4bed164462 Merge branch 'jetty-7' into jetty-8 2013-01-25 15:31:13 -06:00
Jesse McConnell 111bd19634 doh, header 2013-01-25 15:30:59 -06:00
Jesse McConnell d8a3b76862 Merge branch 'jetty-7' into jetty-8 2013-01-25 15:24:41 -06:00
Jesse McConnell d4568feba6 [Bug 399132] check parent dir of session store against file to be removed 2013-01-25 15:22:16 -06:00
Jesse McConnell 368d7bbb72 Merge branch 'jetty-7' into jetty-8 2013-01-25 11:35:11 -06:00
Jesse McConnell c00e8d0283 Add analystics to aggregate javadoc profile (so it only targeted on actual release deployment.) 2013-01-25 11:26:25 -06:00
Greg Wilkins 4a1a4700c3 382237 support non java JSON classes 2013-01-25 12:28:54 +11:00
Greg Wilkins 3c6deaf83c Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-01-25 09:43:57 +11:00
Greg Wilkins c9d026703f removed System.outs 2013-01-25 09:42:51 +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
Joakim Erdfelt b6d551675b Merge branch 'jetty-7' into jetty-8 2013-01-23 13:58:34 -07:00
Joakim Erdfelt a7aab0b6c6 Bumping up jetty-version-maven-plugin to 1.0.9 2013-01-23 13:56:05 -07:00
Jan Bartel 92af54c3fc Make IdleTimeoutTest jdk1.5 compliant 2013-01-22 08:58:35 +11:00
Jan Bartel fe48239b34 Merge remote-tracking branch 'origin/jetty-7' into jetty-8 2013-01-21 16:54:06 +11:00