217 Commits

Author SHA1 Message Date
Joakim Erdfelt
3624339ec6 Merge branch 'jetty-9.3.x' 2016-03-16 10:29:29 -07:00
Greg Wilkins
1c5a1fc6a2 Issue #431
Suppress stack traces from unit tests
2016-03-16 18:19:40 +11:00
Joakim Erdfelt
dcfa0b8910 Merge branch 'jetty-9.3.x' 2016-03-15 07:49:28 -07:00
Simone Bordet
26f8deddf7 Introduced Callback.Nested.
Refactored code that was using nested callbacks and removed
unnecessary overrides now that we have default methods.
2016-03-15 15:24:44 +01:00
Simone Bordet
14c985802e Merged branch 'jetty-9.3.x' into 'master'. 2016-03-10 22:32:24 +01:00
Simone Bordet
2af81781cd Issue #258 (Http request to origin server over https proxy contains absolute URL)
Fixed by sending the request target in origin-form (and not in
absolute-form) when request is to a https server.
2016-03-10 22:01:17 +01:00
Simone Bordet
4039f00bda Issue #408 (Http client does not work on https with proxy)
Fixed by not considering authority-form targets to be URIs, so that
the request is correctly copied after a 407.
2016-03-10 16:10:45 +01:00
Simone Bordet
8cefb38788 Code cleanups. 2016-03-10 16:10:45 +01:00
Simone Bordet
ffbd817254 Issue #416 (Support HTTPS forward proxies)
Implemented. We were never checking HttpProxy.isSecure().
Now we do, and if so we wrap the connection factory with an SSL one.
2016-03-10 16:10:45 +01:00
Jan Bartel
a8c29334ca Merge branch 'master' into session-refactor
Conflicts:
	jetty-nosql/src/main/java/org/eclipse/jetty/nosql/NoSqlSession.java
	jetty-nosql/src/main/java/org/eclipse/jetty/nosql/NoSqlSessionManager.java
	jetty-server/src/main/java/org/eclipse/jetty/server/session/AbstractSession.java
	jetty-server/src/main/java/org/eclipse/jetty/server/session/HashSessionManager.java
	jetty-server/src/main/java/org/eclipse/jetty/server/session/HashedSession.java
	jetty-server/src/main/java/org/eclipse/jetty/server/session/MemSession.java
	jetty-server/src/test/java/org/eclipse/jetty/server/session/FileSessionManagerTest.java
	tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/StopSessionManagerDeleteSessionTest.java
	tests/test-sessions/test-mongodb-sessions/src/test/java/org/eclipse/jetty/nosql/mongodb/StopSessionManagerPreserveSessionTest.java
2016-02-01 13:59:12 +01:00
Joakim Erdfelt
ac24196b0d Happy New Year 2016 2016-01-04 14:34:20 -07:00
Joakim Erdfelt
cd39fd84fe Happy New Year 2016 2016-01-04 14:31:22 -07:00
Jan Bartel
31ea1704a1 Make calling passivate/active depend on type of session data store; fix tests 2015-12-11 11:42:29 +11:00
Simone Bordet
7125d52fdf Merged branch 'jetty-9.3.x' into 'master'. 2015-11-25 19:08:29 +01:00
Simone Bordet
d2e4eff686 Made test behave the same for different proxy servlets to reduce
instanceof checks.
2015-11-25 17:21:51 +01:00
Simone Bordet
a686e26c31 Removed debug leftovers. 2015-11-25 16:03:41 +01:00
Simone Bordet
50041395f9 Merged branch 'jetty-9.3.x' into 'master'. 2015-11-25 14:00:19 +01:00
Greg Wilkins
204591ce82 482855 - Content-Length omitted for POST requests with empty body
Removed HTTP 0.9 support
A few code simplifications
Fixed clients relying on Content-Length headers being ignored
2015-11-25 20:50:59 +11:00
Greg Wilkins
ff0d1b4c14 481903 Module Descriptions 2015-11-12 10:48:04 +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
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
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
0bd1e0ad7d 481116 - Introduce connection pooling also for HTTP/2 transport.
Implemented connection pooling for multiplexed transports.
Reworked the ConnectionPool code and its relationship with
HttpDestination.
2015-10-30 15:33:12 +01:00
Simone Bordet
9620598f99 Specified thread pool names for better debugging. 2015-10-29 18:34:59 +01:00
Joakim Erdfelt
4e9b3a2066 Add test timeouts
+ Prevent jetty-proxy from crashing the entire build due
   to bugs in the implementation
2015-10-23 15:03:18 -07:00
Simone Bordet
399755b352 479026 - Wrong CONNECT request idle timeout.
Explicitly set the CONNECT request idle timeout instead of inheriting
HttpClient's.
2015-10-05 11:52:58 +02:00
Simone Bordet
0b381fc31f Fixed test. 2015-09-23 22:23:37 +02:00
Simone Bordet
67f155bcf9 Merged branch 'jetty-9.2.x' into 'master'. 2015-07-28 16:48:54 +02:00
Simone Bordet
837d1a74bb 473624 - ProxyServlet.Transparent / TransparentDelegate add trailing slash before query when using prefix. 2015-07-28 16:39:49 +02:00
Greg Wilkins
e1faa5c1e9 Merge remote-tracking branch 'origin/jetty-9.2.x'
Conflicts:
	jetty-util/src/main/java/org/eclipse/jetty/util/IO.java
	jetty-util/src/test/java/org/eclipse/jetty/util/resource/ResourceTest.java
2015-07-23 11:34:59 +10:00
Greg Wilkins
ac8316756c 473322 - GatherWrite limit handling 2015-07-23 11:32:28 +10:00
Greg Wilkins
607239028c 470727 - Thread Starvation of selector wakeups.
Changed the CallBack.NonBlocking to a default Callback.isNonBlocking, so that wrapping callbacks can determine if they are NonBlocking or not.
2015-07-22 17:31:54 +10:00
Joakim Erdfelt
99ce82e4cd Fixing javadoc 2015-06-22 08:53:30 -07:00
Simone Bordet
e1c251d7df Merged branch 'jetty-9.2.x' into 'master'. 2015-06-15 16:33:04 +02:00
Simone Bordet
3958625993 470184 - Send the proxy-to-server request more lazily. 2015-06-15 16:31:38 +02:00
Joakim Erdfelt
7c737a587b Removing [version] sections in modules 2015-06-12 09:14:34 -07:00
Joakim Erdfelt
916efd6aa7 469860 - Add module metadata versioning to support backwards compat
+ Adding [version] section to all existing jetty 9.3 distro modules
+ Updating testcases in jetty-start with new [version] sections too
+ Adding extra testcases for versioned modules
2015-06-10 10:59:18 -07:00
Simone Bordet
87b1ae44f8 Merged branch 'jetty-9.2.x' into 'master'. 2015-06-05 12:34:47 +02:00
Simone Bordet
9306477f5b 469414 - Proxied redirects expose upstream server name.
Introduced "preserveHost" init-parameter similar to what Apache and
Nginx have.
2015-06-05 12:01:23 +02:00
Simone Bordet
82dc72cac2 Merged branch 'jetty-9.2.x' to 'master'. 2015-05-19 19:10:51 +02:00
Simone Bordet
c7cff6ec7e 467603 - Response 401 from server hangs client. 2015-05-19 19:05:06 +02:00
Greg Wilkins
5d041ad54f 466645 Allow XmlConfiguration Properties to use Elements or Attributes 2015-05-07 16:24:11 +10:00
Simone Bordet
170b1ad8d0 Merged branch 'jetty-9.2.x' into 'master'. 2015-05-05 16:08:56 +02:00
Simone Bordet
4573e20033 464292 - Implement stream-based transformer for AsyncMiddleManServlet.
Added boolean return value from transform(Source, Sink) so that the
implementation can optimize source-to-sink write in case of no
transformations.
2015-05-05 15:54:02 +02:00
Joakim Erdfelt
ed22d7e0de 464727 - Update Javadoc for Java 8 DocLint 2015-04-22 16:11:01 -07:00
Simone Bordet
9983f4680e Merged branch 'jetty-9.2.x' into 'master'. 2015-04-21 12:38:04 +02:00