Commit Graph

3873 Commits

Author SHA1 Message Date
Jesse McConnell 2c0a35d430 [maven-release-plugin] prepare release jetty-8.1.3.v20120413 2012-04-13 15:31:38 -05:00
Jesse McConnell 71b3f75a90 Updating VERSION.txt top section 2012-04-13 15:05:26 -05:00
Jesse McConnell ead9f4e6e5 Merge branch 'jetty-8' into release-8 2012-04-13 15:04:50 -05:00
Jesse McConnell fe6298e5be Merge branch 'master' into jetty-8 2012-04-13 14:59:15 -05:00
Jesse McConnell cbc820a272 replace config extraction 2012-04-13 14:58:09 -05:00
Jesse McConnell 4f7c896b3d merge from master 2012-04-13 14:10:30 -05:00
Jesse McConnell f8b5c0040d reset for release 2012-04-13 14:09:06 -05:00
Jesse McConnell edd255b3de remove old references 2012-04-13 13:51:33 -05:00
Jesse McConnell 77d3bc8531 wire for correct java 6 and java 7 usage 2012-04-13 12:33:46 -05:00
Jesse McConnell 8c7a18b2f2 clear up duplication in profiles 2012-04-13 12:00:39 -05:00
Simone Bordet 72040202d4 Reverted release back to 8.1.3-SNAPSHOT. 2012-04-13 17:27:37 +02:00
Simone Bordet 85710fb9ea Reverted release back to 7.6.3-SNAPSHOT. 2012-04-13 16:59:06 +02:00
Jesse McConnell 3470824f19 Merge branch 'release-8' into jetty-8 2012-04-12 11:26:39 -05:00
Jesse McConnell 92c6b5338b Updating VERSION.txt top section 2012-04-12 11:26:08 -05:00
Jesse McConnell bce782e2d6 Merge branch 'release' 2012-04-12 10:38:36 -05:00
Jesse McConnell a164adc48e Updating VERSION.txt top section 2012-04-12 10:38:19 -05:00
Jesse McConnell 3b87e91cbe [maven-release-plugin] prepare for next development iteration 2012-04-12 10:29:30 -05:00
Jesse McConnell 308b010744 [maven-release-plugin] prepare release jetty-8.1.3.v20120412 2012-04-12 10:29:20 -05:00
Jesse McConnell 7078716df4 Updating VERSION.txt top section 2012-04-12 10:01:24 -05:00
Jesse McConnell 70d41f3a52 Merge branch 'jetty-8' into release-8 2012-04-12 09:56:33 -05:00
Jesse McConnell 1449a97a94 add releaseBackup to ignore 2012-04-12 09:55:52 -05:00
Jesse McConnell cdcc0922c3 [maven-release-plugin] prepare for next development iteration 2012-04-12 09:49:52 -05:00
Jesse McConnell 5966c86571 [maven-release-plugin] prepare release jetty-7.6.3.v20120412 2012-04-12 09:49:46 -05:00
Jesse McConnell 7f06c73d6f Updating VERSION.txt top section 2012-04-12 09:16:35 -05:00
Jesse McConnell 76788d730f Merge branch 'master' into release 2012-04-12 09:14:15 -05:00
Jan Bartel 1fbe298bd6 374881 Set copyWebInf to false by default 2012-04-12 23:01:33 +10:00
Greg Wilkins f144b6562e Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/gzip/GzipTester.java
2012-04-12 22:20:01 +10:00
Simone Bordet 7e5bff4640 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2012-04-12 12:57:27 +02:00
Simone Bordet a389d08c26 376201 - HalfClosed state not handled properly.
Addendum to restore previous behavior, where a closed stream was also half closed.
2012-04-12 12:57:04 +02:00
Greg Wilkins f9a75984f0 374504: updated cookies for rfc6265 2012-04-12 20:24:50 +10:00
Thomas Becker 4089f3af77 376519: adapt GZipFilter tests to follow new default for Deflate
Change-Id: Ia87902ae10cc139bc17551e3496de62a0f89957a
2012-04-12 11:18:15 +02:00
Thomas Becker 6f54239cb5 376519: deflate compression level and noWrap setting are now configurable for GZipFilter
Change-Id: I77a69921fc712bc2aa6d10b92f9b1b035a9c53f4
2012-04-12 10:15:48 +02:00
Greg Wilkins 325c484950 fixed merge issues 2012-04-12 17:16:45 +10:00
Greg Wilkins b5e9de1cd8 Merge remote-tracking branch 'origin/master' into jetty-8 2012-04-12 17:16:22 +10:00
Greg Wilkins 9cc43c5f93 Merge "376519: Change compression type of deflate compression in GzipFilter and IncludableGzipFilter" 2012-04-12 03:14:53 -04:00
Jan Bartel 436743e7d5 367172 Remove detection for slf4j NOPLogger 2012-04-12 17:05:55 +10:00
Greg Wilkins a565c72adb 374550: remove printStackTrace calls 2012-04-12 16:51:59 +10:00
Greg Wilkins ee2d289f63 Merge remote-tracking branch 'origin/master' into jetty-8
Conflicts:
	jetty-npn/pom.xml
	jetty-osgi/jetty-osgi-boot-jsp/META-INF/MANIFEST.MF
	jetty-osgi/jetty-osgi-boot-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jasper/WebappRegistrationCustomizerImpl.java
	jetty-osgi/jetty-osgi-boot-jsp/src/main/java/org/eclipse/jetty/osgi/boot/jsp/FragmentActivator.java
	jetty-osgi/jetty-osgi-boot-logback/META-INF/MANIFEST.MF
	jetty-osgi/jetty-osgi-boot-warurl/META-INF/MANIFEST.MF
	jetty-osgi/jetty-osgi-boot/META-INF/MANIFEST.MF
	jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/WebBundleDeployerHelper.java
	jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/internal/webapp/WebBundleTrackerCustomizer.java
	jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/utils/internal/DefaultFileLocatorHelper.java
	jetty-osgi/jetty-osgi-equinoxtools/META-INF/MANIFEST.MF
	jetty-osgi/jetty-osgi-httpservice/META-INF/MANIFEST.MF
	jetty-spdy/spdy-jetty-http-webapp/pom.xml
	jetty-spdy/spdy-jetty-http/pom.xml
	jetty-spdy/spdy-jetty/pom.xml
2012-04-12 16:02:34 +10:00
Greg Wilkins c9ce3eb108 362113: fixed StdErrLog so that it does not hold a copy of System.err and thus avoid being redirected if System.err is redirected 2012-04-12 11:32:28 +10:00
Thomas Becker d98f699bea 376519: Change compression type of deflate compression in GzipFilter and IncludableGzipFilter
Change-Id: I83ed4a43ad432502ef5d5ca52c0e7370d8a5dd9f
2012-04-11 20:38:16 +02:00
Thomas Becker 08573701ef 376373: GzipFilter now does not ignore _excludePath + fix for ignored _excludeAgentPatterns if _excludeAgent is set
Change-Id: Ie9940141f9b92b267f4b405ef4ec3ab5dee43be5
2012-04-11 14:47:28 +02:00
Thomas Becker 543d2a18ca 376373: GzipFilter now does not ignore _excludePath + fix for ignored _excludeAgentPatterns if _excludeAgent is set
Change-Id: I8d3d0fd62677c3a54cbe93febf4cde49aa24cc74
2012-04-11 13:03:33 +02:00
Thomas Becker 5ddaa62469 Merge branch 'master' of ssh://git.eclipse.org:29418/jetty/org.eclipse.jetty.project 2012-04-11 13:02:14 +02:00
Simone Bordet 04b37f02ed Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2012-04-11 12:34:45 +02:00
Simone Bordet 972087d068 376201 - HalfClosed state not handled properly. 2012-04-11 12:18:56 +02:00
Jan Bartel 942c8a19f5 373269 Make ServletHandler.notFound() method impl do nothing - override to send back 404. 2012-04-11 19:53:55 +10:00
Jan Bartel a1fd229cc6 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2012-04-11 19:53:20 +10:00
Thomas Becker 5b7fe58593 376373: GzipFilter now does not ignore _excludePath + fix for ignored _excludeAgentPatterns if _excludeAgent is set
Change-Id: I1f0ac1b5a12d75b755a85cc9bdb4906c6b7a84a6
2012-04-11 10:55:32 +02:00
Simone Bordet 47c1587166 Strengthen the behavior of Stream methods to throw if they are used wrongly,
for example sending DATA frames before a REPLY and so on.
2012-04-11 10:39:23 +02:00
Greg Wilkins 20a3d3c12e 376424: do not recycle buffers before content consumed asynchronously 2012-04-11 18:21:39 +10:00