513 Commits

Author SHA1 Message Date
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