SECURITY: CAN-2004-0811 (cve.mitre.org)

Fix merging of the Satisfy directive, which was applied to
the surrounding context and could allow access despite configured
authentication.
PR: 31315
Submitted by:	Rici Lake <rici ricilake.net>
Reviewed by:	jorton, nd, pquerna, geoff


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@105227 13f79535-47bb-0310-9956-ffa450edef68