Skip to content
Browse files

Merge branch 'release/0.4.2'

Conflicts:
	CMakeLists.txt
	evhtp.h
  • Loading branch information...
2 parents 2cc9195 + 815b023 commit b715a295846112002d8b42c7c3bdde96677099f8 Mark Ellzey committed Nov 23, 2011
View
12 CMakeLists.txt
@@ -3,7 +3,7 @@ project(reason)
set(PROJECT_MAJOR_VERSION 0)
set(PROJECT_MINOR_VERSION 4)
-set(PROJECT_PATCH_VERSION 0)
+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)
@@ -110,12 +110,12 @@ find_path(LIBEVENT_INCLUDE_DIR event.h)
include_directories(
${CMAKE_CURRENT_BINARY_DIR}/compat
- ${CMAKE_CURRENT_SOURCE_DIR}/libhtparse
+ ${CMAKE_CURRENT_SOURCE_DIR}/htparse
${CMAKE_CURRENT_BINARY_DIR}/oniguruma
${CMAKE_CURRENT_SOURCE_DIR}/oniguruma
${CMAKE_CURRENT_SOURCE_DIR}
- ${CMAKE_CURRENT_SOURCE_DIR}/evthr
- ${OPENSSL_INCLUDE_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}/evthr
+ ${OPENSSL_INCLUDE_DIR}
${LIBEVENT_INCLUDE_DIR}
)
@@ -133,7 +133,7 @@ if (NOT ${LIBEVENT_OPENSSL_FOUND})
set (DISABLE_SSL 1)
endif(NOT ${LIBEVENT_OPENSSL_FOUND})
-set(LIBEVHTP_SOURCES evhtp.c libhtparse/htparse.c)
+set(LIBEVHTP_SOURCES evhtp.c htparse/htparse.c)
if (NOT DISABLE_EVTHR)
set (LIBEVHTP_EXTERNAL_LIBS ${LIBEVHTP_EXTERNAL_LIBS} pthread)
@@ -145,7 +145,7 @@ set_target_properties(libevhtp PROPERTIES OUTPUT_NAME "evhtp")
install (TARGETS libevhtp DESTINATION lib)
install (FILES evhtp.h DESTINATION include)
-install (FILES libhtparse/htparse.h DESTINATION include)
+install (FILES htparse/htparse.h DESTINATION include)
install (FILES evthr/evthr.h DESTINATION include)
install (FILES oniguruma/onigposix.h DESTINATION include)
View
31 ChangeLog
@@ -1,3 +1,34 @@
+v0.4.2
+- Moved ./libhtparse to ./htparse
+- Increased the default stack size limit in the request parser.
+- Tweaked SSL thread initialization code.
+- Fixed strdup build warnings and errors on OSX
+- Added checks for sys/tree.h and use compat if not found.
+- Added proper status code string generation.
+ * Prior to this release, any http return status code would return the same
+ status code string "derp". Now all known status codes are mapped to the
+ proper status code string.
+
+- Added chunking hooks
+ * Prior to this commit, a chunked message is treated as just a body of data. So
+ when a single chunk header has been read, it would just start using it as the
+ content-length and send the body to the on_read hook.
+
+ * This can be problimatic when it comes to doing things like proyxing a request to
+ another server who is expecting chunked data. So the following hooks have been
+ added to give the user access to various stages of chunk processing:
+
+ * evhtp_hook_on_new_chunk
+ - Called at the start of a chunk with the number of bytes which will be parsed.
+
+ * evhtp_hook_on_chunk_complete
+ - called when a single chunk has been parsed and processed.
+
+ * evhtp_hook_on_chunks_complete
+ - called when all chunks for a request have been parsed and processed
+
+ * Refer to ./test.c for example usage of the chunk hooking functionality.
+
v0.4.1
- Various CMAKE fixes
View
4 evhtp.h
@@ -98,10 +98,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.1"
+#define EVHTP_VERSION "0.4.2"
#define EVHTP_VERSION_MAJOR 0
#define EVHTP_VERSION_MINOR 4
-#define EVHTP_VERSION_PATCH 1
+#define EVHTP_VERSION_PATCH 2
#define evhtp_headers_iterator evhtp_kvs_iterator
View
0 libhtparse/Makefile → htparse/Makefile
File renamed without changes.
View
0 libhtparse/htparse.c → htparse/htparse.c
File renamed without changes.
View
0 libhtparse/htparse.h → htparse/htparse.h
File renamed without changes.
View
0 libhtparse/test.c → htparse/test.c
File renamed without changes.

0 comments on commit b715a29

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