11656 Commits

Author SHA1 Message Date
Simone Bordet
279e56d336 481718 - Improve stream interleaving.
Introduced the constraint in the API that Stream.headers() and
Stream.data() calls cannot be invoked if the previous operation did
not complete.

Improved interleaving by appending unfinished DATA frames at the end
of the queue, rather than prepending them.
2015-11-09 21:58:48 +01:00
Simone Bordet
b800ffc983 481717 - Make Callback and Promise CompletableFuture-friendly.
Introduced methods from(CompletableFuture) and subclass Completable.
2015-11-09 17:38:35 +01:00
Simone Bordet
8ed67c009f Removed usages of deprecated Callback.Adapter class. 2015-11-09 12:35:58 +01:00
Joakim Erdfelt
edf686fe0a Updating to version 9.3.7-SNAPSHOT 2015-11-06 12:13:00 -07:00
Joakim Erdfelt
d737e1c638 Updating to version 9.3.6.v20151106 jetty-9.3.6.v20151106 2015-11-06 11:09:32 -07:00
Joakim Erdfelt
ec8f8d3e4f Updating to version 9.2.15-SNAPSHOT 2015-11-06 11:06:48 -07:00
Joakim Erdfelt
ecba378f5c Updating to version 9.2.14.v20151106 jetty-9.2.14.v20151106 2015-11-06 10:32:14 -07:00
Greg Wilkins
4bb63b9e03 481355 Nested Symlinks 2015-11-06 13:54:47 +11:00
Greg Wilkins
7843b7348e 480827 Implemented Unix Domain Socket Connector
Squashed commit of the following:

commit fbb680ba7cdb73495524ea9e5b0f49caee7f68d8
Merge: ed2550b 64ea0db
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Nov 6 10:44:00 2015 +1100

    Merge branch 'master' into unix-socket

commit ed2550b50f978e1984e19fbda642baf450dbe6a1
Merge: 88d7b35 de137ab
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Nov 5 18:41:25 2015 +1100

    Merge branch 'master' into unix-socket

commit 88d7b35f885de2da7dec836e6e4ae2b522d517f0
Merge: 7d4155f 3e2658a
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Nov 5 17:38:27 2015 +1100

    Merge branch 'master' into unix-socket

commit 7d4155fe4a407d493683b66709bc638879b0b422
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Nov 5 17:24:48 2015 +1100

    Unix socket configuration

commit 2737b19f73ad153c20e1762874558a5d62849f90
Merge: cd0cc2e 92cc44c
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Nov 4 15:13:40 2015 +1100

    Merge branch 'master' into unix-socket

    Conflicts:
    	jetty-server/src/main/java/org/eclipse/jetty/server/SecureRequestCustomizer.java

commit cd0cc2ef36a558d948bf26aff4f9e3519da2f823
Merge: 639753b 303f98e
Author: Greg Wilkins <gregw@webtide.com>
Date:   Mon Nov 2 12:21:19 2015 +1100

    Merge branch 'master' into unix-socket

commit 639753b5ed37778d7231acfe9d52039aed66351e
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Oct 30 15:42:58 2015 +1100

    local connectors report NOIP address

commit 6d38c4195f145b99f775a06d546960b119094b0c
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Oct 30 12:11:13 2015 +1100

    Gentler ssl close test

commit 40b46b66a738c9187f859d522a0165bb09b113c8
Merge: b7eb082 fa53b11
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Oct 30 11:09:42 2015 +1100

    Merge branch 'master' into unix-socket

commit b7eb082be44864c058b6f01b10364013596d3650
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Oct 30 08:34:30 2015 +1100

    SecureRequestCustomizer for UnixSockets

commit edbb3c080200b4c6aa2836eff6c81bf31a73a8c1
Merge: 90e8cc0 de7ac72
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Oct 29 19:47:05 2015 +1100

    Merge branch 'master' into unix-socket

commit 90e8cc060ff6dc4b249818db38334ffa543f002f
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Oct 29 19:31:50 2015 +1100

    use proxy connection

commit b1772ef5dcac9ddf9bb5ecda1cda6d038ca21755
Merge: e95a932 9fe7332
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Oct 29 16:46:29 2015 +1100

    Merge branch 'master' into unix-socket

commit e95a932bda5a96bf98ada4fb47664790af2aa0a2
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Oct 28 15:58:25 2015 +1100

    fixed config

commit f8963b2ed6b6b4b96f1d9403194c9d50ab1f12fd
Merge: 9c56b53 8b27484
Author: Greg Wilkins <gregw@webtide.com>
Date:   Wed Oct 28 15:34:28 2015 +1100

    Merge branch 'master' into unix-socket

commit 9c56b53cbec20d98e5cb05cf8d1f668fe84b95e0
Merge: 298a311 39768f8
Author: Greg Wilkins <gregw@webtide.com>
Date:   Mon Oct 26 13:04:34 2015 +1100

    Merge branch 'master' into unix-socket

commit 298a311af952ad3ef5d1c7635deabf47bddaa1c6
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Oct 23 15:24:19 2015 +1100

    Async accepting

commit 8266753d124c04ec8bca8aa02be1ef3d826d6769
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Oct 23 14:45:35 2015 +1100

    set acceptors

commit 6a56c5b9e19063fcb95cdc1228adf723c0d41362
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Oct 23 11:44:54 2015 +1100

    licence

commit d80e5748e6c4327bae57de2af01983990dd2afe0
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Oct 23 11:24:14 2015 +1100

    unixsocket work in progress adding modules

commit cf0c1153d9966cc7182ba29411527b4341c34da6
Merge: 645b671 c39bfa2
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Oct 23 08:52:01 2015 +1100

    Merge branch 'master' into unix-socket

commit 645b6712d37282c26011a95c8c98e45c249b2e5f
Author: Greg Wilkins <gregw@webtide.com>
Date:   Fri Oct 23 08:49:52 2015 +1100

    IP headers

commit 67b210b9ea81af68ce3848a114bbbd1b80a8ca52
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Oct 22 23:48:57 2015 +1100

    working with haproxy

commit e4fce9cf5d896a9a29a7c6280fcaa0336dfcc0f2
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Oct 22 18:25:09 2015 +1100

    unixsocket working

commit 6f013788cad44e6641cd89720c5e7f3652cdc257
Author: Greg Wilkins <gregw@webtide.com>
Date:   Thu Oct 22 15:39:55 2015 +1100

    work in progress
2015-11-06 11:17:46 +11:00
Greg Wilkins
64ea0db9b3 Merge remote-tracking branch 'origin/jetty-9.3.x'
Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
2015-11-06 10:43:32 +11:00
Greg Wilkins
56afc2b0e5 481554 DispatcherType reset race
Cherry pick of fa53b11850eab2162ce4e2c980aaf280c9355ceb

Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
2015-11-06 10:38:08 +11:00
Greg Wilkins
11b5e0edf4 format 2015-11-06 09:12:57 +11:00
Joakim Erdfelt
eae38b4c28 Merge branch 'jetty-9.3.x' 2015-11-05 10:34:53 -07:00
Joakim Erdfelt
c8ec399af2 Merge branch 'jetty-9.2.x' into jetty-9.3.x 2015-11-05 10:34:30 -07:00
Joakim Erdfelt
486e890d5d 481236 - Make ShutdownMonitor java security manager friendly
+ Limit access to specific System properties
2015-11-05 10:33:25 -07:00
Simone Bordet
d8a52315c7 Merged branch 'jetty-9.3.x' into 'master'. 2015-11-05 15:53:15 +01:00
Simone Bordet
e0963543d2 476641 - Proxy rewriteTarget() null return does not call error handler.
Introduced sendProxyResponseError(), centralizing the place where an
error is returned to the client, so that applications may override the
behavior.
2015-11-05 15:51:44 +01:00
Simone Bordet
4cf308a7db Added missing @Override annotations. 2015-11-05 15:46:49 +01:00
Simone Bordet
700975fe41 Merged branch 'jetty-9.3.x' into 'master'. 2015-11-05 12:17:30 +01:00
Simone Bordet
50e565bac0 Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2015-11-05 12:14:28 +01:00
Simone Bordet
b4cf2921c8 Updated ALPN version for JDK 8u65 and 8u66. 2015-11-05 12:05:08 +01:00
Greg Wilkins
de137abcc7 Merge remote-tracking branch 'origin/jetty-9.3.x' 2015-11-05 18:40:48 +11:00
Greg Wilkins
9e19a95d14 PushSessionCacheFilter 2015-11-05 18:40:18 +11:00
Greg Wilkins
fc9f42e11a Merge remote-tracking branch 'origin/jetty-9.3.x' 2015-11-05 18:39:04 +11:00
Greg Wilkins
bd8f0b2dba 481418 ResourceHandler sets last modified 2015-11-05 08:52:03 +11:00
Greg Wilkins
8caef29126 481418 ResourceHandler sets last modified 2015-11-05 08:31:36 +11:00
Simone Bordet
3e2658a41b Merged branch 'jetty-9.3.x' into 'master'. 2015-11-04 18:47:32 +01:00
Simone Bordet
973d95c8bc Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2015-11-04 18:36:36 +01:00
Simone Bordet
af0b6284e5 481437 - Port ConnectHandler connect and context functionality from Jetty 8.
Restored connect and context functionalities.
2015-11-04 18:18:52 +01:00
Simone Bordet
ea04e59637 Fixed typo in logging statement. 2015-11-04 18:18:25 +01:00
Simone Bordet
f717ff5f49 Merged branch 'jetty-9.3.x' into 'master'. 2015-11-04 15:06:10 +01:00
Simone Bordet
afc6b9e5c0 Fixed compilation issues. 2015-11-04 15:00:39 +01:00
Simone Bordet
82d0807863 Merged branch 'jetty-9.3.x' into 'master'. 2015-11-04 13:50:26 +01:00
Simone Bordet
e54fe641df Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2015-11-04 13:49:52 +01:00
Simone Bordet
a1e2d4e8c3 481006 - SSL requests intermittently fail with EOFException when SSL renegotiation is disallowed.
Deprecated HttpConnectionOverFCGI constructor just in case someone uses it.
2015-11-04 13:44:40 +01:00
Simone Bordet
7a34631397 Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2015-11-04 13:40:44 +01:00
Simone Bordet
0172b68301 481006 - SSL requests intermittently fail with EOFException when SSL renegotiation is disallowed.
Fixed by notifying the Connection promise from onOpen() rather than
just after the creation of the connection.
2015-11-04 13:26:27 +01:00
Simone Bordet
670fcf83db Merged branch 'jetty-9.3.x' into 'master'. 2015-11-04 10:46:36 +01:00
Simone Bordet
473d658842 481385 - Incorrect parsing of END_REQUEST frames. 2015-11-04 10:45:01 +01:00
Simone Bordet
2a765afdc6 Improved javadocs and logging. 2015-11-04 10:45:01 +01:00
Jan Bartel
d5649e1d1b 481075 Session statistics are not accurate 2015-11-04 18:15:43 +11:00
Jan Bartel
c63ef3e08b 481373 Corner cases where session may remain in JDBCSessionManager memory 2015-11-04 17:24:38 +11:00
Jan Bartel
06f3486b8d 481373 Corner cases where session may remain in JDBCSessionManager memory 2015-11-04 17:23:42 +11:00
Joakim Erdfelt
92cc44c1a3 Javadoc fix: HttpServletRequest#getPushBuilder() does not exist
+ Fixing bad order (@throws, @param, @return) to correct order @param, @return, @throws
2015-11-02 13:34:49 -07:00
Joakim Erdfelt
2235eab93c Javadoc fix 2015-11-02 13:34:40 -07:00
Joakim Erdfelt
60ed6cd143 Javadoc fix: Invalid member type qualification 2015-11-02 13:33:58 -07:00
Joakim Erdfelt
30888e134b Set what you test 2015-11-02 13:28:45 -07:00
Simone Bordet
36fdf9b788 Merged branch 'jetty-9.3.x' into 'master'. 2015-11-02 18:23:38 +01:00
Simone Bordet
b102bd507a 419966 - Add ContentProvider that submits multipart/form-data.
Second implementation after feedback from the community.
2015-11-02 18:17:51 +01:00
Simone Bordet
5062756135 Merged branch 'jetty-9.3.x' into 'master'. 2015-11-02 12:17:00 +01:00