11406 Commits

Author SHA1 Message Date
Jan Bartel
43a28a5080 480272 Update to newer jdt ecj version 2015-10-21 15:26:26 +11:00
Greg Wilkins
323143eea6 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2015-10-21 11:52:40 +11:00
Simone Bordet
5c8c590398 Merged branch 'jetty-9.3.x' into 'master'. 2015-10-20 23:23:25 +02:00
Simone Bordet
cbb7be040f 480260 - HPack decode error for buffers with offset.
Fixed calculations to advance the ByteBuffer.
2015-10-20 23:19:10 +02:00
Joakim Erdfelt
a01565fbc4 478757 - DebugHandler thread name is mangled
+ Removing scheme check, now that HttpURI is sane
2015-10-20 11:56:43 -07:00
Joakim Erdfelt
3e460dd219 480162 - Continuations behavior differences due to HttpURI behavior
+ When fixing URI.absolute with authority, default to scheme 'http'
  (allowing things like SecureRequestCustomizer to change it again
   to 'https')
2015-10-20 11:55:45 -07:00
Joakim Erdfelt
22573be353 Fixing format error on toString() 2015-10-20 11:28:19 -07:00
Joakim Erdfelt
fae4f5d43f Merge branch 'jetty-9.3.x' 2015-10-19 11:59:44 -07:00
Joakim Erdfelt
8eda037de0 Merge branch 'jetty-9.3.x' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9.3.x 2015-10-19 11:59:21 -07:00
Joakim Erdfelt
435ce8c3ab 478757 - DebugHandler thread name is mangled
+ Replicating reopened bug with double-scheme https
  in testcase
+ Adding safety check for https in thread name determination
2015-10-19 11:58:04 -07:00
Joakim Erdfelt
c068b95b26 Bumping up to 9.4.0-SNAPSHOT 2015-10-19 09:56:09 -07:00
Simone Bordet
a6ba51fe24 Deprecated ConnectionPool. 2015-10-19 18:13:12 +02:00
Simone Bordet
964afc3020 Merged branch 'jetty-9.3.x' into 'master'. 2015-10-19 12:35:26 +02:00
Simone Bordet
3c26ffb227 480061 - HTTP/2 server doesn't send GOAWAY frame when shutting down.
Fixed by overriding Connection.close() and sending the GOAWAY from
there, which is triggered when the SelectorManager stops.

This allowed simplification of client code too.
2015-10-19 12:18:01 +02:00
Greg Wilkins
1ebb470a38 479179 Fixed NPE from debug 2015-10-17 09:39:19 +11:00
Greg Wilkins
570c751ec8 479179 Fixed NPE from debug 2015-10-17 09:37:43 +11:00
Jan Bartel
e1bade217f 479839 Regression when starting application with excessive scan times 2015-10-16 15:43:48 +11:00
Jan Bartel
27a41a4f77 479839 Regression when starting application with excessive scan times 2015-10-16 15:16:43 +11:00
Greg Wilkins
cfeee5cec7 479903 - improve async onError handling 2015-10-16 14:51:57 +11:00
Joakim Erdfelt
cce79f9822 Adding ORIGIN header 2015-10-15 14:58:56 -07:00
Joakim Erdfelt
15ee24585e 479678 - Support HTTP/1.1 Upgrade in HttpClient
+ Adding Connection.UpgradeFrom support to HttpConnectionOverHTTP
+ (Soft) Closing HttpConnectionOverHTTP on upgrade
+ Removing 'extends Connection' from Connection.UpgradeFrom and
  Connection.UpgradeTo to allow for use from components that
  delegate bytebuffer handling away from raw Connection
2015-10-15 09:18:03 -07:00
Jan Bartel
e00b56967a 479832 Use system properties for gcloud config for GCloudDatastore session manager 2015-10-15 19:43:34 +11:00
Greg Wilkins
72d97f77cc fixed client test 2015-10-15 17:19:06 +11:00
Greg Wilkins
0b98996745 fixed cherry pick 2015-10-15 16:27:57 +11:00
Greg Wilkins
d5dab98546 start.jar uses shaded jetty-util classes 2015-10-15 15:42:28 +11:00
Greg Wilkins
b9dbf7111d Use TopologicalSort for start.jar 2015-10-15 15:42:28 +11:00
Greg Wilkins
de14c51627 improved javadoc 2015-10-15 15:42:28 +11:00
Greg Wilkins
2772f147e5 Re-implemented relative web fragment ordering using a topological sort
Conflicts:
	jetty-webapp/src/main/java/org/eclipse/jetty/webapp/Ordering.java
2015-10-15 15:41:48 +11:00
Greg Wilkins
58e282fa6c Added file headers to TopologicalSort 2015-10-15 15:40:35 +11:00
Greg Wilkins
20cb70935c Improved TopologicalSort javadoc 2015-10-15 15:40:35 +11:00
Greg Wilkins
32c71261e1 Topological sort utility 2015-10-15 15:40:35 +11:00
Jan Bartel
c792677db4 472675 No main manifest attribute, in jetty-runner regression 2015-10-15 10:11:10 +11:00
Jan Bartel
71bd387a58 472675 No main manifest attribute, in jetty-runner regression 2015-10-15 10:10:06 +11:00
Greg Wilkins
9866b31420 479712 Documented --approve-all-licenses 2015-10-15 09:47:03 +11:00
Greg Wilkins
d7121881b3 479712 Documented --approve-all-licenses 2015-10-15 09:46:23 +11:00
Greg Wilkins
7c509b4d8c Revert "479712 Added --yes to start.jar"
This reverts commit 4560dabfc2e69471ca05aacdb6faa775ac6ef55e.
2015-10-15 09:40:53 +11:00
Greg Wilkins
6e203c1ffa Revert "479712 Added --yes to start.jar"
This reverts commit 14b638f8f7bc2e20bc2e15efb3be131c9b9880d1.
2015-10-15 09:39:37 +11:00
Joakim Erdfelt
f0deae82d4 479678 - Support HTTP/1.1 Upgrade in HttpClient
+ Changing is upgrade test in HttpChannelOverHTTP
+ Adding wss to normalizePort / isDefaultPort
+ Adding wss to isSecure
+ Adding wss to proxy handling (for isSecure tests)
2015-10-14 11:16:55 -07:00
Joakim Erdfelt
45de46191b Adding WebSocket headers to HttpHeader 2015-10-14 11:16:55 -07:00
Greg Wilkins
14b638f8f7 479712 Added --yes to start.jar 2015-10-14 18:26:14 +11:00
Greg Wilkins
4560dabfc2 479712 Added --yes to start.jar 2015-10-14 18:24:58 +11:00
Simone Bordet
b0eb18b451 479678 - Support HTTP/1.1 Upgrade in HttpClient.
Initial support.
2015-10-13 22:55:25 +02:00
Joakim Erdfelt
28daeb912d Merge branch 'release-9.3.5' into jetty-9.3.x 2015-10-13 09:07:50 -07:00
Joakim Erdfelt
f052fc30a3 Updating to 9.4.0-SNAPSHOT 2015-10-13 08:53:40 -07:00
Joakim Erdfelt
4dfd68b315 Merge branch 'jetty-9.3.x'
Conflicts:
	aggregates/jetty-all-compact3/pom.xml
	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/cdi-core/pom.xml
	jetty-cdi/cdi-full-servlet/pom.xml
	jetty-cdi/cdi-servlet/pom.xml
	jetty-cdi/cdi-websocket/pom.xml
	jetty-cdi/pom.xml
	jetty-cdi/test-cdi-webapp/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-http2/http2-alpn-tests/pom.xml
	jetty-http2/http2-client/pom.xml
	jetty-http2/http2-common/pom.xml
	jetty-http2/http2-hpack/pom.xml
	jetty-http2/http2-http-client-transport/pom.xml
	jetty-http2/http2-server/pom.xml
	jetty-http2/pom.xml
	jetty-infinispan/pom.xml
	jetty-io/pom.xml
	jetty-jaas/pom.xml
	jetty-jaspi/pom.xml
	jetty-jmx/pom.xml
	jetty-jndi/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/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-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-http-client-transport/pom.xml
	tests/test-integration/pom.xml
	tests/test-jmx/jmx-webapp-it/pom.xml
	tests/test-jmx/jmx-webapp/pom.xml
	tests/test-jmx/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-infinispan-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-10-13 08:53:35 -07:00
Joakim Erdfelt
785167a010 Bumping up gcloud to 9.3.5-SNAPSHOT 2015-10-13 08:39:58 -07:00
Joakim Erdfelt
29d63b41b1 Merge branch 'jetty-9.2.x' into jetty-9.3.x
Conflicts:
	jetty-server/src/test/java/org/eclipse/jetty/server/ServerConnectorHttpServerTest.java
2015-10-13 08:39:45 -07:00
Joakim Erdfelt
b02783220e Renaming old 'SelectChannel*' test for new naming scheme 2015-10-13 08:10:16 -07:00
Joakim Erdfelt
dde32787c4 Updating to version 9.3.6-SNAPSHOT 2015-10-12 15:47:37 -07:00
Joakim Erdfelt
29722bd880 Updating to version 9.3.5.v20151012 jetty-9.3.5.v20151012 2015-10-12 15:10:39 -07:00