Commit Graph

1659 Commits

Author SHA1 Message Date
Simone Bordet 337d638422 Merged branch 'master' into 'jetty-9.3-ewyk'. 2015-01-06 17:32:12 +01:00
Simone Bordet 379f9f6c43 Merged branch 'jetty-9.2.x' into 'master'. 2015-01-06 17:30:43 +01:00
Simone Bordet 3abfbe26b3 Using the provider string when creating the SSLContext in case of no
keystore.
2015-01-06 17:30:03 +01:00
Greg Wilkins 3ad8f627e7 improved javadoc 2015-01-01 17:32:44 +01:00
Greg Wilkins beacb948b1 Allow configuration of ExecutionStrategy
eg -Dorg.eclipse.jetty.io.ManagedSelector.ExecutionStrategy=org.eclipse.jetty.util.thread.ExecutionStrategy$ExecuteProduceRun
2015-01-01 17:04:00 +01:00
Greg Wilkins 451e27e736 454291 Added busy threads JMX attribute to QueuedThreadPool
Also-by: Tomasz Nurkiewicz <nurkiewicz@gmail.com>
Signed-off-by: Greg Wilkins <gregw@intalio.com>
2014-12-31 16:32:58 +01:00
Greg Wilkins 20fc880c3e Merge branch 'master' into jetty-9.3-ewyk 2014-12-31 16:29:40 +01:00
Greg Wilkins 58faca9e09 430951 Improved ordering of SSL ciphers 2014-12-31 15:45:08 +01:00
Greg Wilkins fd605248dc Bah humbug 2014-12-25 10:21:20 +01:00
Greg Wilkins fecc03a2f5 fixed some more tests after EWYK refactor 2014-12-23 22:20:49 +01:00
Greg Wilkins 3f59bc4c14 refactored HttpConnector for EWYK - work in progress 2014-12-23 17:15:27 +01:00
Greg Wilkins 2a584613ee work in progress on EWYK HTTP 2014-12-21 20:56:36 +01:00
Greg Wilkins e363dd41c2 HttpConnection refactoring work in progress 2014-12-21 15:23:36 +01:00
Simone Bordet 448f150ac4 Cleaned up ExecutionStrategy by adding javadocs, removing methods not
used and renaming classes and methods to better names.
2014-12-19 11:25:09 +01:00
Simone Bordet e35c51eb7d Implemented dispatch to the application using an ExecutionStrategy.
Now instead of having the channel to dispatch when it detects that it
has to call the application (upon receiving a HEADERS frame, or upon
a push "fake" request), now the whole mechanism is controlled by an
ExecutionStrategy.
2014-12-18 17:14:34 +01:00
Greg Wilkins 3b34423b17 EWYK SelectorManager 2014-12-18 17:06:32 +01:00
Greg Wilkins 31e06b5791 refactored jetty-io to not have onFillable statemachine. work in progres... 2014-12-18 14:10:06 +01:00
Greg Wilkins 37e7e5217a updated EWYK strategy 2014-12-17 12:52:17 +01:00
Greg Wilkins f3791a9b06 minor EWYK changes 2014-12-10 13:34:11 +01:00
Greg Wilkins d5feadd241 minor EWYK changes 2014-12-10 13:30:50 +01:00
Jan Bartel bc22ba72dc [maven-release-plugin] prepare for next development iteration 2014-12-05 16:45:12 +01:00
Jan Bartel 1cc075cf98 [maven-release-plugin] prepare release jetty-9.2.6.v20141205 2014-12-05 16:45:01 +01:00
Greg Wilkins 1ff23803f7 453627 Fixed FileSystem test for nanosecond filesystems 2014-12-04 15:02:12 +01:00
Jesse McConnell 127b48c932 [maven-release-plugin] prepare for next development iteration 2014-12-03 09:00:57 -06:00
Jesse McConnell 028f4b9610 [maven-release-plugin] prepare release jetty-9.2.6.v20141203 2014-12-03 09:00:46 -06:00
Jesse McConnell 1263d1f3c8 [maven-release-plugin] prepare for next development iteration 2014-12-03 08:26:47 -06:00
Jesse McConnell 5c7f706496 [maven-release-plugin] prepare release jetty-9.2.6.v20141203 2014-12-03 08:26:35 -06:00
Simone Bordet 007b7dac1c Merged branch 'jetty-9.2.x' into branch 'master'. 2014-11-27 12:01:02 +01:00
Simone Bordet ae3e491f26 453386 - Jetty not working when configuring QueuedThreadPool with minThreads=0.
Fixed by properly initializing the queue capacity and by making sure
that if minThreads=0 at least one thread is always started to handle
the job.
2014-11-27 11:32:59 +01:00
Joakim Erdfelt 07647e8a5f 443652 - Remove dependency on java.lang.management classes
* Created safer Uptime singleton for use
* Removed direct references to java.lang.management from
   - Server.java
   - Log.java
   - AbstractLifeCycle.java
2014-11-25 08:25:35 -07:00
Greg Wilkins a308c087ed Implemented the PROXY protocol
Moved the PROXY protocol support from HttpParser to a ConnectionFactory.
See http://www.haproxy.org/download/1.5/doc/proxy-protocol.txt
2014-11-13 19:55:01 +11:00
Jesse McConnell 09846e324d [maven-release-plugin] prepare for next development iteration 2014-11-12 17:13:19 -06:00
Jesse McConnell 97d2bd95a6 [maven-release-plugin] prepare release jetty-9.2.5.v20141112 2014-11-12 17:13:14 -06:00
Joakim Erdfelt f645b4a399 Merge branch 'jetty-9.2.x' 2014-11-05 11:12:05 -07:00
Greg Wilkins d1ead3dcd6 improved javadoc 2014-11-05 17:53:46 +11:00
Greg Wilkins 50b6391be1 Merge remote-tracking branch 'origin/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
2014-11-05 10:36:57 +11:00
Greg Wilkins 63d6754ea1 449594 Handle ArrayTrie overflow with false return 2014-11-05 10:32:10 +11:00
Jesse McConnell 5d0595cabd [maven-release-plugin] prepare for next development iteration 2014-11-03 13:46:58 -06:00
Jesse McConnell 772ff0bfd4 [maven-release-plugin] prepare release jetty-9.2.4.v20141103 2014-11-03 13:46:52 -06:00
Jesse McConnell 1c4a08b35b [maven-release-plugin] prepare for next development iteration 2014-10-31 09:58:16 -05:00
Jesse McConnell a4ff7bf841 [maven-release-plugin] prepare release jetty-9.2.4.v20141031 2014-10-31 09:58:10 -05:00
Jesse McConnell e1b73a64eb [maven-release-plugin] prepare for next development iteration 2014-10-30 11:28:41 -05:00
Jesse McConnell 5770cc1179 [maven-release-plugin] prepare release jetty-9.2.4.v20141030 2014-10-30 11:28:35 -05:00
Greg Wilkins a6e00bc642 Merge remote-tracking branch 'origin/jetty-9.2.x'
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java
	jetty-util/src/test/java/org/eclipse/jetty/util/resource/AbstractFSResourceTest.java
2014-10-30 14:36:50 +11:00
Greg Wilkins 8eab088a35 443550 improved FileResource encoded alias checking 2014-10-30 14:12:43 +11:00
Jesse McConnell 58eb6740ec [maven-release-plugin] prepare for next development iteration 2014-10-28 14:20:30 -05:00
Jesse McConnell 19a44846cf [maven-release-plugin] prepare release jetty-9.2.4.v20141028 2014-10-28 14:20:24 -05:00
Greg Wilkins b65aed7d10 Merge remote-tracking branch 'origin/jetty-9.2.x' 2014-10-22 22:44:18 +11:00
Greg Wilkins 921381eb7c 448156 Fixed INACTIVE race in IteratingCallback
More code cleanups and review
2014-10-22 22:43:24 +11:00
Greg Wilkins 58b56b0cfb fixed bad merge 2014-10-22 16:47:55 +11:00
Greg Wilkins 3f76eef8d1 Merge remote-tracking branch 'origin/jetty-9.2.x'
Conflicts:
	jetty-util/src/main/java/org/eclipse/jetty/util/IteratingCallback.java
2014-10-22 16:42:23 +11:00
Greg Wilkins 679b8d30f8 448156 Fixed INACTIVE race in IteratingCallback
Additional cleanups of ICB code
2014-10-22 16:40:28 +11:00
Greg Wilkins 4bbd3e9909 Merge remote-tracking branch 'origin/jetty-9.2.x' 2014-10-22 14:08:52 +11:00
Greg Wilkins 34782005b2 448156 Fixed INACTIVE race in IteratingCallback
Simplified the ICB statemachine with the addition of a lock state to handle the case of iterate() called while a
previous process() iteration is just existing.

Also added the CALLED state to replace INACTIVE when a callback is called before PENDING state entered.

renamed INACTIVE to IDLE
2014-10-22 14:06:40 +11:00
Jan Bartel 592265c21f 447627 MultiPart file always created when "filename" set in Content-Disposition 2014-10-22 12:56:59 +11:00
Greg Wilkins ba7f7589cb Merge remote-tracking branch 'origin/jetty-9.2.x' 2014-10-17 14:31:22 +11:00
Greg Wilkins 8bf6b2c62c 444031 Ensure exceptions do not reduce threadpool below minimum
improved the suppression of warnings
2014-10-17 14:29:40 +11:00
Simone Bordet e25e2e2258 Merged branch 'jetty-9.2.x' into 'master'. 2014-10-16 19:48:38 +02:00
Simone Bordet 90e9cfc535 447381 - Disable SSLv3 by default.
Excluded by default also SSLv2Hello.
2014-10-16 19:46:33 +02:00
Simone Bordet 6268421dd0 Merged branch 'jetty-9.2.x' into 'master'. 2014-10-16 18:05:12 +02:00
Simone Bordet aea5070e51 447381 - Disable SSLv3 by default.
Excluded by default SSL, SSLv2 and SSLv3.
2014-10-16 17:53:52 +02:00
Jan Bartel 1729fb045c 446923 SharedBlockingCallback does not handle connector max idle time of Long.MAX_VALUE; BlockerTimeoutException not serializable 2014-10-15 18:17:01 +11:00
Greg Wilkins 6b489c78b6 Merge remote-tracking branch 'origin/jetty-9.2.x' 2014-10-15 11:46:42 +11:00
Greg Wilkins 8a555e669a 444031 Ensure exceptions do not reduce threadpool below minimum 2014-10-15 11:22:53 +11:00
Greg Wilkins 758ce66c8d Merge remote-tracking branch 'origin/jetty-9.2.x'
Conflicts:
	jetty-websocket/pom.xml
	tests/test-sessions/test-mongodb-sessions/pom.xml
2014-10-10 08:53:43 +11:00
Joakim Erdfelt 1f543e9983 System.lineSeparator exists 2014-10-08 11:02:13 -07:00
Jan Bartel 149ee01047 445157 First redeployed servlet leaks WebAppContext 2014-10-01 13:03:39 +10:00
Simone Bordet a8b461fe91 Cosmetics: removed unused imports, cleaned up source code, improved javadocs. 2014-09-26 10:13:16 +02:00
Joakim Erdfelt 90af0a4e5f 437303 - Serving of static filenames with "unwise" characters causes 404
error 

+ Adding testcases for the rest of the unwise characters to show how
PathResource works vs the venerable FileResource
2014-09-24 15:46:08 -07:00
Simone Bordet ffa0fc73a9 Made methods return boolean to indicate whether the update was
successful or not.
2014-09-23 11:33:16 +02:00
Simone Bordet f02194d405 Made methods return boolean to indicate whether the update was
successful or not.
2014-09-12 12:58:35 +02:00
Joakim Erdfelt 9249ebb6ef Using 9.2.4-SNAPSHOT for branch 2014-09-11 06:10:44 -07:00
Joakim Erdfelt 2755746def Merge branch 'jetty-http2' 2014-09-11 05:56:55 -07:00
Joakim Erdfelt 3e4c9909e0 443652 - Remove dependency on java.lang.management classes
* Created safer Uptime singleton for use
* Removed direct references to java.lang.management from
   - Server.java
   - Log.java
   - AbstractLifeCycle.java
2014-09-10 10:30:26 -07:00
Greg Wilkins 40d84ff1e3 443662 Consume buffer in write(ByteBuffer) 2014-09-10 17:41:14 +10:00
Greg Wilkins 5011993ddf Merge remote-tracking branch 'origin/master' into jetty-http2
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-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-osgi/test-jetty-osgi/src/test/java/org/eclipse/jetty/osgi/test/TestJettyOSGiBootWithJsp.java
	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-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
2014-09-10 14:38:18 +10:00
Greg Wilkins c80f556139 Update Password.java
Fixed typo.

Trivial fix from github/pull/21
2014-09-10 10:06:00 +10:00
Jesse McConnell 88b19abf52 [maven-release-plugin] prepare for next development iteration 2014-09-05 09:19:30 -05:00
Jesse McConnell 9bfeb2221f [maven-release-plugin] prepare release jetty-9.2.3.v20140905 2014-09-05 09:19:23 -05:00
Simone Bordet 3fa302e287 Removed BenchmarkHelper in favour of the version present in the jetty-test-helper. 2014-09-05 15:04:38 +02:00
Greg Wilkins 07ec47adfa improved SSL debug logging 2014-09-04 19:09:39 +10:00
Greg Wilkins 5b97d652e1 Merge remote-tracking branch 'origin/master' into jetty-http2
Conflicts:
	jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn.mod
	jetty-http/src/main/java/org/eclipse/jetty/http/HttpParser.java
	jetty-npn/jetty-npn-server/src/main/config/modules/protonego-impl/npn.mod
	jetty-spdy/spdy-http-server/src/main/java/org/eclipse/jetty/spdy/server/http/HttpChannelOverSPDY.java
2014-09-04 17:43:18 +10:00
Greg Wilkins 610bac49b9 435322 Added a idleTimeout to the SharedBlockerCallback 2014-09-04 09:30:21 +10:00
Greg Wilkins ed8abd1d53 443049 Improved HttpParser illegal character messages 2014-09-04 09:27:42 +10:00
Greg Wilkins 5be1fb6270 Merge remote-tracking branch 'origin/master' into jetty-http2
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
2014-09-03 15:19:54 +10:00
Greg Wilkins 0a2aeb54a1 435322 Added a idleTimeout to the SharedBlockerCallback 2014-09-03 10:46:18 +10:00
Simone Bordet bb1d4946bc Merged branch 'master' into 'jetty-http2'. 2014-09-02 10:25:31 +02:00
Simone Bordet 7be9f0d7a4 Fixed doStop() to call super before interrupting the reference queue thread. 2014-09-01 21:16:40 +02:00
Greg Wilkins 5507e267ae Merge remote-tracking branch 'origin/master' into jetty-http2
Conflicts:
	jetty-server/src/main/config/etc/jetty-https.xml
	jetty-server/src/main/config/modules/ssl.mod
	jetty-start/src/main/java/org/eclipse/jetty/start/Modules.java
2014-08-29 15:49:25 +10:00
Greg Wilkins 69390954dc 435322 acceptor and selector configuration/priority 2014-08-29 15:36:19 +10:00
Greg Wilkins edcb56ae6b Merge remote-tracking branch 'origin/master' into jetty-http2
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpOutput.java
2014-08-29 12:41:52 +10:00
Greg Wilkins eee2ba206e 435322 Added a idleTimeout to the SharedBlockerCallback 2014-08-29 11:55:06 +10:00
Jan Bartel 0aeebc4ec0 435988 ContainerLifeCycle: beans never stopped on remove 2014-08-27 17:13:07 +10:00
Jan Bartel 8ce96cdd2e 441475 org.eclipse.jetty.server.ResourceCache exceptions under high load 2014-08-27 14:46:22 +10:00
Greg Wilkins 1c71040eca moved config plugin to profile 2014-08-15 19:53:52 +10:00
Greg Wilkins b47f9ef605 cleaned up OSGi manifest creation 2014-08-15 19:35:49 +10:00
Simone Bordet 015c34d865 Fixed handling of the close state in case it's already closed. 2014-08-06 15:21:33 +02:00
Greg Wilkins aaa2e5c6c1 refined PathResource alias handling 2014-08-02 12:58:24 +10:00
Joakim Erdfelt 38501a9e97 On alias resolution in PathResource, ignore NoSuchFileException (its a
valid and common path for 404 requested resources)
2014-08-01 14:34:21 -07:00
Simone Bordet 161bccda22 Merged branch 'master' into 'jetty-http2'. 2014-08-01 14:02:53 +02:00
Jan Bartel 75c92bf76a 438500 Odd NoClassDef errors when shutting down the jetty-maven-plugin via the stop goal 2014-08-01 12:44:30 +10:00
Greg Wilkins 97d723c516 deprecate FileResource 2014-08-01 10:45:11 +10:00
Greg Wilkins fa9b60c77e Merge remote-tracking branch 'origin/jetty-http2' into pathresource 2014-08-01 10:17:42 +10:00
Greg Wilkins b439549793 Merge remote-tracking branch 'origin/master' into jetty-http2
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpConnection.java
2014-08-01 09:50:20 +10:00
Greg Wilkins 785c45d899 Merge remote-tracking branch 'origin/master' into pathresource 2014-08-01 09:49:59 +10:00
Joakim Erdfelt 3c716a72e7 Ignoring bad/canonical uri alias 2014-07-31 16:45:36 -07:00
Greg Wilkins f970ffc0ac Misc cleanups done whilst fixing 435322 2014-08-01 09:02:44 +10:00
Joakim Erdfelt b44a29e86b Merge branch 'pathresource' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into pathresource 2014-07-31 15:17:01 -07:00
Joakim Erdfelt 33435fad3d Making bad alias discovery more obvious (temporary) 2014-07-31 15:16:44 -07:00
Joakim Erdfelt a0908bf9d8 Minor documentation updates 2014-07-31 13:56:02 -07:00
Joakim Erdfelt 6048343fee Enhancing NTFS Stream tests 2014-07-31 10:09:53 -07:00
Joakim Erdfelt 971e1f0aaa When test failure occurs, give more details 2014-07-31 08:41:35 -07:00
Greg Wilkins 0dbf684298 Added alias tests to FileSystemResourceTest 2014-07-31 15:22:12 +10:00
Greg Wilkins 252933891c Merge branch 'master' into pathresource
Conflicts:
	jetty-util/src/test/java/org/eclipse/jetty/util/resource/ResourceTest.java
2014-07-31 14:05:26 +10:00
Greg Wilkins a14b2be0e6 Merge branch 'jetty-http2' into refset 2014-07-31 11:58:30 +10:00
Greg Wilkins e415de44c6 Eat what you kill strategy avoids double dispatch 2014-07-31 08:58:19 +10:00
Greg Wilkins 489830a0b2 Prototype execution strategy 2014-07-30 18:08:54 +10:00
Greg Wilkins c13be6d932 Merge branch 'jetty-http2' into refset
Conflicts:
	jetty-http2/http2-hpack/src/test/java/org/eclipse/jetty/http2/hpack/HpackEncoderTest.java
2014-07-25 18:33:10 +10:00
Greg Wilkins 30123607c6 Major refactor of metadata and HttpURI
This refactor strives to remove duplication between the Metadata class and the HttpURI class.

Both classes have been made mutable (as they partially were anyway so best not to pretend).

HttpURI now holds the decomposed strings rather than a single string with indexes. This allows it to be rebuilt after changing just parts of the URI. It is now a lot more similar to the
JVM URI class and we could consider replacing it (after checking peformance).

Next step is to refactor the Request class to prevent it duplicating these fields.
2014-07-24 15:49:52 +10:00
Joakim Erdfelt cb42ef2167 [maven-release-plugin] prepare for next development iteration 2014-07-23 11:18:01 -07:00
Joakim Erdfelt dc62cb5ac7 [maven-release-plugin] prepare release jetty-9.2.2.v20140723 2014-07-23 11:17:55 -07:00
Greg Wilkins fa3d7d0f7e Merge remote-tracking branch 'origin/master' into jetty-http2
Conflicts:
	jetty-servlet/src/test/java/org/eclipse/jetty/servlet/AsyncContextDispatchWithQueryStrings.java
2014-07-23 16:53:13 +10:00
Greg Wilkins 3a6879d3e8 expanded tabs in indents 2014-07-23 16:49:05 +10:00
Simone Bordet 467773dbdf Merged branch 'master' into 'jetty-http2'. 2014-07-22 21:14:46 +02:00
Simone Bordet 4daba1ba79 Restored IteratingCallback APIs (in particular the completed()
method) to keep compatibility over micro versions of Jetty.

Removed getState() - can't return a private class from a protected
method, plus it was only used in a toString() with the wrong
formatting string, that was already printing the state.

Removed also final modifiers to keep compatibility.
2014-07-22 19:32:13 +02:00
Simone Bordet 987800c419 440122 - Remove usages of ForkInvoker. 2014-07-22 16:36:15 +02:00
Greg Wilkins 7f62f2600b refactored URI handling 2014-07-20 10:23:47 +10:00
Greg Wilkins fb2a67c0f9 Merge remote-tracking branch 'origin/master' into jetty-http2 2014-07-19 00:49:37 +10:00
Greg Wilkins b38a978eac 439067 Improved graceful stop timeout handling 2014-07-19 00:46:55 +10:00
Greg Wilkins 89a816843f removed refset from hpack 2014-07-18 15:59:41 +10:00
Greg Wilkins a537fefd6b Merge remote-tracking branch 'origin/master' into jetty-http2 2014-07-18 15:28:54 +10:00
Joakim Erdfelt c4c8426069 439507 - Possible timing side-channel when comparing MD5-Credentials
+ Using correct digestMismatch logic
+ Fixing test cases:
  + No longer reuses / shares directories
  + Is now Windows build/test compatible
  + No longer deleteOnExit() the test data
    (let maven clean and/or test init do that)
  + Empty directories are now verified
  + Using server.getURI() instead of URL string manipulation
2014-07-17 17:55:22 -07:00
Greg Wilkins 12b522d796 439507 Avoid timing leak in MD5 compare
Also-by: Benny Baumann<BenBE@cacert.org>
2014-07-17 12:42:59 +10:00
Greg Wilkins 64e5c1e0ce Merge remote-tracking branch 'origin/master' into jetty-http2 2014-07-17 11:32:27 +10:00
Greg Wilkins 591eedcb59 [FindBugs] Include explicit typing whereever possible
+ No cleanup regarding unchecked types (yet)
2014-07-17 10:47:49 +10:00
Greg Wilkins 0c66f3a68e [FindBugs] Ensure resources are closed/freed properly
Removing dumb connector.close during server.getURI()
2014-07-17 10:00:26 +10:00
Greg Wilkins ce63ab2290 Ensure everything is finalized properly, especially that the lock is unlocked
The issue here was that due to the method call there was no guarantee that the unlock was reached in case of an exception.
Restructuring the code like this provides this guarantee
2014-07-17 08:51:45 +10:00
Joakim Erdfelt 5be27516a4 [FindBugs] Remove unnecessary template specialization 2014-07-17 08:31:08 +10:00
Greg Wilkins 4d2a580c2c 439375 preferred rfc7231 format is mime;charset=lowercase-9 2014-07-11 17:56:08 +10:00
Greg Wilkins 5e281dd449 Merge remote-tracking branch 'origin/master' into jetty-http2
Conflicts:
	jetty-util/src/main/java/org/eclipse/jetty/util/IteratingCallback.java
2014-07-10 14:43:39 +10:00
Greg Wilkins 55ca09a00e 438190 findbug improvements 2014-07-10 14:41:32 +10:00
Joakim Erdfelt 0c7de2e5bd 438331 - AbstractLogger.debug(String,long) infinite loop
+ Breaking infinit loop
2014-07-09 08:54:10 -07:00
Greg Wilkins ca1a9ceb7c fixed merge issues 2014-07-04 23:22:40 +10:00
Greg Wilkins 706fe1eba3 Merge remote-tracking branch 'origin/master' into jetty-http2 2014-07-03 16:01:37 +10:00
Greg Wilkins 7fbf521d4e 438204 correctly wrap IPv6 hostnames in URIs generated by jetty 2014-07-03 10:11:16 +10:00
Greg Wilkins 78b03c5b8e More debug for intermittent failures 2014-07-02 16:01:00 +10:00
Greg Wilkins 6eceb6bd99 Merge remote-tracking branch 'origin/master' into jetty-http2 2014-06-29 08:11:41 +02:00
Greg Wilkins 9b764ef3fa 435322 Fixed Iterating Callback close 2014-06-27 20:43:12 +02:00
Joakim Erdfelt d49ecdf1d6 Minor tweak for windows testcase expecting IllegalArgumentException 2014-06-26 09:14:04 -07:00
Joakim Erdfelt 56751dfa72 Merge branch 'master' into pathresource 2014-06-26 08:56:43 -07:00
Simone Bordet 2608af8f0d Merged branch 'origin/master' into 'jetty-http2'. 2014-06-26 11:54:50 +02:00
Simone Bordet 02271b29f5 Removed Action.FAILED, since it was never used and cluttered the
implementation. Subclasses should just either throw an exception or
directly call failed(Throwable).
2014-06-26 09:41:15 +02:00
Joakim Erdfelt 39079d4e84 Tweaking for windows test conditions 2014-06-25 15:29:18 -07:00
Joakim Erdfelt 9f844383cd Making PathResource the default for "file://" resources
+ Making ResourceTest a proper @Parameterized test case
+ Moving jar tests out of ResourceTest into JarResourceTest
+ Moving classpath tests out of ResourceTest into ClassPathResourceTest
+ Making more improvements to PathResource to satisfy expecations in
  the rest of the codebase.
+ Requests for resource subpaths that use "//" in their strings will
  now work correctly (it used to result in null requests in
  FileResource)
2014-06-25 14:11:44 -07:00
Greg Wilkins a746d78951 438079 435322 Fixed Iterating Callback fail handling and removed per send instance 2014-06-25 19:20:03 +02:00
Joakim Erdfelt 45a0690ba7 More PathResource updates.
+ Fixing up PathResource.list() per recommendations by @ash2k (on github)
+ Adding PathResource.getAlias() to conform to expectations
2014-06-25 10:07:41 -07:00
Simone Bordet e63ceabafe Merged branch 'origin/master' into 'jetty-http2'. 2014-06-25 17:29:36 +02:00
Joakim Erdfelt 2a943887b6 437800 - URLs with single quote and spaces return 404
+ Expanded FileResourceTest
+ Added PathResource + PathResourceTest to show java.nio.file
  alternative approach (currently POC)
2014-06-25 06:53:22 -07:00
Simone Bordet 66f3913527 Merged branch 'origin/master' into 'jetty-http2'. 2014-06-25 12:34:19 +02:00
Simone Bordet 3ff4195dbc Guarded calls to LOG.debug() with if (LOG.isDebugEnabled()) to reduce allocation of varargs Object[]. 2014-06-25 12:26:45 +02:00
Greg Wilkins f93a409589 Merge remote-tracking branch 'origin/master' into jetty-http2 2014-06-24 17:33:51 +02:00
Greg Wilkins 31ce7cabda 437800 Improved alias handling of different encodings 2014-06-24 11:32:56 +02:00
Greg Wilkins 140e7ed0c5 encoder headers as lowercase 2014-06-18 10:22:23 +02:00
Simone Bordet 334db9fe72 Updated version to 9.3.0-SNAPSHOT. 2014-06-16 21:33:03 +02:00
Greg Wilkins 5883123d07 Merge remote-tracking branch 'origin/master' into jetty-http2 2014-06-10 09:01:21 +02:00
Jesse McConnell c3ee0711ca [maven-release-plugin] prepare for next development iteration 2014-06-09 13:37:54 -05:00
Jesse McConnell 06b494eeac [maven-release-plugin] prepare release jetty-9.2.1.v20140609 2014-06-09 13:37:49 -05:00
Jesse McConnell 10b6c574ae Merge branch 'master' into release-9 2014-06-09 13:07:22 -05:00
Greg Wilkins 0d64434b27 435322 Improved debug 2014-06-09 18:35:23 +02:00
Greg Wilkins 3c321e9b8f split authority field and hold results in header table 2014-06-09 15:34:09 +02:00
Greg Wilkins d7fbd89a75 working decoder that can handle D3 and D4 examples from draft 2014-06-09 01:11:04 +02:00
Greg Wilkins ae4dea3e1e near 100% test coverage of NBitInteger, Huffman and HpackContext 2014-06-08 15:17:39 +02:00
Greg Wilkins 58ed30e710 header table mostly functional 2014-06-08 11:10:34 +02:00
Greg Wilkins bb4d42f139 Merge remote-tracking branch 'origin' into jetty-http2 2014-06-04 15:09:19 +02:00
Greg Wilkins 8f4aeeeb8d updated version to 10.0.0-SNAPSHOT 2014-06-04 15:08:54 +02:00
Greg Wilkins ac4f8a26b7 435322 Protect blocker against null failed callback 2014-06-04 13:39:58 +02:00
Joakim Erdfelt cfe99742d9 Due to JettyAwareLogger, the Slf4j minimum requirement is version 1.6 2014-06-03 15:34:21 -07:00
Jesse McConnell 2e859e4ae2 [maven-release-plugin] prepare for next development iteration 2014-05-26 12:04:15 -05:00
Jesse McConnell 71ad2114c5 [maven-release-plugin] prepare release jetty-9.2.0.v20140526 2014-05-26 12:04:08 -05:00
Jesse McConnell d59dbe936b [maven-release-plugin] prepare for next development iteration 2014-05-23 09:59:19 -05:00
Jesse McConnell edc7646a4c [maven-release-plugin] prepare release jetty-9.2.0.v20140523 2014-05-23 09:59:13 -05:00
Joakim Erdfelt bcf52e14f0 435206 - Can't add Cookie header on websocket ClientUpgradeRequest
+ Fixed competing cookie setters between WebSocketClient's use of
  CookieStore and UpgradeRequest.setCookies()
+ Added some utility methods to LazyList (for lack of existence of
  ListUtil or CollectionUtil in jetty-util)
2014-05-20 11:57:35 -07:00
Simone Bordet 7918a58c71 Using Callback.Adapter.INSTANCE to avoid unneeded allocations. 2014-05-19 18:49:17 +02:00
Joakim Erdfelt b515da6456 Import cleanup 2014-05-12 12:47:46 -07:00
Joakim Erdfelt 707e9b5dda 434679 - Log static initialization via jetty-logging.properties fails sometimes
+ More cleanup of Log initialization to better use JDK7 features,
  and to not use other parts of Jetty that might initialize Logging
  itself.  As these are the causes of the bad initialization failures.
2014-05-12 12:43:07 -07:00
Joakim Erdfelt 8e3921b615 Setting up windows-7 specific logging for AnnotatedMaxMessageSize test failure 2014-05-12 10:38:20 -07:00
Greg Wilkins f26291f5b6 433849 FileResource string compare fix 2014-05-06 10:45:10 +02:00
Greg Wilkins 894fb6bfc0 increment Version 2014-05-05 19:09:19 +02:00
Jan Bartel 943fb64176 433841 Resource.newResource() declares an exception it does not throw 2014-05-05 15:45:30 +02:00
Greg Wilkins 51c5a4c833 425421 ContainerLifeCycle does not start added beans in started state 2014-05-05 14:53:53 +02:00
Simone Bordet c4b5e3d3d7 Introduced CompletableCallback to handle asynchronous content on clients. 2014-05-04 23:14:45 +02:00
Greg Wilkins 11096e8a0d Added ASYNC_WOKEN state to HttpChannelState 2014-05-03 10:29:20 +02:00
Greg Wilkins 2e261b75d6 433692 improved buffer resizing 2014-04-29 20:36:13 +02:00
Greg Wilkins bdecc7bd89 433479 Improved resource javadoc 2014-04-25 14:36:59 +02:00
Greg Wilkins 15661722b3 433483 sync log initialize 2014-04-25 14:22:57 +02:00
Greg Wilkins deb7102e0e 404511 removed deprecated StringMap 2014-04-11 10:57:39 +10:00
Greg Wilkins 866960d5d7 431094 Consistent handling of utf8 decoding errors 2014-04-10 15:52:15 +10:00
Greg Wilkins 7adba8d033 431094 Consistent handling of utf8 decoding errors 2014-04-10 15:14:46 +10:00
Greg Wilkins 4dbabd72f2 429734 Implemented the HA ProxyProtocol 2014-04-04 08:47:37 +11:00
Greg Wilkins c5e1e249e7 set version for 9.2.x 2014-03-31 11:35:06 +11:00