Version bump.


git-svn-id: svn://svn.nginx.org/nginx/branches/stable-1.2@4847 73f98a42-aea0-e011-b76d-00259023448c
Merge of r4777, r4780, r4831, r4832: release process changes.

*) Simplified makefile that builds CHANGES.

*) Removed the need in Perl to generate ZIP archive of nginx/Windows.

*) Converted DOS-style newlines in dump.xslt.

*) Pass changes.xml thru xmllint when generating CHANGES and CHANGES.ru.


git-svn-id: svn://svn.nginx.org/nginx/branches/stable-1.2@4848 73f98a42-aea0-e011-b76d-00259023448c
Merge of r4778, r4782, r4783, r4824, r4830, r4834: minor fixes.
 
*) Reorder checks in ngx_shared_memory_add() for more consistent
   error messages.

*) Added "const" to ngx_memcpy() with NGX_MEMCPY_LIMIT defined.  This   
   fixes warning produced during compilation of the ngx_http_geoip_module
   due to const qualifier being discarded.

*) Fixed possible use of old cached times if runtime went backwards.

   If ngx_time_sigsafe_update() updated only ngx_cached_err_log_time, and
   then clock was adjusted backwards, the cached_time[slot].sec might
   accidentally match current seconds on next ngx_time_update() call,
   resulting in various cached times not being updated.

   Fix is to clear the cached_time[slot].sec to explicitly mark cached times
   are stale and need updating.

*) Radix tree preallocation fix.  The preallocation size was calculated
   incorrectly and was always 8 due to sizeof(ngx_radix_tree_t) accidentally
   used instead of sizeof(ngx_radix_node_t).

*) Fixed overflow if ngx_slab_alloc() is called with very big "size"
   argument.

*) Write filter: replaced unneeded loop with one to free chains.
   Noted by Gabor Lekeny.


git-svn-id: svn://svn.nginx.org/nginx/branches/stable-1.2@4849 73f98a42-aea0-e011-b76d-00259023448c
Merge of r4779, r4840, r4843, r4844: win32 changes.

*) Fixed build with Visual Studio 2005 Express.

   It is available via winetricks which makes it still usable, and has
   an old crtdefs.h which uses _CRT_SECURE_NO_DEPRECATE instead of
   _CRT_SECURE_NO_WARNINGS to suppress warnings.

   Reported by HAYASHI Kentaro,
   http://mailman.nginx.org/pipermail/nginx-devel/2012-August/002542.html

*) Configure: provide inflate() when building zlib on win32.

*) Helper target "win32" to run configure for win32 builds.

*) Updated zlib used for win32 builds.


git-svn-id: svn://svn.nginx.org/nginx/branches/stable-1.2@4850 73f98a42-aea0-e011-b76d-00259023448c
Merge of r4842: fixed make macros to use parentheses.

Configure: fixed make macros to use parentheses instead of braces.
Parentheses are more portable, in particular they are understood by
nmake while braces aren't.


git-svn-id: svn://svn.nginx.org/nginx/branches/stable-1.2@4851 73f98a42-aea0-e011-b76d-00259023448c
Merge of r4784: fixed the -p parameter handling.

Ensure that the path supplied always ends with a `/' except when empty.
An empty value now corresponds to the current directory instead of `/'.


git-svn-id: svn://svn.nginx.org/nginx/branches/stable-1.2@4852 73f98a42-aea0-e011-b76d-00259023448c
Merge of r4785, r4795, r4811, r4812, r4816, r4822: coverity.

*) Resolver: fixed possible memory leak in ngx_resolver_create().

*) Explicitly ignore returned value from unlink() in ngx_open_tempfile().

*) Explicitly ignore returned value from close() in ngx_event_core_init_conf().

*) Added three missing checks for NULL after ngx_array_push() calls.

*) Crypt: fixed handling of corrupted SSHA entries in password file.

*) Mark logically dead code with corresponding comment.

Found by / prodded by Coverity.


git-svn-id: svn://svn.nginx.org/nginx/branches/stable-1.2@4853 73f98a42-aea0-e011-b76d-00259023448c
Merge of r4813, r4814, r4818, r4819, r4820, r4823: mail fixes.

*) Corrected the directive name in the ngx_mail_auth_http_module
   error message.

*) Don't let the well-known port in the "listen" directive to
   override the already set "protocol".

*) Fixed sorting of listen addresses (ticket #187).  For http module
   this problem was already fixed in r4756.

*) Removed a stale "AF_INET only" comment.  IPv6 client connections
   in mail modules have been supported since r2856.

*) Fixed handling of AF_UNIX addresses in "listen".  This makes AF_UNIX
   addresses in mail officially supported.

*) Whitespace fix.


git-svn-id: svn://svn.nginx.org/nginx/branches/stable-1.2@4854 73f98a42-aea0-e011-b76d-00259023448c
Merge of r4815: map: fixed optimization of variables as values.

Previous code incorrectly used ctx->var_values as an array of pointers to
ngx_http_variable_value_t, but the array contains structures, not pointers.
Additionally, ctx->var_values inspection failed to properly set var on
match.


git-svn-id: svn://svn.nginx.org/nginx/branches/stable-1.2@4855 73f98a42-aea0-e011-b76d-00259023448c
Merge of r4817: geo: fixed handling of ranges without default set.

The bug had appeared in 0.8.43 (r3653).  Patch by Weibin Yao.


git-svn-id: svn://svn.nginx.org/nginx/branches/stable-1.2@4856 73f98a42-aea0-e011-b76d-00259023448c
Merge of r4828: "include" with wildcards in map and types blocks.

The "include" directive should be able to include multiple files if
given a filename mask.  Fixed this to work for "include" directives
inside the "map" or "types" blocks.  The "include" directive inside
the "geo" block is still not fixed.


git-svn-id: svn://svn.nginx.org/nginx/branches/stable-1.2@4857 73f98a42-aea0-e011-b76d-00259023448c
Merge of r4829: fixed strict aliasing with ipv6 (ticket #201).

Fixed strict aliasing bugs when dealing with IPv4-mapped IPv6
addresses.


git-svn-id: svn://svn.nginx.org/nginx/branches/stable-1.2@4858 73f98a42-aea0-e011-b76d-00259023448c
Merge of r4833: limit req: fix of rbtree node insertion.

Limit req: fix of rbtree node insertion on hash collisions.

The rbtree used in ngx_http_limit_req_module has two level of keys, the top is
hash, and the next is the value string itself. However, when inserting a new
node, only hash has been set, while the value string has been left empty.

The bug was introduced in r4419 (1.1.14).
Found by Charles Chen.


git-svn-id: svn://svn.nginx.org/nginx/branches/stable-1.2@4859 73f98a42-aea0-e011-b76d-00259023448c
Merge of r4835, r4841: improved welcome and 50x error pages.


git-svn-id: svn://svn.nginx.org/nginx/branches/stable-1.2@4860 73f98a42-aea0-e011-b76d-00259023448c
Stable: removed gunzip module from win32 helper target.

Gunzip filter isn't merged into stable branch.


git-svn-id: svn://svn.nginx.org/nginx/branches/stable-1.2@4861 73f98a42-aea0-e011-b76d-00259023448c
nginx-1.2.4-RELEASE


git-svn-id: svn://svn.nginx.org/nginx/branches/stable-1.2@4862 73f98a42-aea0-e011-b76d-00259023448c