lib/libhttp
1
0
Fork 0
mirror of https://github.com/lammertb/libhttp.git synced 2025-09-11 21:30:45 +03:00
Code Activity
1,204 Commits 1 Branch 1 Tag
ed5689b79110cbc25673cec4432a33f35d15e507
Commit Graph

1204 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas Davis
ed5689b791 Updated VS2012 Build for WinXP 2013-10-20 21:02:32 -04:00
Thomas Davis
66637db176 Updated version number 2013-10-13 14:33:39 -04:00
sunsetbrew
d9b3e5fa21 Update Installing.md 2013-10-13 14:28:37 -04:00
sunsetbrew
cfdabfe1f8 Update RELEASE_NOTES.md 2013-10-13 14:04:07 -04:00
sunsetbrew
5364d8a070 Merge pull request #29 from bgreat/master 
Correct bad mask flag/opcode passing to callback
 2013-10-13 10:59:40 -07:00
William Greathouse
4e6f2d139e Update comment for saving mask flag/opcode. 2013-10-13 13:53:46 -04:00
William Greathouse
76bebde90d Restore original test code 2013-10-13 13:53:13 -04:00
Thomas Davis
4d9a202f76 Added ZIP installation build for Windows 
Also moved version define to the header.
 2013-10-13 13:51:19 -04:00
William Greathouse
52d2ddbd47 Preserve the current mask flag and opcode for websocket_data callback. 2013-10-13 13:40:42 -04:00
William Greathouse
46a44f12f3 Fix previous commit with merge errors 2013-10-13 11:55:45 -04:00
William Greathouse
03f35958e8 Merge branch 'master' of https://github.com/sunsetbrew/civetweb 
Conflicts:
	CREDITS.md
	LICENSE.md
	Makefile.deprecated
	RELEASE_NOTES.md
	VS2012/civetweb_lua/civetweb_lua.vcxproj
	VS2012/lua_lib/lua_lib.vcxproj
	VS2012/lua_lib/lua_lib.vcxproj.filters
	docs/Embedding.md
	include/civetweb.h
	resources/Makefile.in-lua
	src/civetweb.c
	src/main.c
	src/mod_lua.inl
	src/third_party/lsqlite3.c
 2013-10-13 11:17:41 -04:00
sunsetbrew
b393b8d241 Update CREDITS.md 2013-10-11 19:36:49 -04:00
sunsetbrew
bdd5aa6da6 Update RELEASE_NOTES.md 2013-10-11 19:36:32 -04:00
sunsetbrew
aeee75fd41 Merge pull request #28 from apkbox/master 
Fixes page violation
 2013-10-11 16:35:03 -07:00
akozl
9023e7b91b Fixes page violation when < or ? is the last character in the file and file size is a multiple of memory page size. 2013-10-11 15:52:39 -07:00
Thomas Davis
f006a81d3e indent 2013-10-09 18:07:10 -04:00
sunsetbrew
6cf7b20eba Update RELEASE_NOTES.md 2013-10-09 17:11:03 -04:00
sunsetbrew
29ee3e1f2b Merge pull request #27 from tzimmofsecure/master 
Use C style comments to enable compiling most of civetweb with -ansi. That was a lot of comment changing!
 2013-10-09 14:10:24 -07:00
Kimmo Mustonen
9a5a104d50 Use C style comments to enable compiling most of civetweb with -ansi. 2013-10-09 23:36:08 +03:00
sunsetbrew
24661348f1 Update RELEASE_NOTES.md 2013-10-09 14:53:25 -04:00
sunsetbrew
27b493efb4 Merge pull request #26 from Bernhard-/master 
Allow directories with non ASCII characters in Windows in UTF-8 encoded ...
 2013-10-09 11:52:57 -07:00
bel
62902a57ae Allow directories with non ASCII characters in Windows in UTF-8 encoded conf file 2013-10-09 20:40:41 +02:00
sunsetbrew
f027c95abb Update LICENSE.md 2013-10-07 17:43:07 -04:00
sunsetbrew
75173501a7 Update RELEASE_NOTES.md 2013-10-07 17:41:06 -04:00
sunsetbrew
616cf9c827 Merge pull request #24 from Bernhard-/master 
Add lfs (LuaFileSystem) support
 2013-10-07 14:40:20 -07:00
bel
f914beea06 Add lfs (LuaFileSystem) support 2013-10-07 23:31:03 +02:00
Thomas Davis
a9db002894 Updated copyright 2013-10-07 16:51:55 -04:00
Thomas Davis
e5060b5e78 Updated code indent 2013-10-07 16:17:22 -04:00
sunsetbrew
32c686a9d7 Update RELEASE_NOTES.md 2013-10-07 16:13:49 -04:00
sunsetbrew
0bd8f61f61 Update CREDITS.md 2013-10-07 16:09:32 -04:00
sunsetbrew
bf25bd2b96 Update RELEASE_NOTES.md 2013-10-07 16:08:54 -04:00
Thomas Davis
22a577fc97 Updated release notes 2013-10-07 14:33:23 -04:00
sunsetbrew
aa92c38c2d Merge pull request #22 from bel2125/master 
fixes from the forum posts, from Bel
 2013-10-07 14:22:28 -04:00
bel
2a9eaea08a add , accidentially deleted 2013-10-07 14:22:28 -04:00
bel
bc4b2340fe fix Lua issues: keep-alive fix and update sqlite 2013-10-07 14:22:28 -04:00
bel
b9e1cc4fea update MIME types 2013-10-07 14:22:28 -04:00
sunsetbrew
ebbb3898fa Update CREDITS.md 2013-10-07 14:22:27 -04:00
bel
50fd2ccae5 fix priority of master thread for Linux 2013-10-07 14:22:27 -04:00
sunsetbrew
d304295f92 Update RELEASE_NOTES.md 2013-10-07 14:22:27 -04:00
bel
2c5d90b829 Fix keep-alive 2013-10-07 14:22:27 -04:00
sunsetbrew
3039a8687c Merge pull request #20 from grenclave/patch-1 
Update civetweb.c
 2013-10-07 14:22:27 -04:00
Thomas Davis
85a8c919ec updated credits 2013-10-07 14:22:27 -04:00
grenclave
c493761ac1 Update civetweb.c 
Update the defines to compile clean in Windows.  The last edit were not correct.
 2013-10-07 14:22:27 -04:00
Thomas Davis
9aafb7ec52 Updated release notes 2013-10-07 14:22:27 -04:00
grenclave
99a418c726 Update civetweb.c 
Added MSC_VER check to the include for ws2tcpip, as it broke the linux build.
 2013-10-07 14:22:27 -04:00
Thomas Davis
b73e2c198d Updated indentation 2013-10-07 14:22:27 -04:00
grenclave
ca9e588a8c Update civetweb.c 
Updated to build clean in Visual Studio 2012 & 64 bit.
The undef of _WIN32_WINNT is out dated at this point.

ws2tcpip.h needed to be defined in windows.

HAVE_POLL is defined in this new include, so we don't want to define it again.
 2013-10-07 14:22:27 -04:00
Thomas Davis
55c27d4751 Fixed potential dead-lock in connection_close() 
This was posted by Morgan McGuire.
 2013-10-07 14:22:26 -04:00
sunsetbrew
b76325205c Update CREDITS.md 2013-10-07 14:22:26 -04:00
sunsetbrew
236c1a3716 Update CREDITS.md 2013-10-07 14:22:26 -04:00