cuberite/libevent
1
0
Fork 0
mirror of https://github.com/cuberite/libevent.git synced 2025-09-11 13:24:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Resolve two conflicts.

Browse Source 
svn:r839
This commit is contained in:
Nick Mathewson 2008-05-30 16:19:01 +00:00
parent 2deb3ce061
commit 9ca7a3a3d6
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -103,7 +103,8 @@ Changes in current version:
o Fix use of freed memory in event_reinit; pointed out by Peter Postma o Fix use of freed memory in event_reinit; pointed out by Peter Postma
o constify struct timeval * where possible o constify struct timeval * where possible
o make event_get_supported_methods obey environment variables o make event_get_supported_methods obey environment variables
Changes in 1.4.0: Changes in 1.4.0:
o allow \r or \n individually to separate HTTP headers instead of the standard "\r\n"; from Charles Kerr. o allow \r or \n individually to separate HTTP headers instead of the standard "\r\n"; from Charles Kerr.
o demote most http warnings to debug messages o demote most http warnings to debug messages

2
WIN32-Code/event-config.h
View File

@ -51,7 +51,7 @@
/* #undef _EVENT_HAVE_INET_NTOP */ /* #undef _EVENT_HAVE_INET_NTOP */
/* Define to 1 if you have the <inttypes.h> header file. */ /* Define to 1 if you have the <inttypes.h> header file. */
/* #define _EVENT_HAVE_INTTYPES_H 1 */ /* #undef _EVENT_HAVE_INTTYPES_H 1 */
/* Define to 1 if you have the `kqueue' function. */ /* Define to 1 if you have the `kqueue' function. */
/* #undef _EVENT_HAVE_KQUEUE */ /* #undef _EVENT_HAVE_KQUEUE */