diff options
| author | Simone Bordet | 2015-12-08 21:20:28 +0000 |
|---|---|---|
| committer | Simone Bordet | 2015-12-08 21:20:28 +0000 |
| commit | 4ea1bb0233206f62fecf7d994d8ab1de05d52ea2 (patch) | |
| tree | 08737027c94c98fd53e5e9e50c1593284a05931b /jetty-fcgi | |
| parent | a0c00236f31c6f49b728929f05afd891234526a6 (diff) | |
| parent | 8d6206b8c72a26cc7f3a569d4f68fedc825f646a (diff) | |
| download | org.eclipse.jetty.project-4ea1bb0233206f62fecf7d994d8ab1de05d52ea2.tar.gz org.eclipse.jetty.project-4ea1bb0233206f62fecf7d994d8ab1de05d52ea2.tar.xz org.eclipse.jetty.project-4ea1bb0233206f62fecf7d994d8ab1de05d52ea2.zip | |
Merged branch 'jetty-9.3.x' into 'master'.
Diffstat (limited to 'jetty-fcgi')
| -rw-r--r-- | jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpConnectionOverFCGI.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpConnectionOverFCGI.java b/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpConnectionOverFCGI.java index 4d9691de50..0d71cfd3ed 100644 --- a/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpConnectionOverFCGI.java +++ b/jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpConnectionOverFCGI.java @@ -374,9 +374,10 @@ public class HttpConnectionOverFCGI extends AbstractConnection implements Connec close(x); } }; - if (!channel.content(buffer, callback)) - return true; - return callback.tryComplete(); + // Do not short circuit these calls. + boolean proceed = channel.content(buffer, callback); + boolean async = callback.tryComplete(); + return !proceed || async; } else { |