Merge r1303201, r1303435, r1303827:
* Revert r1294936 (Jeff's revert) and fix NetWare / Win32 build. Added the missing AP_DECLARE* decorations for the function implementations and variables. * Fix changes in parameter names in function definitions done in r1303201 * Partly revert r1303435 and rename pconf back to in_pconf to avoid shadowing the global variable with the same name and create a bogus assignment. Pointed out by: Eric Covener Committed by: fuankg, rpluem Reviewed by: fuankg, minfrin, trawick git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1307828 13f79535-47bb-0310-9956-ffa450edef68
parent
f00f9bf6
Please register or sign in to comment