Commit Graph

6313 Commits

Author SHA1 Message Date
Joakim Erdfelt 2ebdc749db [maven-release-plugin] prepare release jetty-9.0.0.RC0 2013-02-01 10:47:03 -07:00
Joakim Erdfelt 253aef11f8 Updating VERSION.txt top section 2013-02-01 10:09:19 -07:00
Joakim Erdfelt bd6cf83057 Rolling back VERSION.txt 2013-02-01 09:45:10 -07:00
Joakim Erdfelt c075edd4c5 Merge branch 'master' into release-9 2013-02-01 09:44:03 -07:00
Joakim Erdfelt b810ce6535 Adding synchronize for multi-threaded write concerns 2013-02-01 09:20:33 -07:00
Simone Bordet 209d5bc12f 399721 - Change <Ref id= ...> to <Ref refid= ...> 2013-02-01 13:03:11 +01:00
Greg Wilkins 626f10678c Merge remote-tracking branch 'origin/jetty-8'
Conflicts:
	VERSION.txt
	aggregates/jetty-all/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
	jetty-aggregate/jetty-all-server/pom.xml
	jetty-aggregate/jetty-client/pom.xml
	jetty-aggregate/jetty-plus/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-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-nosql/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/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-policy/pom.xml
	jetty-proxy/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-client/pom.xml
	jetty-spdy/spdy-core/pom.xml
	jetty-spdy/spdy-example-webapp/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-util/src/main/java/org/eclipse/jetty/util/UrlEncoded.java
	jetty-util/src/main/java/org/eclipse/jetty/util/Utf8StringBuilder.java
	jetty-util/src/test/java/org/eclipse/jetty/util/URLEncodedTest.java
	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
	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-jetty-webapp/pom.xml
	tests/test-webapps/test-webapp-rfc2616/pom.xml
2013-02-01 22:15:44 +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
Greg Wilkins 7b7a6dc03a jetty-9 added properties to start.ini 2013-02-01 12:08:22 +11:00
Greg Wilkins 29f155143e jetty-9 removed debug 2013-02-01 12:08:22 +11:00
Jan Bartel 6711abe1d7 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2013-02-01 11:28:30 +11:00
Jan Bartel d5f03ea791 websocket-client should not be needed on osgi server test classpath 2013-02-01 11:27:38 +11:00
Greg Wilkins 376114e794 397168 backed of test timing 2013-02-01 10:41:58 +11:00
Joakim Erdfelt 89d8972e74 399689 - Websocket RFC6455 extension handshake fails if server doesn't have extension
+ Fixing the fix that fixed the negotation to fix a bad fixation of the
  negotiated extensions
2013-01-31 16:14:30 -07:00
Joakim Erdfelt 552ec4ae36 399689 - Websocket RFC6455 extension handshake fails if server doesn't have extension
+ Correcting logic in HandshakeRFC6455 with regards to negotiated extensions
2013-01-31 15:36:30 -07:00
Jesse McConnell 9f5b30498a [maven-release-plugin] prepare for next development iteration 2013-01-31 14:10:58 -06:00
Jesse McConnell 61212cb154 [maven-release-plugin] prepare release jetty-9.0.0.RC0 2013-01-31 14:10:50 -06:00
Jesse McConnell 678e038bfb set for release 2013-01-31 13:46:59 -06:00
Jesse McConnell 8b596ca040 Merge branch 'master' into release-9 2013-01-31 13:45:49 -06:00
Joakim Erdfelt 261809380a 395444 - Disabling Websocket Compress Extensions (not working with Chrome / deflate problem)
+ Adding test case example of many server messages in a row
+ Disabling various compression extensions till a solution is found
2013-01-31 12:41:20 -07: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
Joakim Erdfelt 242f7f0f45 399568 - OSGi tests can't find websocket classes
+ Changing classloading in WebSocketServlet to be more OSGi friendly
2013-01-31 12:15:22 -07:00
Joakim Erdfelt 1480f3d8fc 399669 - Remove WebSocketConnection in favor of websocket.api.Session 2013-01-31 12:09:04 -07:00
Joakim Erdfelt 1aa6e63d25 395232 - UpgradeRequest object passed to createWebSocket() has null Session
+ Server side UpgradeRequest.getSession() now has HttpSession (if
  it has already been created)
2013-01-31 11:26:17 -07: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
Joakim Erdfelt 32cb1045ba Fixing logger name 2013-01-31 09:35:27 -07: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
Thomas Becker 6f91d6a590 Merge branch 'spdy_http_proxy' 2013-01-31 15:13:53 +01:00
Thomas Becker 95698ca248 396606 make spdy proxy capable of receiving SPDY and talk HTTP to the upstream server 2013-01-31 15:11:30 +01: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
Jan Bartel 495230579c 399576 Server dumpStdErr throws exception if server is stopping 2013-01-31 15:45:57 +11:00
Jan Bartel 9194fe1b7b 399566 Running org.eclipse.jetty.server.session.MaxInactiveMigrationTest produces stack trace 2013-01-31 15:42:27 +11:00
Greg Wilkins ac7fbaf62b jetty-9 added ServerSentEvent support 2013-01-31 12:21:18 +11:00
Greg Wilkins b132663c2b jetty-9 made WebAppContext configuration additive 2013-01-31 12:21:04 +11:00
Joakim Erdfelt 728201fa3e Making Simone jubilantly happy :-) 2013-01-30 14:02:52 -07:00
Joakim Erdfelt b2951bdf5d 396428 - Test for WebSocket masking on client fragments per RFC 6455 Sec 5.1 2013-01-30 13:51:49 -07:00
Joakim Erdfelt 25b0bd73a6 399516 - Websocket UpgradeException should contain HTTP Request/Response information
+ Added UpgradeException.requestURI and UpgradeException.responseStatusCode
2013-01-30 13:13:29 -07:00
Joakim Erdfelt 60088fa274 399515 - Websocket-client connect issues should report to websocket onError handlers 2013-01-30 12:15:15 -07:00
Joakim Erdfelt f46ad8bbab Using HttpCookieStore.Empty from jetty-util instead 2013-01-30 09:56:09 -07:00
Joakim Erdfelt 5e8aa4eeb3 399421 - Add websocket.api.Session.disconnect() for harsh low level connection disconnect 2013-01-29 15:56:30 -07:00