]> git.ipfire.org Git - thirdparty/apache/httpd.git/commit
Merge r1602978, r1683044, r1683884, r1673368, r1701717, r1683047 from trunk:
authorJim Jagielski <jim@apache.org>
Wed, 16 Sep 2015 13:34:11 +0000 (13:34 +0000)
committerJim Jagielski <jim@apache.org>
Wed, 16 Sep 2015 13:34:11 +0000 (13:34 +0000)
commit3f38fb87652a34e9bd9fef09883cbd9e2f1e2cc4
tree1e2d72e30e437ddac7fa841c5ac97b8fe39a138f
parent666ec5901df70e69f9fd2e410cb419cb0f5270cc
Merge r1602978, r1683044, r1683884, r1673368, r1701717, r1683047 from trunk:

Core filters do not need mod_proxy.h

Small speed optimization when parsing <Limit>, <LimitExcept> and environment variables

Save a few bytes in conf pool

Remove some spaces between some return statements  and ';' + fix a strange formating in a 'for' loop

In order to save a few cycles, delay a hash table lookup which is not necessary needed

Constify + save a few bytes in conf pool
Submitted by: ylavic, jailletc36, jailletc36, jailletc36, jailletc36, jailletc36
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1703405 13f79535-47bb-0310-9956-ffa450edef68
STATUS
modules/dav/main/mod_dav.c
modules/dav/main/util.c
modules/filters/mod_deflate.c
modules/proxy/mod_proxy_http.c
server/core.c
server/core_filters.c