Skip to content
Browse files

Merge branch 'release/1.1.2'

  • Loading branch information...
2 parents e850e5a + dab7597 commit 265b9d4bfcab90672a957255910b7e31e39899e1 Mark Ellzey committed Aug 30, 2012
Showing with 13 additions and 3 deletions.
  1. +1 −1 CMakeLists.txt
  2. +3 −0 ChangeLog
  3. +7 −0 evhtp.c
  4. +2 −2 evhtp.h
View
2 CMakeLists.txt
@@ -3,7 +3,7 @@ project(reason)
set(PROJECT_MAJOR_VERSION 1)
set(PROJECT_MINOR_VERSION 1)
-set(PROJECT_PATCH_VERSION 1)
+set(PROJECT_PATCH_VERSION 2)
set (PROJECT_VERSION ${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT_PATCH_VERSION})
set (CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMakeModules)
View
3 ChangeLog
@@ -1,3 +1,6 @@
+v1.1.2
+ o Manual verification modes for SNI vhosts. (5f9b3a5 Mark Ellzey)
+
v1.1.1
o Added max-body functionality. (7f0052a Mark Ellzey)
o Added evhtp_set_max_keepalive_requests() (503ef28 Mark Ellzey)
View
7 evhtp.c
@@ -1757,6 +1757,13 @@ _evhtp_ssl_servername(evhtp_ssl_t * ssl, int * unused, void * arg) {
connection->vhost_via_sni = 1;
SSL_set_SSL_CTX(ssl, evhtp_vhost->ssl_ctx);
+ SSL_set_options(ssl, SSL_CTX_get_options(ssl->ctx));
+
+ if ((SSL_get_verify_mode(ssl) == SSL_VERIFY_NONE) ||
+ (SSL_num_renegotiations(ssl) == 0)) {
+ SSL_set_verify(ssl, SSL_CTX_get_verify_mode(ssl->ctx),
+ SSL_CTX_get_verify_callback(ssl->ctx));
+ }
return SSL_TLSEXT_ERR_OK;
}
View
4 evhtp.h
@@ -155,10 +155,10 @@ typedef void (*evhtp_ssl_scache_del)(evhtp_t * htp, unsigned char * sid, int sid
typedef evhtp_ssl_sess_t * (*evhtp_ssl_scache_get)(evhtp_connection_t * connection, unsigned char * sid, int sid_len);
typedef void * (*evhtp_ssl_scache_init)(evhtp_t *);
-#define EVHTP_VERSION "1.1.1"
+#define EVHTP_VERSION "1.1.2"
#define EVHTP_VERSION_MAJOR 1
#define EVHTP_VERSION_MINOR 1
-#define EVHTP_VERSION_PATCH 1
+#define EVHTP_VERSION_PATCH 2
#define evhtp_headers_iterator evhtp_kvs_iterator

0 comments on commit 265b9d4

Please sign in to comment.
Something went wrong with that request. Please try again.