]> git.ipfire.org Git - thirdparty/apache/httpd.git/commit
Merge r1706595 from trunk:
authorJim Jagielski <jim@apache.org>
Fri, 16 Dec 2016 15:44:07 +0000 (15:44 +0000)
committerJim Jagielski <jim@apache.org>
Fri, 16 Dec 2016 15:44:07 +0000 (15:44 +0000)
commitdf3270029be642db977274e25899b09496dccf19
tree0b150de48cfebae6368f6edd49522dc4843c78f4
parenta70bca224d4c00170cbcfcd44e8bd85ffe1d00bb
Merge r1706595 from trunk:

Follow-up to r1702948:

APR_HAVE_foo is checked via #if, not #ifdef (since it should always be
defined, to either 0 or 1)

This fixes a compile error on Windows introduced by r1702948
as well as straightens up two long-time glitches.

Submitted by: trawick
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1774626 13f79535-47bb-0310-9956-ffa450edef68
STATUS
include/scoreboard.h
modules/filters/regexp.c
modules/ssl/ssl_private.h