Permalink
Browse files

Merge branch 'release/1.2.2'

  • Loading branch information...
2 parents 0f84511 + c0076a3 commit 6790649558b5dba4471eacd9120150098b6470cf Mark Ellzey committed Mar 13, 2013
Showing with 4 additions and 4 deletions.
  1. +2 −2 CMakeLists.txt
  2. +2 −2 evhtp.h
View
4 CMakeLists.txt
@@ -3,7 +3,7 @@ project(reason)
set(PROJECT_MAJOR_VERSION 1)
set(PROJECT_MINOR_VERSION 2)
-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)
@@ -244,6 +244,6 @@ install (FILES evthr/evthr.h DESTINATION include)
if (NOT EVHTP_DISABLE_REGEX)
if (NOT HAS_SYS_ONIG)
- install (FILES oniguruma/onigposix.h DESTINATION evhtp)
+ install (FILES oniguruma/onigposix.h DESTINATION include)
endif()
endif()
View
4 evhtp.h
@@ -167,10 +167,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.2.1"
+#define EVHTP_VERSION "1.2.2"
#define EVHTP_VERSION_MAJOR 1
#define EVHTP_VERSION_MINOR 2
-#define EVHTP_VERSION_PATCH 1
+#define EVHTP_VERSION_PATCH 2
#define evhtp_headers_iterator evhtp_kvs_iterator

0 comments on commit 6790649

Please sign in to comment.