Skip to content
Browse files

Merge branch 'release/0.4.13'

  • Loading branch information...
2 parents 307f143 + 5d805cd commit 0096ec33f7031a5f768af43a24e01e2504696810 Mark Ellzey committed Apr 5, 2012
Showing with 12 additions and 5 deletions.
  1. +1 −1 CMakeLists.txt
  2. +6 −1 ChangeLog
  3. +2 −1 README.markdown
  4. +2 −2 evhtp.h
  5. +1 −0 evthr/evthr.c
View
2 CMakeLists.txt
@@ -3,7 +3,7 @@ project(reason)
set(PROJECT_MAJOR_VERSION 0)
set(PROJECT_MINOR_VERSION 4)
-set(PROJECT_PATCH_VERSION 12)
+set(PROJECT_PATCH_VERSION 13)
set (PROJECT_VERSION ${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT_PATCH_VERSION})
set (CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMakeModules)
View
7 ChangeLog
@@ -1,4 +1,8 @@
-v0.4.12
+v0.4.13
+ o Decrement pending count when defer fails. (4e99de9 Mark Ellzey)
+ o Updating documentation to say there is not much documentation. (184f33e Mark Ellzey)
+
+v0.4.11
o Added #ifndef EVHTP_DISABLE_EVTHR flags for compilation withotu threading support (d5bcc33 Thibaut Le Guilly)
o Modify evthr_lock() macro previous patch for less ifdefs. (c800fe9 Mark Ellzey)
o Took out more disable thread ifdefs. (b5de21e Mark Ellzey)
@@ -7,6 +11,7 @@ v0.4.12
o Took out more disable thread ifdefs. (accbe88 Mark Ellzey)
o Bugfixes, additions, cleanup, see full commit msg. (e6155d8 Mark Ellzey)
o Added evhtp_set_bev_flags() (a342903 Mark Ellzey)
+ o Prep release v0.4.12 (acda3c8 Mark Ellzey)
v0.4.10
o Add compile time EVHTP_DISABLE_REGEX option. (eab0d0f Andy Hochhaus)
View
3 README.markdown
@@ -1,7 +1,8 @@
# Libevhtp
*****
-This document describes details on using the evhtp API
+This document describes details on using the evhtp API. This document is
+probably not very awesome, it's best to look at test.c to see advanced usage.
## Required Dependencies
* [gcc](http://gcc.gnu.org/)
View
4 evhtp.h
@@ -151,10 +151,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.12"
+#define EVHTP_VERSION "0.4.13"
#define EVHTP_VERSION_MAJOR 0
#define EVHTP_VERSION_MINOR 4
-#define EVHTP_VERSION_PATCH 12
+#define EVHTP_VERSION_PATCH 13
#define evhtp_headers_iterator evhtp_kvs_iterator
View
1 evthr/evthr.c
@@ -207,6 +207,7 @@ evthr_defer(evthr_t * thread, evthr_cb cb, void * arg) {
pthread_mutex_lock(thread->rlock);
if (send(thread->wdr, &cmd, sizeof(cmd), 0) <= 0) {
+ evthr_dec_backlog(thread);
pthread_mutex_unlock(thread->rlock);
return EVTHR_RES_RETRY;
}

0 comments on commit 0096ec3

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