Merge branch 'master' of github.com:ossec/ossec-hids
Merge branch 'master' of github.com:ossec/ossec-hids
[os_xml] fix 209; restoring old behavior: handle '$' as variable begin only, when a xml variable was previously defined in the same file
[os_regex] set \W as the inverse of \w
Merge pull request #220 from cgzones/fix_209

restoring old behavior: handle '$' as variable begin only, when a xml variable was previously defined in the same file
Merge pull request #221 from cgzones/fix_nonword

[os_regex] set \W as the inverse of \w
Fixes to make.sh for Windows

Made make.sh output a little easier on the eyes and handle certain
errors a bit more gracefully.
Fix Windows Installed Date

Fixes #225. The installed date was only ever gathered at compile time
and not each and every time the ossec-installer was run on each system.
This would result in the installed date being the same on all systems
and equal to the time when the installer was compiled.

This makes me wonder if installed date was actually supposed to be
something like 'compiled date'. I'm going to go with it being a bug
though just because of the naming of everything.

This bug has likely existed for quite some time but was only recently
discovered becuase I moved the installed date into the win32ui making it
more visible to end users.

The current time should now be gathered on every run of the installer
and updating VERSION.txt with the information. Also, the issue of the
seconds being cut off should hopefully no longer be an issue as well
since the new method of getting the time shortens the string due to the
difference in the way the time is formatted.
Merge pull request #226 from awiddersheim/fix_win_build

Fixes to make.sh for Windows
Fix Windows Installed Date

Must do create a user defined variable which can only be done using the
'/global' option currently instead of doing a constant so that a
StrCpy() can be done against the data returned from GetTime().

Previously, the data in the shared variables ($0, $1, etc) had the
potential to change which would also change what was getting stored in
CURRENTTIME. Doing the StrCpy() fixes this issue.
Make 'var' in ossec-installer.nsi lowercase
Merge pull request #227 from awiddersheim/fix_win_install_time

Fix Windows Installed Date
Updated help.txt for Windows

Updated help.txt for Windows which had some old content as reported by
mstarks in #225.

Removed stale link to documentation.

Removed the commercial support
section since it doesn't appear that TrendMicro has any interest in it
anymore.

Removed dcid's blog. Doesn't look like his new blog has any new
content and for any intereseted parties there is a link on the OSSEC
website.

Removed version number from body of the file since it is already
displayed at the top of the file correctly.
Merge pull request #229 from awiddersheim/fix_windows_help

Updated help.txt for Windows
fix crash in is_simple_http_request

Under some conditions is_simple_http_request access lf->url unchecked. If lf->url is null, it will segfault.
Merge branch 'master' of github.com:ossec/ossec-hids
Merge pull request #232 from navtej/master

fix crash in is_simple_http_request

Under some conditions is_simple_http_request access lf->url unchecked. If lf->url is null, it will segfault.
fix crash in is_simple_http_request

Under some conditions is_simple_http_request access lf->url unchecked. If lf->url is null, it will segfault.
Ensure free(*dst) doesn't dereference a null pointer.
Merge pull request #233 from reyjrar/fix/accumulator-null-check

Fix/accumulator null check