Commit Graph

7911 Commits

Author SHA1 Message Date
Thomas Becker b54538793b 416251 ProxyHTTPToSPDYConnection now sends a 502 to the client if it receives a rst frame from the upstream spdy server 2013-08-30 17:15:15 +02:00
Thomas Becker 1ad4f89638 416251 ProxyHTTPToSPDYConnection now sends a 502 to the client if it receives a rst frame from the upstream spdy server 2013-08-30 17:15:15 +02:00
Thomas Becker f12afb2888 415548 migrate ProxyHTTPToSPDYTest to use HttpClient to avoid intermittent NPE part 2 2013-08-30 17:15:14 +02:00
Thomas Becker a9955ebc91 cleanup import in HttpConnection 2013-08-30 17:15:14 +02:00
Thomas Becker fcdea1d4b4 416242 respect persistence headers in ProxyHTTPSPDYConnection 2013-08-30 17:15:14 +02:00
Thomas Becker 9565d2647e 415548 migrate ProxyHTTPToSPDYTest to use HttpClient to avoid intermittent NPE part 2 2013-08-30 17:15:14 +02:00
Thomas Becker 936343a3e5 415548 migrate ProxyHTTPToSPDYTest to use HttpClient to avoid intermittent NPE 2013-08-30 17:15:13 +02:00
Simone Bordet 5e3322cd11 Removed unused dependencies. 2013-08-30 16:30:14 +02:00
Greg Wilkins c9ddc8f345 415826 start.jar replace --enable with --module-ini
Fixed up comments in start.ini
2013-08-30 16:30:39 +10:00
Greg Wilkins 5948e8c7c2 jetty-start fixed deploy of jetty.base
Set the jetty.base and jetty.home Properties for webapps/*.xml evaluation
2013-08-30 16:10:35 +10:00
Greg Wilkins 4d6fd407b5 Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-08-30 14:45:42 +10:00
Greg Wilkins 4358302ce0 416102 - Clean up of async sendContent process 2013-08-30 14:45:21 +10:00
Greg Wilkins b5d3aeab0f Merge remote-tracking branch 'origin/master' into jetty-9.1
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
2013-08-30 14:41:33 +10:00
Greg Wilkins 5fce6408d0 Merge branch 'jetty-9.1' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9.1 2013-08-30 14:38:41 +10:00
Greg Wilkins 79fb4287bb Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2013-08-30 14:37:55 +10:00
Greg Wilkins 47c679dabb 416102 - Clean up of async sendContent process 2013-08-30 14:37:43 +10:00
Joakim Erdfelt 7d50302562 Fixing distribution build + demo-base start port 2013-08-29 15:26:31 -07:00
Joakim Erdfelt a5addbeb5a jetty-distribution / making demo-base function? 2013-08-29 15:26:31 -07:00
Jesse McConnell 6d376c174d remove demo mod from distro init line 2013-08-29 16:43:52 -05:00
Jesse McConnell ac30f5c9bd update other jetty mods to new format 2013-08-29 16:39:28 -05:00
Jesse McConnell 6e3094e1b0 [Bug 416143] mod file format uses [type] 2013-08-29 16:13:50 -05:00
Joakim Erdfelt 8a1f12ae81 jetty-start / fixing build + work towards demo-base 2013-08-29 11:49:33 -07:00
Simone Bordet ddca8bc327 Avoid StackOverflowErrors when submitting changes.
These were possible on a busy server, when many new connections are
created, and each triggers read interest: one connection submits the
read interest change, then runs the changes, finds that another
connections is created, runs it, which schedule a read interest
change, and so on.

Now the code is simpler, and while we always offer to the queue,
it may even be faster.
2013-08-29 20:04:01 +02:00
Joakim Erdfelt 78dfd287e3 jetty-start / DownloadArg to its own class + Main cleanup 2013-08-29 08:59:20 -07:00
Joakim Erdfelt de4febf1b9 jetty-start / fixing BaseHomeTest failure 2013-08-29 08:54:12 -07:00
Joakim Erdfelt fad7f94619 jetty-start / removing last remnants of module persistence 2013-08-29 08:53:46 -07:00
Joakim Erdfelt 9a40e12b70 jetty-start / import cleanup + change MODULE= to --module= in usage 2013-08-29 08:36:45 -07:00
Joakim Erdfelt 51b0ea05ee jetty-start / minor cleanup of BaseHome + use canonical file more consistently 2013-08-29 08:36:15 -07:00
Thomas Becker e8130f4201 415605 fix status code logging for async requests 2013-08-29 13:25:04 +02:00
Greg Wilkins 12c7da97e2 Merge remote-tracking branch 'origin/master' into jetty-9.1 2013-08-29 16:57:24 +10:00
Greg Wilkins 9bf83d427b 416103 Added AllowSymLinkAliasChecker.java 2013-08-29 16:44:38 +10:00
Greg Wilkins 2b7462e9a9 416103 Added AllowSymLinkAliasChecker.java 2013-08-29 16:17:15 +10:00
Jan Bartel c183c6fad5 Merge branch 'jetty-9.1' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9.1 2013-08-29 12:59:50 +10:00
Jan Bartel 280000e88a Merge remote-tracking branch 'origin/master' into jetty-9.1
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
	examples/pom.xml
	jetty-annotations/pom.xml
	jetty-ant/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-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-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-overlay-deployer/pom.xml
	jetty-plus/pom.xml
	jetty-proxy/pom.xml
	jetty-rewrite/pom.xml
	jetty-runner/pom.xml
	jetty-security/pom.xml
	jetty-server/pom.xml
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
	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-http-server/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/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-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-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-jetty-webapp/src/main/config/demo/webapps/test.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
2013-08-29 12:59:32 +10:00
Greg Wilkins b884fabba6 Merge branch 'jetty-9.1' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9.1 2013-08-29 12:38:53 +10:00
Greg Wilkins aec807804d 415826 start.jar replace --enable with --module-ini
Added --module-ini and --module-start-ini
jetty.base is set from user.dir
jetty.home is set from start.jar dir
2013-08-29 12:37:50 +10:00
Jan Bartel 35d379a335 416096 DefaultServlet leaves open file descriptors with file sizes greater than response buffer 2013-08-29 12:16:38 +10:00
Joakim Erdfelt be2385276f WebSocket / Fixing support for permessage-deflate extension 2013-08-28 11:49:54 -07:00
Thomas Becker ac156b9111 415780 fix StreamAlreadyCommittedException in spdy build 2013-08-28 17:15:48 +02:00
Greg Wilkins e5b4f37b62 renamed README.txt to README.TXT and updated contents 2013-08-29 00:32:36 +10:00
Greg Wilkins c84063a5f8 415826 start.jar replace --enable with --initialize
refactored impl to be clearer when creating ini
2013-08-28 23:53:32 +10:00
Thomas Becker af1abb7af6 416026 improve error handlig in SPDY parsers 2013-08-28 14:45:39 +02:00
Greg Wilkins c1bd267c17 415826 start.jar replace --enable with --initialize 2013-08-28 15:41:27 +10:00
Greg Wilkins 73cf943b5c Merge branch 'jetty-9.1' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9.1 2013-08-28 09:30:42 +10:00
Greg Wilkins d66778ad06 415826 start.jar module --enable and --disable
morphed mechanism into --initialize based templates
2013-08-28 09:30:03 +10:00
Joakim Erdfelt 20fbd95bf1 395444 - Websockets not working with Chrome (deflate problem)
+ Hopefully final fix to deflate-frame
+ Splitting out extension named 'deflate-frame' (last spec'd standard) from
  'x-webkit-deflate-frame' (standard in use by chrome + safari)
2013-08-27 14:20:07 -07:00
Jan Bartel ac0e30bbb7 415745 Include followed by forward using a PrintWriter incurs unnecessary delay 2013-08-27 17:33:16 +10:00
Greg Wilkins 7d308bf8a5 Merge branch 'jetty-9.1' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9.1
Conflicts:
	jetty-start/src/main/java/org/eclipse/jetty/start/Main.java
	jetty-start/src/main/java/org/eclipse/jetty/start/StartArgs.java
2013-08-27 13:41:20 +10:00
Greg Wilkins 302ffe4ff1 415826 start.jar module --enable and --disable 2013-08-27 13:38:42 +10:00
Greg Wilkins ea21a1798a 415826 start.jar module --enable and --disable 2013-08-27 13:12:22 +10:00