Permalink
Browse files

Merge branch 'release/0.4.15' into develop

  • Loading branch information...
2 parents 2f77428 + be12faa commit 545f2f9f974c61526e0b0acbfa3e48855f832fbc Mark Ellzey committed Jun 18, 2012
Showing with 22 additions and 3 deletions.
  1. +1 −1 CMakeLists.txt
  2. +19 −0 ChangeLog
  3. +2 −2 evhtp.h
View
@@ -3,7 +3,7 @@ project(reason)
set(PROJECT_MAJOR_VERSION 0)
set(PROJECT_MINOR_VERSION 4)
-set(PROJECT_PATCH_VERSION 14)
+set(PROJECT_PATCH_VERSION 15)
set (PROJECT_VERSION ${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT_PATCH_VERSION})
set (CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMakeModules)
View
@@ -1,3 +1,22 @@
+v0.4.15
+ o Override global timeouts on a per-connection basis. (156f5ef Mark Ellzey)
+ o Use evhtp_connection_set_timeouts in accept. (8eb5aa9 Mark Ellzey)
+ o Remove use for alloca.h (339f9f2 Mark Ellzey)
+ o Added a max-backlog for evthr/pools (e8ac1f9 Mark Ellzey)
+ o Added evthr max backlog options. (a44d1c0 Mark Ellzey)
+ o Initial commit of vhost feature. (8fb43e0 Mark Ellzey)
+ o SSL SNI support. (4dcc68e Mark Ellzey)
+ o Added test_vhost.c (c5a698e Mark Ellzey)
+ o _evhtp_ssl_servername now uses wildcard matching. (00d0488 Mark Ellzey)
+ o Added vhost aliases functionality. (bf5766f Mark Ellzey)
+ o Readd inc/dec counter for evthr. (022ecf3 Mark Ellzey)
+ o Make evhtp_request_free public. (9046466 Mark Ellzey)
+ o Added a EVHTP_RES_USER evhtp_res type. (6b41cee Mark Ellzey)
+ o Add support for ECDH ciphers (via cfg->named_curve string) (131cae3 b)
+ o finding cbs/hook additions, hostname parse hooks (361a068 Mark Ellzey)
+ o Optimizations. (caddf10 Mark Ellzey)
+ o hook_on_hdrs_complete runs before last LF (2f77428 Mark Ellzey)
+
v0.4.14
o Added example and documentation on proper thread-safe design with evhtp. (154017e Mark Ellzey)
o Added glob/wildcard callback patterns. (d33a416 Mark Ellzey)
View
@@ -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 "0.4.14"
+#define EVHTP_VERSION "0.4.15"
#define EVHTP_VERSION_MAJOR 0
#define EVHTP_VERSION_MINOR 4
-#define EVHTP_VERSION_PATCH 14
+#define EVHTP_VERSION_PATCH 15
#define evhtp_headers_iterator evhtp_kvs_iterator

0 comments on commit 545f2f9

Please sign in to comment.