]> git.ipfire.org Git - thirdparty/apache/httpd.git/commit
Merge r1493330, r1504276, r1552227, r1551714, r1490994, r1172732 from trunk:
authorRuediger Pluem <rpluem@apache.org>
Wed, 12 Mar 2014 12:28:03 +0000 (12:28 +0000)
committerRuediger Pluem <rpluem@apache.org>
Wed, 12 Mar 2014 12:28:03 +0000 (12:28 +0000)
commitf3b070a18bef2c52341db119e02cbc2a174eb25f
tree9d428ccef08b47bd3e6aa2b38432d0833323cc08
parenta891aa59a77e10fd8b7fb67b2c36da9697fc699c
Merge r1493330, r1504276, r1552227, r1551714, r1490994, r1172732 from trunk:

Correct typo in error message

Unlikely potential memory leak.
Point 12 of PR 54936

Remove <Proxy ~ wildcard-url> syntax which:
   - is equivalent to <ProxyMatch wildcard-url>
   - has never been documented
   - incorrectly checks parameters (!cmd->path should be !cmd->path[0])
   - is buggy (! is missing in front of strncasecmp)

Avoid sending back uninitialized memory, use 'ftpmessage' in order to have something meaningful instead.

Save 8k of stack by the same time.

NULL terminate the right buffer

Fix issues found by PVS-Studio static analyzer:

mod_mime_magic:
cut'n'paste error rsl_encoding vs. rsl_separator, also simplify code a bit

mod_header:
wrong string initialization (leading to segfault if format argument is missing)

util_win32: duplicate sizeof (untested; Windows people, please review)

PR: 51542
Submitted by: Andrey Karpov <karpov viva64 com>, Stefan Fritsch

Reviewed by: jailletc36, rpluem, wrowe

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1576709 13f79535-47bb-0310-9956-ffa450edef68
CHANGES
STATUS
modules/aaa/mod_authnz_ldap.c
modules/ldap/util_ldap_cache.c
modules/metadata/mod_headers.c
modules/proxy/mod_proxy.c
modules/proxy/mod_proxy_ftp.c
modules/proxy/proxy_util.c
os/win32/util_win32.c