BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/320939
Change subject: Test write buffer size theory for extra RTT
......................................................................
Test write buffer size theory for extra RTT
Change-Id: I844d4fd53fee6e9e833b3e1c349662d1dfbd1e10
---
A debian/patches/9999-always-set-bufsize.patch
M debian/patches/series
2 files changed, 35 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/software/nginx
refs/changes/39/320939/1
diff --git a/debian/patches/9999-always-set-bufsize.patch
b/debian/patches/9999-always-set-bufsize.patch
new file mode 100644
index 0000000..a10b779
--- /dev/null
+++ b/debian/patches/9999-always-set-bufsize.patch
@@ -0,0 +1,34 @@
+--- a/src/event/ngx_event_openssl.c
++++ b/src/event/ngx_event_openssl.c
+@@ -813,7 +813,7 @@
+ static void
+ ngx_ssl_info_callback(const ngx_ssl_conn_t *ssl_conn, int where, int ret)
+ {
+- BIO *rbio, *wbio;
++ BIO *wbio;
+ ngx_connection_t *c;
+
+ if (where & SSL_CB_HANDSHAKE_START) {
+@@ -833,20 +833,11 @@
+ * By default OpenSSL uses 4k buffer during a handshake,
+ * which is too low for long certificate chains and might
+ * result in extra round-trips.
+- *
+- * To adjust a buffer size we detect that buffering was added
+- * to write side of the connection by comparing rbio and wbio.
+- * If they are different, we assume that it's due to buffering
+- * added to wbio, and set buffer size.
+ */
+
+- rbio = SSL_get_rbio((ngx_ssl_conn_t *) ssl_conn);
+ wbio = SSL_get_wbio((ngx_ssl_conn_t *) ssl_conn);
+-
+- if (rbio != wbio) {
+- (void) BIO_set_write_buffer_size(wbio, NGX_SSL_BUFSIZE);
+- c->ssl->handshake_buffer_set = 1;
+- }
++ (void) BIO_set_write_buffer_size(wbio, NGX_SSL_BUFSIZE);
++ c->ssl->handshake_buffer_set = 1;
+ }
+ }
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 9f0fc8e..7624680 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
0500-ssl-curve.patch
0600-stapling-multi-file.patch
0660-version-too-low.patch
+9999-always-set-bufsize.patch
--
To view, visit https://gerrit.wikimedia.org/r/320939
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I844d4fd53fee6e9e833b3e1c349662d1dfbd1e10
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/nginx
Gerrit-Branch: wmf-1.11.4
Gerrit-Owner: BBlack <bbl...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
