Merge branch 'release/1.2.12-pre1'

.gitignore

@@ -6,3 +6,4 @@
 #
 docs/
 html/
+build/*

CMakeLists.txt

@@ -6,7 +6,7 @@ set(PROJECT_MINOR_VERSION 2)
 set(PROJECT_PATCH_VERSION 11)
 set(PROJECT_VERSION      ${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT_PATCH_VERSION})
 
-set(CMAKE_C_FLAGS         "${CMAKE_C_FLAGS} -DPROJECT_VERSION=\"${PROJECT_VERSION}\" -Wall")
+set(CMAKE_C_FLAGS         "${CMAKE_C_FLAGS} -DPROJECT_VERSION=${PROJECT_VERSION} -Wall")
 set(CMAKE_C_FLAGS_DEBUG   "${CMAKE_C_FLAGS_DEBUG} -O0 -ggdb3")
 
 SET(CMAKE_BUILD_TYPE Release CACHE STRING "default to Release")
@@ -391,4 +391,48 @@ else(CMAKE_BUILD_TYPE MATCHES Release)
 		message("                              ${CMAKE_C_FLAGS_RELEASE}")
 endif()
 
+set (CPACK_GENERATOR DEB)
+set (CPACK_PACKAGE_NAME "libevhtp")
+set (CPACK_PACKAGE_VERSION ${PROJECT_VERSION})
+set (CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_MAJOR_VERSION})
+set (CPACK_PACKAGE_VERSION_MINOR ${PROJECT_MINOR_VERSION})
+set (CPACK_PACKAGE_VERSION_PATCH ${PROJECT_PATCH_VERSION})
+
+set(PROJECT_VERSION_REVISION 0)
+find_program(GIT_PROGRAM git DOC "git program")
+if(GIT_PROGRAM)
+  execute_process(
+    COMMAND ${GIT_PROGRAM} rev-parse --verify --short HEAD
+    OUTPUT_VARIABLE PROJECT_VERSION_REVISION
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+  )
+endif(GIT_PROGRAM)
+
+string(TOLOWER "${CPACK_PACKAGE_NAME}" CPACK_PACKAGE_NAME_LOWERCASE)
+find_program(DPKG_PROGRAM dpkg DOC "dpkg program of Debian-based systems")
+if(DPKG_PROGRAM)
+  execute_process(
+    COMMAND ${DPKG_PROGRAM} --print-architecture
+    OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+  )
+  set(CPACK_PACKAGE_FILE_NAME
+"${CPACK_PACKAGE_NAME_LOWERCASE}_${PROJECT_VERSION}-${PROJECT_VERSION_REVISION}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")  
+
+else(DPKG_PROGRAM)
+  set(CPACK_PACKAGE_FILE_NAME
+"${CPACK_PACKAGE_NAME_LOWERCASE}_${PROJECT_VERSION}-${PROJECT_VERSION_REVISION}_${CMAKE_SYSTEM_NAME}")
+endif(DPKG_PROGRAM)
+
+set (CPACK_DEBIAN_PACKAGE_MAINTAINER "unknown")
+find_program(WHOAMI_PROGRAM whoami DOC "whoami program")
+if(WHOAMI_PROGRAM)
+  execute_process(
+    COMMAND ${WHOAMI_PROGRAM}
+    OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_MAINTAINER
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+  )
+endif(WHOAMI_PROGRAM)
+INCLUDE(CPack)
+
 message("")

ChangeLog

@@ -1,4 +1,43 @@
 v1.2.11
+ o Grab reference to bufferevent during write. (a976a2f Marcus Sundberg)
+ o add thread exit callback for cleaning (0c7d9c4 jgli)
+ o fix memory leak (a6b00cc jgli)
+ o fix thread exit callback type (c8978b6 jgli)
+ o Updates for threading functionality. (b634002 Mark Ellzey)
+ o Added evhtp_accept_socket (a497a14 Mark Ellzey)
+ o Forgot to export evhtp_accept_socke. (c94cb5b Mark Ellzey)
+ o Formatting. (4a78297 Mark Ellzey)
+ o Maybe I should spell rite. (2114210 Mark Ellzey)
+ o Fix cmake compilation issue in centos7 (dfc8c2b kaustubh-d)
+ o Remove double-free when SSL is used. (ee32b2a Jacob Marble)
+ o Add CPack commands to build a debian package. (0c4a8ec Tom Pusateri)
+ o [docs] added some doxygen groups (8a247f1 Mark Ellzey)
+ o check res for bufferevent_socket_connect (#136) (70b68d4 mthomas)
+ o Regression from commit 67ed0bc (c96c51e Ultima1252)
+ o Added build/* to gitignore (c64f1dc Mark Ellzey)
+ o Updating license to include Marcus Sundberg (801c52f Mark Ellzey)
+ o [htparse] fix up some stuff to make coverity happy (abc7eb4 Mark Ellzey)
+ o Update README.markdown (3058a6e Mark Ellzey)
+ o fixes and travis integration (ad92289 Mark Ellzey)
+ o check for sockopt returns (534bb48 Mark Ellzey)
+ o more travis updates (a9b4d38 Mark Ellzey)
+ o travis (12a91ab Mark Ellzey)
+ o Update README.markdown (b595a0d Mark Ellzey)
+ o added initial lightweight heap allocator (6bf121b Mark Ellzey)
+ o added initial lightweight heap allocator (5f634b6 Mark Ellzey)
+ o Added initial evhtp_json API (6e48770 Mark Ellzey)
+ o Removing the SIGNED.md file (outdated anyway) (d4bcfa8 Mark Ellzey)
+ o updates / formatting / renames (926e355 Nathan French)
+ o static funcs from now on will just return int (5112b6d Nathan French)
+ o fix htp__use_threads_ call error (2ed2f7f weijiazhen)
+ o FIX : Socket leakage on error #6 (d13b72b Nathan French)
+ o Issue#6: make evhtp_accept_socket conform to api (d0347dc Nathan French)
+ o Establish conformity through flags. (58da6dd Nathan French)
+ o request flags (71341d9 Nathan French)
+ o EVHTP_CONN flags (087e9a7 Nathan French)
+ o Flag ops (and related functions) / cleanup (0abc96f Nathan French)
+ o Add flags accessor (e0f04aa Nathan French)
+
  o Added missing extern "C"'s to public headers (9a0d250 Mark Ellzey)
  o CMakeLists cleanup, and pretty display (fc0f5da Mark Ellzey)
  o Oops, added back find_package() for libevent (9cdae63 Mark Ellzey)

Doxyfile

@@ -106,9 +106,7 @@ HHC_LOCATION           =
 GENERATE_CHI           = NO
 BINARY_TOC             = NO
 TOC_EXPAND             = NO
-DISABLE_INDEX          = NO
 ENUM_VALUES_PER_LINE   = 4
-GENERATE_TREEVIEW      = NO
 TREEVIEW_WIDTH         = 250
 GENERATE_LATEX         = NO
 LATEX_OUTPUT           = latex
@@ -168,7 +166,7 @@ TEMPLATE_RELATIONS     = NO
 INCLUDE_GRAPH          = YES
 INCLUDED_BY_GRAPH      = YES
 CALL_GRAPH             = YES 
-CALLER_GRAPH           = NO
+CALLER_GRAPH           = YES 
 GRAPHICAL_HIERARCHY    = YES
 DIRECTORY_GRAPH        = YES
 DOT_IMAGE_FORMAT       = png
@@ -181,3 +179,7 @@ DOT_MULTI_TARGETS      = NO
 GENERATE_LEGEND        = YES
 DOT_CLEANUP            = YES
 SEARCHENGINE           = NO
+
+DISABLE_INDEX = YES
+GENERATE_TREEVIEW = YES
+

LICENSE

@@ -2,7 +2,7 @@ Libevhtp is available for use under the following license, commonly known
 as the 3-clause (or "modified") BSD license:
 
 ==============================
-Copyright (c) 2010-2011 Mark Ellzey
+Copyright (c) 2010-2016 Mark Ellzey & Marcus Sundberg
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
@@ -32,3 +32,6 @@ under the three-clause BSD license above. The functions include:
 
 evhtp.c: _evhtp_glob_match():
    Copyright (c) 2006-2009, Salvatore Sanfilippo
+
+evhtp_json.c && evhtp_heap.c
+   Ripped from liblz (written by Mark Ellzey)