[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnurl] 117/219: ConnectionExists: improve non-multiplexing
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnurl] 117/219: ConnectionExists: improve non-multiplexing use case |
Date: |
Wed, 22 May 2019 19:17:36 +0200 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to branch master
in repository gnurl.
commit 41fcdf71a1cb530879b19cb097768d04c5e74af4
Author: Daniel Stenberg <address@hidden>
AuthorDate: Tue Apr 30 11:16:53 2019 +0200
ConnectionExists: improve non-multiplexing use case
- better log output
- make sure multiplex is enabled for it to be used
---
lib/url.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/lib/url.c b/lib/url.c
index ad8aa6996..5b3ce11f2 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -1031,7 +1031,7 @@ ConnectionExists(struct Curl_easy *data,
/* We can't multiplex if we don't know anything about the server */
if(canmultiplex) {
- if(bundle->multiuse <= BUNDLE_UNKNOWN) {
+ if(bundle->multiuse == BUNDLE_UNKNOWN) {
if((bundle->multiuse == BUNDLE_UNKNOWN) && data->set.pipewait) {
infof(data, "Server doesn't support multiplex yet, wait\n");
*waitpipe = TRUE;
@@ -1047,6 +1047,10 @@ ConnectionExists(struct Curl_easy *data,
infof(data, "Could multiplex, but not asked to!\n");
canmultiplex = FALSE;
}
+ if(bundle->multiuse == BUNDLE_NO_MULTIUSE) {
+ infof(data, "Can not multiplex, even if we wanted to!\n");
+ canmultiplex = FALSE;
+ }
}
curr = bundle->conn_list.head;
@@ -1071,7 +1075,8 @@ ConnectionExists(struct Curl_easy *data,
continue;
}
- multiplexed = CONN_INUSE(check);
+ multiplexed = CONN_INUSE(check) &&
+ (bundle->multiuse == BUNDLE_MULTIPLEX);
if(canmultiplex) {
if(check->bits.protoconnstart && check->bits.close)
--
To stop receiving notification emails like this one, please contact
address@hidden
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] [gnurl] 117/219: ConnectionExists: improve non-multiplexing use case,
gnunet <=