Sergey Lyubka
821e2b3a75
Merge pull request #501 from xant/upstream
...
safety belt : scan_directory() can return without setting arr to a valid value
2015-04-01 20:22:20 +01:00
Sergey Lyubka
773efb0745
Respect WEBSOCKET_OPCODE_CONNECTION_CLOSE coming from client
2015-04-01 18:37:13 +01:00
Andrea Guzzo
ed1904a75d
safety belt : scan_directory() can return without setting arr to a valid value
2015-03-31 12:52:08 +02:00
Sergey Lyubka
a66663f0f6
Fix non-openssl build
2015-03-31 10:38:14 +01:00
Sergey Lyubka
1104688b02
Fix win32 build no2
2015-03-25 17:29:34 +00:00
Sergey Lyubka
36d95e230e
Fix win32 build
2015-03-25 17:10:58 +00:00
Sergey Lyubka
8a27a95a2a
Fix #460
2015-03-24 09:32:16 +00:00
Sergey Lyubka
2e63b5a5e5
Fix #441
2015-03-24 08:04:46 +00:00
Sergey Lyubka
4cbd113d01
Upload multiple files
2015-03-24 07:52:49 +00:00
Sergey Lyubka
ba5ae74144
Merge pull request #495 from mmicko/master
...
OS2 and Android NDK fixes
2015-03-22 17:03:28 +00:00
Miodrag Milanovic
f2b40e5fae
added comment for time_t change
2015-03-22 17:56:22 +01:00
Sergey Lyubka
8ed682930b
Fix #448
2015-03-21 13:17:24 +00:00
Miodrag Milanovic
86ad7922b0
OS2 and Android NDK fixes
...
Note that in Android NDK st_mtime is long unsigned int
2015-03-21 11:04:57 +01:00
Sergey Lyubka
f7476f53c7
Merge pull request #493 from RobertDiPaolo/bugfix/Visual_Studios_Build_Issues
...
Correctly handle _CRT_SECURE_NO_WARNINGS already being set in project se...
2015-03-20 16:29:11 +00:00
Sergey Lyubka
5d6f7ac8ef
Merge pull request #494 from RobertDiPaolo/bugfix/Memory_Leak
...
Fixed Memory Leak
2015-03-20 16:28:15 +00:00
Sergey Lyubka
f16fa5ed55
Merge pull request #492 from RobertDiPaolo/feature/Add_PATCH_Method
...
Added PATCH to list of valid HTTP Methods.
2015-03-20 16:28:11 +00:00
Sergey Lyubka
c0ba32f7a6
Set NS_DISABLE_THREADS ifndef MONGOOSE_ENABLE_THREADS
2015-03-20 15:33:02 +00:00
Sergey Lyubka
409c12a851
Better logic for port resolving
5.6
2015-03-18 17:25:46 +00:00
Sergey Lyubka
bcdcbf20ee
Release 5.6
2015-03-18 17:25:31 +00:00
Sergey Lyubka
8fc5b5a55f
Add contribution section to readme
2015-03-18 15:45:52 +00:00
Robert Di Paolo
7cf28a5623
The 'char *ip' variable was being allocated and zeroed but not being used or freed.
2015-03-18 10:04:08 +00:00
Robert Di Paolo
6668c456ac
Correctly handle _CRT_SECURE_NO_WARNINGS already being set in project settings.
2015-03-18 09:56:01 +00:00
Robert Di Paolo
98f2476751
Added PATCH to list of valid HTTP Methods.
2015-03-18 09:48:17 +00:00
Sergey Lyubka
faeedb2930
Sync main
2015-03-18 09:37:52 +00:00
Sergey Lyubka
c8e8f94ffe
Sync main
2015-03-17 17:35:31 +00:00
Sergey Lyubka
22aeb6111b
Update ReleaseNotes
2015-03-17 17:01:16 +00:00
Sergey Lyubka
2d1d2e6534
SIZE_MAX is not defined on MSVC6, use (size_t) ~0
2015-03-17 17:00:59 +00:00
Sergey Lyubka
05c88a98fc
Introduce -dav_root option
2015-03-17 15:34:56 +00:00
Marko Mikulicic
5224afb946
Merge pull request #485 from dsrosario/fix_remove_double_dots
2015-03-17 16:07:46 +01:00
Dinis Rosário
3bd79c7cd5
Fix remove_double_dots_and_double_slashes removing all the dots leading http server to serve wrong URI
...
If the uri is something like '/js/...jquery.js', remove_double_dots_and_double_slashes will remove the 3 dots and the http server will serves the /js/jquery.js file.
remove_double_dots_and_double_slashes should check if a dot or double dots is followed by a slash (or backslash) and only remove this to avoid disclosure attack.
2015-03-17 16:04:59 +01:00
Sergey Lyubka
c52e0744cb
Squashed warnings after size_t change
2015-03-17 13:18:15 +00:00
Sergey Lyubka
6c09c303d0
Merge pull request #456 from sebgod/fix-win32-examples-using-extra
...
Enable building of example/Makefile on Win32
2015-03-17 11:45:36 +00:00
Sergey Lyubka
b6fde06990
Merge pull request #486 from mmicko/master
...
Compile fix
2015-03-16 16:52:48 +00:00
Miodrag Milanovic
af892c9726
compile fix for visual studio
2015-03-14 09:02:25 +01:00
Miodrag Milanovic
df7ad13680
Compile fix
2015-03-13 20:15:19 +01:00
Sergey Lyubka
057c2d4b42
Merge pull request #484 from davidmilligan/master
...
fix compiler warnings for 64 bit compilation
2015-03-10 18:40:16 +00:00
David Milligan
6c9b43bcf5
fix compiler warnings for 64 bit compilation
2015-03-09 20:01:09 -04:00
Sergey Lyubka
a91438acae
Fix #477
2015-03-09 16:09:05 +00:00
Sergey Lyubka
a6fa51dbc2
Merge pull request #481 from cesanta/web_server_ssl
...
web_server_ssl
2015-03-06 14:39:50 +00:00
Alexander Alashkin
6ceac6c84c
web_server_ssl
2015-03-06 15:08:57 +02:00
Sergey Lyubka
288efe3c23
Add -DMONGOOSE_ENABLE_THREADS to other examples
2015-03-06 09:29:56 +00:00
Sergey Lyubka
5207545a8b
Add -DMONGOOSE_ENABLE_THREADS to proxy server example
2015-03-06 09:28:27 +00:00
Sergey Lyubka
716d524f9b
Add -DMONGOOSE_ENABLE_THREADS to Makefile
2015-03-06 09:25:30 +00:00
Sergey Lyubka
a434bab767
Merge pull request #480 from cesanta/polarssl_examples_1
...
websocket_ssl_proxy sample for polarsll
2015-03-06 09:03:38 +00:00
Alexander Alashkin
e9633a8d2d
websocket_ssl_proxy
2015-03-06 09:32:08 +02:00
Sergey Lyubka
c7b6a6f0ea
Added mg_websocket_printf()
2015-03-05 10:54:51 +00:00
Sergey Lyubka
6cdb9f7ed3
Merge pull request #474 from mmicko/master
...
OS/2 patches by KO Myung-Hun
2015-03-04 17:18:16 +00:00
Sergey Lyubka
4502dd0c86
s/MONGOOSE_NO_THREADS/MONGOOSE_ENABLE_THREADS
2015-03-03 18:59:23 +00:00
Sergey Lyubka
95055f6048
Add winsock2.h include for win32
2015-03-03 18:32:14 +00:00
Sergey Lyubka
2c36532ec4
Merge pull request #465 from doug16rogers/vs9-compile-ipv6
...
Allow for compilation in Visual Studio with NS_ENABLE_IPV6.
2015-03-03 18:28:07 +00:00
Sergey Lyubka
f2b0b9c737
Fix Win32 build in mg_websocket_write()
2015-02-24 13:32:22 +00:00
Sergey Lyubka
b3866439a0
Fix mg_create_server() signature
2015-02-24 13:17:11 +00:00
Miodrag Milanovic
4f2205a667
OS/2 patches by KO Myung-Hun
...
Upstream patch from MAME project
2015-02-24 11:12:09 +01:00
Sergey Lyubka
6cec1d36a8
Merge pull request #463 from CurlyMoo/patch-1
...
Replace obsolete gethostbyname by getaddrinfo
2015-02-19 11:48:35 +00:00
CurlyMoo
4238370ae1
Check for getaddrinfo availability.
2015-02-19 12:09:34 +01:00
Sergey Lyubka
b4924b715e
Merge pull request #473 from mmicko/master
...
Fix for MINGW builds
2015-02-17 16:19:37 +00:00
Miodrag Milanovic
7a0385dcac
Fix for MINGW builds
2015-02-17 11:08:23 +01:00
Sergey Lyubka
44a146faf6
SSL fixes
2015-02-16 18:34:07 +00:00
Sergey Lyubka
53a55da7bc
Add type cast in ns_out()
2015-02-16 18:19:15 +00:00
Sergey Lyubka
bf44277764
Define _XOPEN_SOURCE for MinGW build
2015-02-16 18:17:30 +00:00
Sergey Lyubka
a2e1da6e30
Add overflow checks
2015-02-12 19:12:58 +00:00
Sergey Lyubka
bef3f85ba8
Merge pull request #466 from 0-wiz-0/master
...
Only define _XOPEN_SOURCE on Linux.
2015-02-10 18:07:07 +00:00
Thomas Klausner
eb72a63cca
Only define _XOPEN_SOURCE on Linux.
...
Fixes the build on NetBSD.
The comment says it's only needed on Linux, and AFAIK Linux
is the only operating system that only adds symbols when it's defined;
others, like NetBSD or Solaris, also hide symbols.
Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
2015-01-29 15:02:26 +01:00
Doug Rogers
f19bbc73cc
Allow for compilation in Visual Studio 9 (2008) with NS_ENABLE_IPV6.
2015-01-29 00:12:35 -05:00
Sergey Lyubka
25326b3b12
net skeleton -> fossa
2015-01-28 12:33:48 +00:00
CurlyMoo
10ee430bfd
Add debug line and adapt to styling guide
...
Replaced tabs with spaces.
2015-01-27 22:55:13 +01:00
CurlyMoo
10d0bfdab4
Replace obsolete gethostbyname by getaddrinfo
...
This also protect against the latest glibc bug
2015-01-27 22:45:34 +01:00
Sergey Lyubka
6b6637c337
Adopt SSL guide to current way of setting SSL cert.
2015-01-21 17:41:45 +00:00
Sergey Lyubka
878acca213
Removed Lua docs
2015-01-21 17:30:30 +00:00
Sergey Lyubka
ace9285966
Updated years
5.5_20140120
2015-01-19 18:25:14 +00:00
Sergey Lyubka
cdc167b0cc
Merge pull request #459 from joshcriz/patch-1
...
Update Makefile
2015-01-19 16:32:24 +00:00
Josh Criz
a0dd396b95
Update Makefile
...
Fixing typo in 'clean' section
2015-01-16 17:59:08 -06:00
Sebastian Godelet
8082501b9c
Enable building of example/Makefile on Win32
...
Adding example/.gitignore to ignore *.exe
Appending -lws2_32 at the end of CFLAGS_EXTRA if running make on
Windows to enable easy compiling under that platform.
Obsoletes pull request #454
2015-01-10 16:41:58 +08:00
Sergey Lyubka
e4ad3010be
Fix #416
2014-12-30 03:56:29 +00:00
Sergey Lyubka
03a82ef848
Merge pull request #452 from CurlyMoo/patch-2
...
Typo
2014-12-27 18:25:09 +00:00
CurlyMoo
9459d69dcc
Typo
2014-12-27 18:35:09 +01:00
Sergey Lyubka
b28662362d
Merge pull request #449 from ursine/patch-1
...
64-bit length fields on ARM don't work
2014-12-21 20:54:52 +00:00
Sergey Lyubka
66450bf3d1
Merge pull request #450 from sebgod/master
...
mongoose.c: using application/javascript for .js
2014-12-21 16:07:12 +00:00
Sebastian Godelet
478ca05e7a
mongoose.c: using application/javascript for .js
...
As of http://www.rfc-editor.org/rfc/rfc4329.txt , the preferred MIME type
for JavaScript is application/javascript.
2014-12-21 22:16:05 +08:00
Gary Coulbourne
8cad0a72f9
64-bit length fields on ARM don't work
...
ARM only allows aligned accesses. GCC generated unaligned accesses for the copy buffer, but ARM forces alignment, causing the first two bytes to be trampled. I changed the mechanism to create two temporaries and memcpy them in. It now works on ARM (and x86) for large websocket chunks.
2014-12-17 19:14:30 -05:00
Sergey Lyubka
31178f4d48
Typo fixed in the comment
2014-12-15 12:03:50 +00:00
Sergey Lyubka
7a5485493e
Added md5 copyright
2014-12-11 18:01:58 +00:00
Sergey Lyubka
d3cbb160f5
Removed travis config file
2014-12-01 11:33:16 +00:00
Sergey Lyubka
45ff2c2c19
Removed $Date$ marker
2014-11-28 14:16:49 +00:00
Sergey Lyubka
c3db7b141b
Removed $Date$ from header
2014-11-28 12:21:36 +00:00
Sergey Lyubka
0a0ea36ace
Fix examples/proxy_server build
2014-11-24 19:33:24 +00:00
Sergey Lyubka
72ed954721
Merge pull request #440 from zapline/patch-1
...
Update ReleaseNotes.md(spell mistake)
2014-11-20 07:35:24 +00:00
zapline
33e035273a
Update ReleaseNotes.md
...
spell mistake
2014-11-20 09:58:29 +08:00
Sergey Lyubka
223f36c130
Updated Readme
2014-11-17 15:50:02 +00:00
Sergey Lyubka
4c0bc5bd03
Updated Readme
2014-11-17 15:49:37 +00:00
Sergey Lyubka
808a5f6f53
Update README.md
2014-11-13 13:48:43 +00:00
Sergey Lyubka
404e635665
Fixed Android build
2014-11-12 22:16:32 +00:00
Sergey Lyubka
9d7a60a63f
Merge pull request #433 from jhnwkmn/malloc
...
Consistent use of NS_MALLOC, NS_FREE and NS_REALLOC
2014-11-10 10:35:07 +00:00
Johan Wikman
ba9c74187b
Consistent use of NS_MALLOC, NS_FREE and NS_REALLOC
...
malloc(), free() and realloc() were used in a number of places.
Added NS_CALLOC as well.
2014-11-10 08:29:19 +02:00
Sergey Lyubka
e9d4847cbb
Merge pull request #432 from jhnwkmn/o_binary
...
O_BINARY might be defined.
2014-11-09 10:06:16 +00:00
Sergey Lyubka
ea76de07ee
Merge pull request #436 from jhnwkmn/no-cgi
...
MONGOOSE_NO_CGI needs special handling.
2014-11-09 10:04:54 +00:00
Sergey Lyubka
5a8c468ff7
Merge pull request #435 from jhnwkmn/size-macros
...
Added size macros.
2014-11-09 10:01:59 +00:00
Sergey Lyubka
5b143a6237
Merge pull request #434 from jhnwkmn/no-user
...
Added MONGOOSE_NO_USER configuration define.
2014-11-09 09:56:31 +00:00
Sergey Lyubka
d244a7fdfd
Merge pull request #437 from jhnwkmn/nsf-close-immediately
...
If socket is about to be closed do not add to [read|write]_set.
2014-11-09 09:55:13 +00:00
Johan Wikman
300a27de99
If socket is about to be closed do not add to [read|write]_set.
...
If NSG_CLOSE_IMMEDIATELY is on, then the socket will be closed,
which means that (if the socket was added to either read_set or
write_set) the subsequent select will in turn be performed on a
socket that has been closed.
Standard socket implementations seem to ignore a descriptor
referring to a closed socket but LWIP
(http://savannah.nongnu.org/projects/lwip/ ) crashes. So better
not to add to the sets.
2014-11-07 15:48:23 +02:00