walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

nghttpx: Return new BIO_METHOD object with OpenSSL < 1.1.0

This commit is contained in:
Tatsuhiro Tsujikawa 2017-03-15 23:36:38 +09:00
parent b21779e685
commit 1ea590c364
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/shrpx_connection.cc
View File

@ -293,13 +293,13 @@ void delete_bio_method(BIO_METHOD *bio_method) { BIO_meth_free(bio_method); }
#else // !OPENSSL_1_1_API #else // !OPENSSL_1_1_API
BIO_METHOD *create_bio_method() { BIO_METHOD *create_bio_method() {
static BIO_METHOD shrpx_bio_method = { static auto meth = new BIO_METHOD{
BIO_TYPE_FD, "nghttpx-bio", shrpx_bio_write, BIO_TYPE_FD, "nghttpx-bio", shrpx_bio_write,
shrpx_bio_read, shrpx_bio_puts, shrpx_bio_gets, shrpx_bio_read, shrpx_bio_puts, shrpx_bio_gets,
shrpx_bio_ctrl, shrpx_bio_create, shrpx_bio_destroy, shrpx_bio_ctrl, shrpx_bio_create, shrpx_bio_destroy,
}; };
return &shrpx_bio_method; return meth;
} }
void delete_bio_method(BIO_METHOD *bio_method) {} void delete_bio_method(BIO_METHOD *bio_method) {}

4
src/shrpx_connection.h
View File

@ -161,9 +161,7 @@ struct Connection {
ev_tstamp read_timeout; ev_tstamp read_timeout;
}; };
// Creates BIO_method shared by all SSL objects. If nghttp2 is built // Creates BIO_method shared by all SSL objects.
// with OpenSSL < 1.1.0, this returns statically allocated object.
// Otherwise, it returns new BIO_METHOD object every time.
BIO_METHOD *create_bio_method(); BIO_METHOD *create_bio_method();
// Deletes given |bio_method|. If nghttp2 is built with OpenSSL < // Deletes given |bio_method|. If nghttp2 is built with OpenSSL <