Merge branch 'release/1.2.12'

.github/issue_template.md

@@ -0,0 +1,3 @@
+# Details
+# Steps or code to reproduce the problem.
+# Version

CMakeLists.txt

@@ -3,7 +3,7 @@ project(libevhtp)
 
 set(PROJECT_MAJOR_VERSION 1)
 set(PROJECT_MINOR_VERSION 2)
-set(PROJECT_PATCH_VERSION 11)
+set(PROJECT_PATCH_VERSION 12)
 set(PROJECT_VERSION      ${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT_PATCH_VERSION})
 
 set(CMAKE_C_FLAGS         "${CMAKE_C_FLAGS} -DPROJECT_VERSION=${PROJECT_VERSION} -Wall")
@@ -237,7 +237,8 @@ endif()
 include_directories(
 	${CMAKE_CURRENT_BINARY_DIR}
 	${CMAKE_CURRENT_BINARY_DIR}/compat
-	${CMAKE_CURRENT_SOURCE_DIR}
+	${CMAKE_SOURCE_DIR}/include
+    ${CMAKE_CURRENT_BINARY_DIR}/include
 	${ONIG_INCLUDE_DIR}
 	${OPENSSL_INCLUDE_DIR}
 	${LIBEVENT_INCLUDE_DIR}
@@ -259,7 +260,10 @@ if (NOT ${LIBEVENT_OPENSSL_FOUND})
 	set (EVHTP_DISABLE_SSL ON)
 endif(NOT ${LIBEVENT_OPENSSL_FOUND})
 
-set(LIBEVHTP_SOURCES evhtp.c evhtp_numtoa.c htparse.c)
+set (LIBEVHTP_SOURCES
+    evhtp.c
+    numtoa.c
+    parser.c)
 
 if (EVHTP_USE_JEMALLOC)
 		set(LIBEVHTP_EXTERNAL_LIBS ${LIBEVHTP_EXTERNAL_LIBS} jemalloc)
@@ -272,24 +276,24 @@ endif()
 
 if (NOT EVHTP_DISABLE_EVTHR)
 	set (LIBEVHTP_EXTERNAL_LIBS ${LIBEVHTP_EXTERNAL_LIBS} pthread)
-	set (LIBEVHTP_SOURCES ${LIBEVHTP_SOURCES} evthr.c)
-endif(NOT EVHTP_DISABLE_EVTHR)
+	set (LIBEVHTP_SOURCES       ${LIBEVHTP_SOURCES}       thread.c)
+endif()
 
-IF (WIN32)
-	add_definitions(-DWIN32 -march=i486)
-	find_library (LIB_WS32 ws2_32)
-	set (SYS_LIBS ${SYS_LIBS} ${LIB_WS32})
-ELSE ()
+if (WIN32)
+	add_definitions (-DWIN32 -march=i486)
+	find_library    (LIB_WS32 ws2_32)
+	set             (SYS_LIBS ${SYS_LIBS} ${LIB_WS32})
+else ()
 	if (NOT ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
 		find_library (LIB_DL dl)
-		set (SYS_LIBS ${LIB_DL})
+		set          (SYS_LIBS ${LIB_DL})
 	endif()
 
 	if (NOT APPLE)
 		find_library (LIB_RT rt)
-		set (SYS_LIBS ${SYS_LIBS} ${LIB_RT})
+		set          (SYS_LIBS ${SYS_LIBS} ${LIB_RT})
 	endif()
-ENDIF (WIN32)
+endif ()
 
 if (EVHTP_BUILD_SHARED)
 	set (EVHTP_LIBTYPE SHARED)
@@ -298,11 +302,15 @@ else()
 endif()
 
 configure_file(
-	${CMAKE_CURRENT_SOURCE_DIR}/evhtp-config.h.in
-	${CMAKE_CURRENT_BINARY_DIR}/evhtp-config.h)
+	${CMAKE_CURRENT_SOURCE_DIR}/include/evhtp/config.h.in
+	${CMAKE_CURRENT_BINARY_DIR}/include/evhtp/config.h)
 
-add_library(evhtp ${EVHTP_LIBTYPE} ${LIBEVHTP_SOURCES} ${ONIG_SOURCES})
-target_link_libraries(evhtp ${LIBEVHTP_EXTERNAL_LIBS})
+add_library(evhtp ${EVHTP_LIBTYPE}
+    ${LIBEVHTP_SOURCES}
+    ${ONIG_SOURCES})
+
+target_link_libraries(evhtp
+    ${LIBEVHTP_EXTERNAL_LIBS})
 
 if (EVHTP_BUILD_SHARED)
 		set_target_properties(evhtp PROPERTIES SOVERSION "${PROJECT_VERSION}")
@@ -319,12 +327,33 @@ if(NOT INCLUDE_INSTALL_DIR)
 endif()
 
 install (TARGETS evhtp DESTINATION ${LIB_INSTALL_DIR})
-install (FILES evhtp.h DESTINATION ${INCLUDE_INSTALL_DIR}/evhtp)
-install (FILES htparse.h DESTINATION ${INCLUDE_INSTALL_DIR}/evhtp)
-install (FILES ${CMAKE_CURRENT_BINARY_DIR}/evhtp-config.h DESTINATION ${INCLUDE_INSTALL_DIR}/evhtp)
+
+install (
+    FILES
+        ${PROJECT_SOURCE_DIR}/include/evhtp/evhtp.h
+        ${PROJECT_SOURCE_DIR}/include/evhtp/parser.h
+        ${PROJECT_SOURCE_DIR}/include/evhtp/thread.h
+    DESTINATION
+        ${INCLUDE_INSTALL_DIR}/evhtp)
+
+install (
+    FILES
+        ${PROJECT_SOURCE_DIR}/include/evhtp.h
+    DESTINATION
+        ${INCLUDE_INSTALL_DIR})
+
+install (
+    FILES
+        ${CMAKE_CURRENT_BINARY_DIR}/include/evhtp/config.h
+    DESTINATION
+        ${INCLUDE_INSTALL_DIR}/evhtp)
 
 if (NOT EVHTP_DISABLE_EVTHR)
-	install (FILES evthr.h DESTINATION ${INCLUDE_INSTALL_DIR}/evhtp)
+    install (
+        FILES
+            ${PROJECT_SOURCE_DIR}/include/evhtp/thread.h
+        DESTINATION
+            ${INCLUDE_INSTALL_DIR}/evhtp)
 endif()
 
 if (NOT EVHTP_DISABLE_REGEX)
@@ -421,7 +450,7 @@ if(DPKG_PROGRAM)
     OUTPUT_STRIP_TRAILING_WHITESPACE
   )
   set(CPACK_PACKAGE_FILE_NAME
-"${CPACK_PACKAGE_NAME_LOWERCASE}_${PROJECT_VERSION}-${PROJECT_VERSION_REVISION}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")  
+"${CPACK_PACKAGE_NAME_LOWERCASE}_${PROJECT_VERSION}-${PROJECT_VERSION_REVISION}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
 
 else(DPKG_PROGRAM)
   set(CPACK_PACKAGE_FILE_NAME

ChangeLog

@@ -1,4 +1,17 @@
-v1.3.12-pre3
+v1.2.12
+ o remove evhtp_heap, never used (d132721 Nathan French)
+ o remove evhtp_json, never used (aec4b3c Nathan French)
+ o [Issue#20] Include pathing (80a69cc Nathan French)
+ o Fix deprecated usage (f4c42c7 Roman Gershman)
+ o Create issue_template.md (8d1a95f Nathan French)
+ o [Issue#25] Return NULL if callbacks == NULL for get_cb (cfcdba4 Nathan French)
+ o adding more null checks. I wish __attr__(nonull) was portable (9b552b7 Nathan French)
+ o adding some struct accessor defines to make life easier (613c5bf Nathan French)
+ o I think I worked out most of the potential derefs (acb42cf Nathan French)
+ o Fix potential null deref in htp__strndup_ (60b85ca Nathan French)
+ o Fix dead assignments in parser.c (e0a48e1 Nathan French)
+ o Eat our own dogfood (use_thread_wexit()) (ea37928 Nathan French)
+ o No use for strlen() in a loop (6833080 Nathan French)
  o use PROJECT_BINARY_DIR for sys/ compat headers (012341c Nathan French)
  o return int for htp__path_new_ (bf59eb1 Nathan French)
  o more return normalization (91008a6 Nathan French)
@@ -8,15 +21,11 @@ v1.3.12-pre3
  o for some reason, htparser_init was being called manually with type_request?? (a153e5f Nathan French)
  o Add htp__strndup_ memfn wrapper (763168c Nathan French)
  o add a callback member in evhtp_ssl_cfg_t for customized decrypt privfile. fixes #16 (b3a4d42 h00360646)
-
-v1.2.12-pre2
  o Internalize some structs / deprecate evhtp_set_hook() (50ab327 Nathan French)
  o remove cruft (1b1a037 Nathan French)
  o add include directory for compat/sys headers (948c547 Nathan French)
  o export flag functions (3467cbb Nathan French)
  o formatting (4ec8dd3 Nathan French)
-
-v1.2.12-pre1
  o (evhtp_send_reply): Grab reference to bufferevent during write. (a976a2f Marcus Sundberg)
  o add thread exit callback for cleaning (0c7d9c4 jgli)
  o fix memory leak (a6b00cc jgli)
@@ -214,7 +223,7 @@ v1.2.9
 
 v1.2.8
  o There's no libdl on FreeBSD. (a683a1f Adrian Chadd)
- o FreeBSD handles the POSIX_C_SOURCE definition very strictly - strncmp() and a lot of other stuff isn't defined in the 2001 standards.  
+ o FreeBSD handles the POSIX_C_SOURCE definition very strictly - strncmp() and a lot of other stuff isn't defined in the 2001 standards.
    Thus, the functions aren't declared when you include the library headers. (0354a67 Adrian Chadd)
 
 v1.2.7