]> granicus.if.org Git - apache/commit
Merge r1557317, r1556911, r1556914, r1555259, r1556912, r1556937, r1559351, r1463046...
authorJim Jagielski <jim@apache.org>
Tue, 28 Jan 2014 18:11:59 +0000 (18:11 +0000)
committerJim Jagielski <jim@apache.org>
Tue, 28 Jan 2014 18:11:59 +0000 (18:11 +0000)
commitbf09134f801ea740a2e4eea8f1c300c25d5f369a
tree50e3c36368067effccbe448f56f14da794afa1f6
parentbf918f3770b2a32adbfdb8085b0b52e7f1616992
Merge r1557317, r1556911, r1556914, r1555259, r1556912, r1556937, r1559351, r1463046 from trunk:

Style, indentation. No functional change.

As in 'dav_generic_do_refresh', add missing break in 'dav_fs_do_refresh' to avoid useless computation.

Add missing break in 'dav_generic_do_refresh' to avoid useless computation.

Allocate correct size for the array to avoid useless memory allocation and copy

Add missing break.

Oops (fix r1556912)

No need to test for NULL, apr_pstrndup already handles it.

Remove some useless declarations that were shadowing other local
variables of the same name.

Submitted by: jailletc36, sf
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1562134 13f79535-47bb-0310-9956-ffa450edef68
STATUS
modules/aaa/mod_authz_core.c
modules/core/mod_macro.c
modules/dav/fs/lock.c
modules/dav/lock/locks.c
modules/dav/main/std_liveprop.c
modules/proxy/mod_proxy.c
server/mpm/event/fdqueue.c
server/util_regex.c