Commit Graph

10302 Commits

Author SHA1 Message Date
Simone Bordet 961a90d16c Merged branch 'jetty-9.2.x' into 'master'. 2015-01-29 14:11:21 +01:00
Simone Bordet e03cd5e286 451092 - Connector will fail if HeaderListener return false.
Not a bug, but wrote one more test and clarified Javadocs.
2015-01-29 11:44:11 +01:00
Simone Bordet f02da0cc33 458354 - ALPNServerConnection.select negotiation.
Prefer the server protocols rather than the client protocols.
2015-01-29 11:21:08 +01:00
Simone Bordet af312dbca0 Fixed case where a trying to send a request was causing an IllegalStateException.
It is always possible that a request is aborted by the client code
while being sent, so we should just return rather than throwing.
2015-01-29 11:13:39 +01:00
Simone Bordet b6e4852179 Improved dump() output. 2015-01-29 11:13:39 +01:00
Simone Bordet 88ed996295 Improved toString(). 2015-01-29 11:13:39 +01:00
Jan Bartel f0159e2130 458568 JDBCLoginService javadoc incorrectly references HashLoginService 2015-01-27 23:39:05 +01:00
Simone Bordet a52703cba9 458527 - Implement an async proxy servlet that can perform content transformations. 2015-01-27 15:29:47 +01:00
Simone Bordet 159884a9c1 458495 - CompletableCallback may not notify failures.
Fixed by improving the state machine, and calling abort() also in
case of synchronous failures.
2015-01-27 10:54:29 +01:00
Greg Wilkins 8c2e82c1b6 Merge remote-tracking branch 'origin/jetty-9.2.x' 2015-01-23 14:58:39 +01:00
Greg Wilkins 934625176f Merge branch 'jetty-9.2.x' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9.2.x 2015-01-23 14:57:17 +01:00
Greg Wilkins d59887980d updated VERSION.txt with latest jetty-7/8 releases 2015-01-23 14:56:54 +01:00
Jan Bartel ae47edb8a7 458175 multipart annotation on lazily loaded servlet does not work 2015-01-23 13:59:49 +01:00
Greg Wilkins afdc522d20 fixed merge 2015-01-23 12:15:28 +01:00
Greg Wilkins 5b42345cc6 Merge remote-tracking branch 'origin/jetty-9.2.x' 2015-01-23 11:43:20 +01:00
Greg Wilkins 437dbbef01 removed deprecated legacy rewrite rule 2015-01-23 11:38:34 +01:00
Greg Wilkins b02f283971 458174 Example Jar Server 2015-01-23 11:32:13 +01:00
Greg Wilkins 7e608a70eb 458209 Length check for HttpMethod MOVE lookahead 2015-01-23 11:04:33 +01:00
Joakim Erdfelt 03121edc92 Merge branch 'jetty-9.2.x' 2015-01-22 11:51:36 -07:00
Greg Wilkins c5fbb185de 457893 Close temp jar resource 2015-01-22 16:23:54 +01:00
Joakim Erdfelt 41029ca6f8 Breaking ant <property> caching for jmx tests 2015-01-22 07:20:28 -07:00
Greg Wilkins 94f0f29540 458101 added test for maxFormContentSize 2015-01-22 12:41:13 +01:00
Joakim Erdfelt 48e5157731 Merge branch 'jetty-9.2.x'
Conflicts:
	VERSION.txt
	aggregates/jetty-all/pom.xml
	apache-jsp/pom.xml
	apache-jstl/pom.xml
	examples/async-rest/async-rest-jar/pom.xml
	examples/async-rest/async-rest-webapp/pom.xml
	examples/async-rest/pom.xml
	examples/embedded/pom.xml
	examples/pom.xml
	jetty-alpn/jetty-alpn-client/pom.xml
	jetty-alpn/jetty-alpn-server/pom.xml
	jetty-alpn/pom.xml
	jetty-annotations/pom.xml
	jetty-ant/pom.xml
	jetty-cdi/pom.xml
	jetty-client/pom.xml
	jetty-continuation/pom.xml
	jetty-deploy/pom.xml
	jetty-distribution/pom.xml
	jetty-fcgi/fcgi-client/pom.xml
	jetty-fcgi/fcgi-server/pom.xml
	jetty-fcgi/pom.xml
	jetty-http-spi/pom.xml
	jetty-http/pom.xml
	jetty-io/pom.xml
	jetty-jaas/pom.xml
	jetty-jaspi/pom.xml
	jetty-jmx/pom.xml
	jetty-jndi/pom.xml
	jetty-jsp/pom.xml
	jetty-jspc-maven-plugin/pom.xml
	jetty-maven-plugin/pom.xml
	jetty-monitor/pom.xml
	jetty-nosql/pom.xml
	jetty-osgi/jetty-osgi-alpn/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/jetty-osgi-npn/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-plus/pom.xml
	jetty-proxy/pom.xml
	jetty-quickstart/pom.xml
	jetty-rewrite/pom.xml
	jetty-runner/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-alpn-tests/pom.xml
	jetty-spdy/spdy-client/pom.xml
	jetty-spdy/spdy-core/pom.xml
	jetty-spdy/spdy-example-webapp/pom.xml
	jetty-spdy/spdy-http-client-transport/pom.xml
	jetty-spdy/spdy-http-common/pom.xml
	jetty-spdy/spdy-http-server/pom.xml
	jetty-spdy/spdy-npn-tests/pom.xml
	jetty-spdy/spdy-server/pom.xml
	jetty-spring/pom.xml
	jetty-start/pom.xml
	jetty-util-ajax/pom.xml
	jetty-util/pom.xml
	jetty-webapp/pom.xml
	jetty-websocket/javax-websocket-client-impl/pom.xml
	jetty-websocket/javax-websocket-server-impl/pom.xml
	jetty-websocket/pom.xml
	jetty-websocket/websocket-api/pom.xml
	jetty-websocket/websocket-client/pom.xml
	jetty-websocket/websocket-common/pom.xml
	jetty-websocket/websocket-server/pom.xml
	jetty-websocket/websocket-servlet/pom.xml
	jetty-xml/pom.xml
	pom.xml
	tests/pom.xml
	tests/test-continuation/pom.xml
	tests/test-integration/pom.xml
	tests/test-loginservice/pom.xml
	tests/test-quickstart/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-jaas-webapp/pom.xml
	tests/test-webapps/test-jetty-webapp/pom.xml
	tests/test-webapps/test-jndi-webapp/pom.xml
	tests/test-webapps/test-mock-resources/pom.xml
	tests/test-webapps/test-proxy-webapp/pom.xml
	tests/test-webapps/test-servlet-spec/pom.xml
	tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml
	tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
	tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml
	tests/test-webapps/test-webapp-rfc2616/pom.xml
2015-01-21 11:00:54 -07:00
Joakim Erdfelt c6b07e09d9 Re-enabling test-jmx tree 2015-01-19 14:04:45 -07:00
Jesse McConnell aa22842c20 [maven-release-plugin] prepare for next development iteration 2015-01-16 17:48:29 -06:00
Jesse McConnell 8c58a9abc4 [maven-release-plugin] prepare release jetty-9.2.7.v20150116 2015-01-16 17:48:23 -06:00
Jesse McConnell 8748abbfa1 tweake 2015-01-16 16:34:21 -06:00
Jesse McConnell 425a14de18 set for release 2015-01-16 16:32:19 -06:00
Joakim Erdfelt 7d88ce8f27 457696 - JMX implementation should not be overridden by WebApp classes
+ Adding integration tests for the jmx issues
2015-01-16 15:18:01 -07:00
Joakim Erdfelt 3f08e54a23 457696 - JMX implementation should not be overridden by WebApp classes
+ Marking org.eclipse.jetty.util.annotation. for hole punching
+ Making ContextHandler parsing of "org.eclipse.jetty.server.context.ManagedAttributes"
  more lenient to whitespace around delimitors
+ Making ObjectMBean take in account the .jmx.{name}MBean for
  annotation influences too.
2015-01-16 15:18:01 -07:00
Joakim Erdfelt aea4713d27 Minor test class cleanup while testing some annotation scanning behavior reported 2015-01-16 15:18:01 -07:00
Jesse McConnell 81bb8411d1 [maven-release-plugin] prepare for next development iteration 2015-01-16 12:06:36 -06:00
Jesse McConnell 7865f88b81 [maven-release-plugin] prepare release jetty-9.2.7.v20150116 2015-01-16 12:06:30 -06:00
Jesse McConnell b3f4578d7d yeah, I just did that 2015-01-16 11:36:19 -06:00
Jesse McConnell db991355a2 [maven-release-plugin] prepare for next development iteration 2015-01-16 10:41:45 -06:00
Jesse McConnell 6930abb8d3 [maven-release-plugin] prepare release jetty-9.2.7.v20140116 2015-01-16 10:41:39 -06:00
Jesse McConnell c6e98e1e92 set for release 2015-01-16 10:11:07 -06:00
Jesse McConnell 9225b124a4 [maven-release-plugin] prepare for next development iteration 2015-01-16 08:21:35 -06:00
Jesse McConnell ebd563e64d [maven-release-plugin] prepare release 9.2.7.v20140116 2015-01-16 08:21:29 -06:00
Joakim Erdfelt 2178824b17 457696 - JMX implementation should not be overridden by WebApp classes 2015-01-16 06:42:28 -07:00
Greg Wilkins 82870deef9 Removed incorrect LICENSE file (CREATIVE COMMONS)
This license file was committed to a private repository at github.com:intalio/jetty-fcgi
when we were considering if FCGI was to be a part of Jetty or not. When FCGI was merged into
jetty master (e00f5c4056) the file was not removed.

As per the NOTICE.txt file, Jetty is dual licensed under
http://www.apache.org/licenses/LICENSE-2.0.html
and http://www.eclipse.org/legal/epl-v10.html

It was not and is not the intention of the copyright holders or contributors to use the
creative commons license for any part of the jetty release.
2015-01-15 17:04:46 +01:00
Joakim Erdfelt 73110f5ba0 Merge branch 'jetty-9.2.x' 2015-01-09 10:00:57 -07:00
Joakim Erdfelt d8186af7ac Bumping up maven-deploy-plugin to v2.8.2 with retry configuration 2015-01-09 10:00:39 -07:00
Simone Bordet 6861da11b9 457130 - HTTPS request with IP host and HTTP proxy throws IllegalArgumentException.
Fixed handling of cookies in case of null URI.
2015-01-09 16:08:41 +01:00
Jan Bartel 0aa6f1b706 420944 Hot Deployment of WAR when Context XML exists doesn't trigger redeploy 2015-01-09 16:08:41 +01:00
Simone Bordet c7d9c5c951 457130 - HTTPS request with IP host and HTTP proxy throws IllegalArgumentException.
Fixed handling of cookies in case of null URI.
2015-01-09 16:07:41 +01:00
Jan Bartel b195e7ee20 420944 Hot Deployment of WAR when Context XML exists doesn't trigger redeploy 2015-01-09 13:23:37 +01:00
Simone Bordet 86c2d01e80 Merged branch 'jetty-9.2.x' into 'master'. 2015-01-09 12:59:17 +01:00
Simone Bordet fd13361132 Fixed test assumption. 2015-01-09 12:58:14 +01:00
Simone Bordet 8a27385bc3 Merged branch 'jetty-9.2.x' into 'master'. 2015-01-09 12:51:13 +01:00