Commit Graph

11382 Commits

Author SHA1 Message Date
Greg Wilkins 1ebb470a38 479179 Fixed NPE from debug 2015-10-17 09:39:19 +11:00
Jan Bartel e1bade217f 479839 Regression when starting application with excessive scan times 2015-10-16 15:43:48 +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
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
Greg Wilkins 9866b31420 479712 Documented --approve-all-licenses 2015-10-15 09:47:03 +11:00
Greg Wilkins 6e203c1ffa Revert "479712 Added --yes to start.jar"
This reverts commit 14b638f8f7.
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
Simone Bordet b0eb18b451 479678 - Support HTTP/1.1 Upgrade in HttpClient.
Initial support.
2015-10-13 22:55:25 +02: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
Mike Jensen 407ca46d94 Fix defect in DoSFilter where semaphore acquires my be leaked
When trying to release the semaphore in the finally block, 'asyncContext.dispatch()' may throw a "RejectedExecutionException".  If this occurs, then the semaphore will never be released.
Ultimately the condition will result in all threads blocking to acquire the semaphore as the DoSFilter is continue to be used.

https://github.com/eclipse/jetty.project/pull/54

Signed-off-By: jentfoo@gmail.com
2015-10-13 08:48:45 +11:00
Mike Jensen 5b0427f9cc Fix defect in DoSFilter where semaphore acquires my be leaked
When trying to release the semaphore in the finally block, 'asyncContext.dispatch()' may throw a "RejectedExecutionException".  If this occurs, then the semaphore will never be released.
Ultimately the condition will result in all threads blocking to acquire the semaphore as the DoSFilter is continue to be used.

https://github.com/eclipse/jetty.project/pull/54

Signed-off-By: jentfoo@gmail.com
2015-10-13 08:46:25 +11:00
btpka3 8f732a423d allow non root user load config from /etc/default/
https://github.com/eclipse/jetty.project/pull/37

Signed-off-by: btpka3 <btpka3@163.com>
2015-10-13 08:41:09 +11:00
btpka3 e571108030 execute throuth ssh without hanging
`ssh root@192.168.1.100 "service jetty restart"` will not exit after start.
https://github.com/eclipse/jetty.project/pull/36

Signed-off-by: btpka3 <btpka3@163.com>
2015-10-13 08:41:09 +11:00
btpka3 6492ef7c78 Allow JETTY_USER to run without `su`
https://github.com/eclipse/jetty.project/pull/35

Signed-off-by: btpka3 <btpka3@163.com>
2015-10-13 08:41:09 +11:00
Greg Wilkins ff8c932b0f Merge branch 'jetty-9.3.x' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9.3.x 2015-10-13 08:37:42 +11:00
Jan Bartel 84ef692be5 Merge branch 'gcloud-session-manager' into jetty-9.3.x 2015-10-13 08:36:36 +11:00
btpka3 b0682ed423 allow non root user load config from /etc/default/
https://github.com/eclipse/jetty.project/pull/37

Signed-off-by: btpka3 <btpka3@163.com>
2015-10-13 08:36:30 +11:00
Jan Bartel 73de40921c Merge branch 'jetty-9.3.x' into gcloud-session-manager 2015-10-13 08:35:50 +11:00
btpka3 dfd32e6790 execute throuth ssh without hanging
`ssh root@192.168.1.100 "service jetty restart"` will not exit after start.
https://github.com/eclipse/jetty.project/pull/36

Signed-off-by: btpka3 <btpka3@163.com>
2015-10-13 08:33:59 +11:00
btpka3 422be53960 Allow JETTY_USER to run without `su`
https://github.com/eclipse/jetty.project/pull/35

Signed-off-by: btpka3 <btpka3@163.com>
2015-10-13 08:30:42 +11:00
Joakim Erdfelt 06593a546c Using 8.0.27 release 2015-10-12 13:15:19 -07:00
Joakim Erdfelt e6ffa35b2c 479584 - WS Session does not contain UpgradeRequest information in WebSocketAdapter.onWebSocketConnect callback
+ Adding missing testcase
+ Adding missing request information
2015-10-12 11:19:50 -07:00
Simone Bordet ccbd626cb2 479537 - Server preface sent after client preface reply.
Fixed by anticipating the onPreface() callback on server before
processing the client preface's SETTINGS frame.
2015-10-12 18:36:53 +02:00
Simone Bordet 3fd8a2e666 479537 - Server preface sent after client preface reply.
Fixed by anticipating the onPreface() callback on server before
processing the client preface's SETTINGS frame.
2015-10-12 17:52:19 +02:00
Joakim Erdfelt dcc3ad3f22 Bumping up apache-jsp to 8.0.27-SNAPSHOT 2015-10-09 10:14:49 -07:00
Joakim Erdfelt b4456d96dd Disabling flappy test 2015-10-09 10:14:35 -07:00
Jan Bartel 43db989f7c 479343 calls to MetaData#orderFragments() with relative ordering adds duplicate jars 2015-10-09 11:52:32 +11:00
Joakim Erdfelt 2cce7510e1 Updating to 9.3.5-SNAPSHOT 2015-10-08 17:49:09 -07:00
Jan Bartel 2bdb4e7474 479343 calls to MetaData#orderFragments() with relative ordering adds duplicate jars 2015-10-09 10:48:16 +11:00
Jan Bartel 7bb1cce754 Fix jmx-webapp-it tests for version 9.4.x 2015-10-09 10:33:09 +11:00
Greg Wilkins b1f963ae59 ForwardedFor module 2015-10-09 10:21:15 +11:00
Joakim Erdfelt 47fbc100af Merge branch 'release-9.3.4' 2015-10-08 10:56:58 -07:00
Jan Bartel 71c2d79daa Merge branch 'master' into gcloud-session-manager 2015-10-08 11:41:49 +11:00