2552 Commits

Author SHA1 Message Date
Simone Bordet
ca2a23c35d Improved Javadocs and code cleanup. 2014-09-01 11:28:59 +02:00
Greg Wilkins
277ca5c065 fixed merge 2014-08-29 17:54:28 +10:00
Greg Wilkins
a4debf68c4 fixed merge 2014-08-29 16:03:32 +10: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
Greg Wilkins
d8e6331434 442477 Allow Symlink aliases by default 2014-08-27 17:33:27 +10:00
Greg Wilkins
adb56b3d90 Merge remote-tracking branch 'origin/master' into jetty-http2 2014-08-27 12:53:54 +10:00
Greg Wilkins
1a0eb64a1f 442383 Improved insufficient threads message 2014-08-27 12:40:54 +10:00
Greg Wilkins
9a52d92f03 442048 fixed sendRedirect %2F encoding 2014-08-27 12:34:15 +10:00
Greg Wilkins
e5c1d66916 avoid default port in http2 push 2014-08-22 16:25:20 +10:00
Greg Wilkins
984c7fdd85 various updates 2014-08-20 17:54:01 +10:00
Greg Wilkins
9b36f999d1 fixed merge 2014-08-20 12:22:16 +10:00
Greg Wilkins
ae8e7f0067 Merge remote-tracking branch 'origin/master' into jetty-http2 2014-08-20 12:02:09 +10:00
Greg Wilkins
caaa7c508c 440255 ensure 500 is logged on thrown Errors 2014-08-20 11:36:58 +10:00
Greg Wilkins
e15a87f499 440255 ensure 500 is logged on thrown Errors 2014-08-20 10:27:27 +10:00
Simone Bordet
8e62a50500 442086 - Review HttpOutput blocking writes.
Reviewed blocking writes call sites and handled exceptions in the same
way for all of them, calling HttpChannel.abort(Throwable).

Modified HttpChannel.abort() to take the failure as parameter, so that
subclasses may inspect the failure and decide what to do.
2014-08-19 18:37:53 +02: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
a2360bd542 Fixed creation of HttpURI for push requests. 2014-08-14 23:00:21 +02:00
Greg Wilkins
a14d843382 ignored osgi-spdy tests 2014-08-14 15:18:28 +10:00
Greg Wilkins
98b654ba20 Merge remote-tracking branch 'origin/master' into jetty-http2
Conflicts:
	jetty-distribution/pom.xml
2014-08-14 08:38:25 +10:00
Greg Wilkins
2af613a28b improved debugging output 2014-08-13 15:56:02 +10:00
Simone Bordet
14dc4fade0 Updated log statements to use debug() instead of info(). 2014-08-12 22:32:17 +02:00
Simone Bordet
814c84a212 Introduced configuration properties for ALPN/NPN advertised protocols.
No more need to copy protonego-alpn.xml to a jetty.base to specify
which protocols are advertised and in which order.
Instead, simply specify:

alpn.protocols=h2-14,http/1.1
alpn.defaultProtocol=http/1.1

in start.ini (in the example above for http2).
2014-08-12 18:54:33 +02:00
Simone Bordet
d2fa4dca60 Introduced configuration properties for ALPN/NPN advertised protocols.
No more need to copy protonego-alpn.xml to a jetty.base to specify
which protocols are advertised.
Instead, simply specify:

protonego.protocols=h2-14,http/1.1
protonego.defaultProtocol=http/1.1

in start.ini (in the example above for http2).
2014-08-11 23:59:26 +02:00
Greg Wilkins
5da39140df remove old TODOs 2014-08-08 18:30:56 +10:00
Greg Wilkins
4d7ead76ce basic push cache filter 2014-08-08 17:01:05 +10:00
Greg Wilkins
6dfa452e29 case insensitive protocols 2014-08-07 19:00:31 +10:00
Greg Wilkins
55aa2a07b4 Merge remote-tracking branch 'origin/master' into jetty-http2 2014-08-07 15:29:12 +10:00
Greg Wilkins
1d5998f02e 441073 isEarlyEOF on HttpInput 2014-08-07 15:05:22 +10:00
Greg Wilkins
287e86b7aa decomposed https,http2 and spdy modules to share ServerConnector 2014-08-07 12:58:12 +10:00
Greg Wilkins
a4d4b3ab57 fix work around classloaders for field preencoders 2014-08-07 09:22:22 +10:00
Greg Wilkins
17f46665df preencoded httpfield optimisation 2014-08-06 21:09:26 +10:00
Greg Wilkins
b5971484a5 Basic push mechanism skeleton 2014-08-06 10:50:55 +10:00
Greg Wilkins
bec34b460f optimised HttpFields 2014-08-05 17:26:27 +10:00
Greg Wilkins
6b3c8d06a9 partial 100 continues support in http2 2014-08-05 16:14:53 +10:00
Greg Wilkins
aaa2e5c6c1 refined PathResource alias handling 2014-08-02 12:58:24 +10: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
fa9b60c77e Merge remote-tracking branch 'origin/jetty-http2' into pathresource 2014-08-01 10:17:42 +10:00
Greg Wilkins
78165ce5ff fixed merge 2014-08-01 09:51:57 +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
Greg Wilkins
f970ffc0ac Misc cleanups done whilst fixing 435322 2014-08-01 09:02:44 +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
70dafa8eb3 simplified HttpTransport API 2014-07-31 11:53:51 +10:00
Greg Wilkins
5d8780cb4e Record some TODOs 2014-07-28 15:27:40 +10:00
Greg Wilkins
eaf374fa58 refactored Dispatcher for new HttpURI 2014-07-25 17:28:35 +10:00