Commit Graph

484 Commits

Author SHA1 Message Date
Jan Bartel 34954bc617 Merge remote-tracking branch 'origin/master' into jetty-8 2012-05-22 17:28:40 +02:00
Greg Wilkins 4ed88e71e0 Merge "379194 - ProxyServlet enhancement to enable easy creation of alternative HttpClient implementations" 2012-05-22 08:14:07 -04:00
Greg Wilkins 5c6ad51300 Merge "New test for GzipFilter that tests writing a text message to the outputstream and setting the status code afterwards" 2012-05-22 08:11:28 -04:00
Greg Wilkins 473ebb447a Merge "377403: fix GzipFilter.java javadoc" 2012-05-22 07:59:56 -04:00
pgdad af0a8e4aeb 379194 - ProxyServlet enhancement to enable easy creation of alternative HttpClient implementations
Change-Id: I8246947afa7f3921150efef2040006e346cd0ca5
2012-05-10 22:01:24 -04:00
Thomas Becker 8e4f2bb412 New test for GzipFilter that tests writing a text message to the outputstream and setting the status code afterwards
Change-Id: I867b05f2e5d60cebe8a66ed373c28aaf80f5765f
2012-04-25 13:08:47 +02:00
Thomas Becker c7ab458df1 377403: fix GzipFilter.java javadoc
Change-Id: Ib7d3433d9f3fb542c4d68f098f50b1a7c9da334c
2012-04-23 15:26:24 +02:00
Jesse McConnell b64909900c [maven-release-plugin] prepare for next development iteration 2012-04-13 15:31:47 -05:00
Jesse McConnell 2c0a35d430 [maven-release-plugin] prepare release jetty-8.1.3.v20120413 2012-04-13 15:31:38 -05:00
Jesse McConnell b963840d40 [maven-release-plugin] prepare for next development iteration 2012-04-13 15:29:14 -05:00
Jesse McConnell a652ee7396 [maven-release-plugin] prepare release jetty-7.6.3.v20120413 2012-04-13 15:29:05 -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 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 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
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
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 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
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
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
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
Thomas Becker 2b83d9d954 375692: cosmetic changes to get rid of warnings, etc.
Change-Id: Id4d76a7f6e5bd989505e5233af73d5526b8e7c1f
2012-04-02 13:41:36 +02:00
Jan Bartel 45050ebac9 Merge remote-tracking branch 'origin/master' into jetty-8 2012-04-02 17:49:33 +10:00
Greg Wilkins 9244292fca 375692: simplified gzipfilter 2012-04-02 12:09:03 +10:00
Thomas Becker 2278d27235 375692: GzipFilter support for deflate
Change-Id: I4a42d750cfbbb61078adafa1e2bcbc1973198dca
2012-03-30 11:02:44 +02:00
Jan Bartel 17269583fb Merge remote-tracking branch 'origin/master' into jetty-8 2012-03-30 12:05:46 +11:00
Jan Bartel 0f9a898c1c 349110 MultiPartFilter records the content-type in request params 2012-03-22 09:59:57 +11:00
pgdad c81dbb8694 374891 - enhancement to how ProxyServlet determines the proxy target 2012-03-21 08:44:02 -04:00
Simone Bordet 5624a5721e Merged from master. 2012-03-14 18:24:57 +01:00
Greg Wilkins 56e726c201 374018 correctly handle requestperminuted underflow 2012-03-13 10:33:04 +11:00
Jesse McConnell b4985ad0d5 [maven-release-plugin] prepare for next development iteration 2012-03-08 23:53:50 -06:00
Jesse McConnell 7a99af4ffe [maven-release-plugin] prepare release jetty-8.1.2.v20120308 2012-03-08 23:53:42 -06:00
Jesse McConnell 246e3ed756 [maven-release-plugin] prepare for next development iteration 2012-03-08 21:09:46 -06:00
Jesse McConnell a63b3fdc5e [maven-release-plugin] prepare release jetty-7.6.2.v20120308 2012-03-08 21:09:37 -06:00
Jesse McConnell 2086937a09 Merge branch 'master' into jetty-8 2012-03-08 05:35:14 -06:00
Simone Bordet 0ab47e41bc Fixed NPE in case user agent pattern does not match. 2012-03-08 11:42:14 +01:00
Jesse McConnell 3442e79b38 updated gzipfilter and user agent filter to take excluded paths, excluded path patterns, and excluded agent patterns. The latter two take regular expressions in order to match paths and user agents, thanks travis 2012-03-07 17:21:38 -06:00
Jesse McConnell 381615f52d merge from master 2012-03-07 16:44:31 -06:00
Jesse McConnell 50d92ec8ef reset versions 2012-03-06 17:07:53 -06:00
Jesse McConnell 5416b93c7e Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2012-03-06 17:06:21 -06:00
Jesse McConnell f12e3c390c reset versions 2012-03-06 17:06:10 -06:00
Greg Wilkins 60a77e425a Merge "370842: X-Forwarded-Host header is now set by request.getHeader(Host) which doesn't ommit the port information" 2012-03-06 18:06:09 -05:00
Jan Bartel 386249f504 373306 Set default user agent extraction pattern for UserAgentFilter 2012-03-06 13:17:25 +11:00
Jesse McConnell 0047054894 Add test case for bug 373162 2012-03-05 09:29:12 -06:00
Jesse McConnell f434acd6ba [Bug 373162] add improved implementation for getParameterMap(), needs a test though and the existing setup doesn't seem like it would easily support the needed test so need to do that still 2012-03-02 17:31:08 -06:00
Jesse McConnell d1c8c477ea [maven-release-plugin] prepare for next development iteration 2012-03-02 08:57:43 -06:00
Jesse McConnell b75868e84f [maven-release-plugin] prepare release jetty-8.1.2.v20120302 2012-03-02 08:57:19 -06:00
Jesse McConnell 51311d050e [maven-release-plugin] prepare for next development iteration 2012-03-02 08:37:46 -06:00
Jesse McConnell a8296ec3d5 [maven-release-plugin] prepare release jetty-7.6.2.v20120302 2012-03-02 08:37:38 -06:00
Thomas Becker 492cc7508a 370842: X-Forwarded-Host header is now set by request.getHeader(Host) which doesn't ommit the port information 2012-03-01 15:04:31 +01:00
Jesse McConnell 8b20316efc Merge branch 'master' into jetty-8 2012-02-24 06:48:50 -06:00
Simone Bordet f87cd6d1ba Made reads quicker to avoid that tests last forever. 2012-02-24 11:56:40 +01:00
Jesse McConnell b29f371758 add close boolean to govern Connection: setting on requests in test 2012-02-23 08:03:44 -06:00
Jesse McConnell 23a2081168 add close boolean to govern Connection: setting on requests in test 2012-02-23 07:54:40 -06:00
Jesse McConnell b4c2f79934 update to jetty-8 method signatures 2012-02-21 11:39:24 -06:00
Jesse McConnell eed2a2a0f7 Merge from master 2012-02-21 11:38:28 -06:00
Joakim Erdfelt c06df6cbbd Correcting minor typo 2012-02-16 14:41:40 -07:00
Joakim Erdfelt 47f4b65359 Making gzip + pipelining test perform sha1 test correctly 2012-02-16 14:40:46 -07:00
Joakim Erdfelt 0315655b27 Trying to work out why gzip decompress isn't working 2012-02-16 14:26:50 -07:00
Joakim Erdfelt 766ff7cf19 Bug 371798 - potential pipelining issue
+ Adding testcase for gzip + pipelining issue reported in bugzilla.
  Created scenario where 2 requests are made, with 2nd request
  overlapping the first response.  The first response is also gzip'd
2012-02-16 14:08:21 -07:00
Jesse McConnell ac79497dee [maven-release-plugin] prepare for next development iteration 2012-02-15 14:29:36 -06:00
Jesse McConnell 3705b424c8 [maven-release-plugin] prepare release jetty-8.1.1.v20120215 2012-02-15 14:29:28 -06:00
Jesse McConnell efb6883cf0 [maven-release-plugin] prepare for next development iteration 2012-02-15 14:22:19 -06:00
Jesse McConnell baf2b94f77 [maven-release-plugin] prepare release jetty-7.6.1.v20120215 2012-02-15 14:22:12 -06:00
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