Merge branch 'apache_2_2'

This commit is contained in:
Matthias Pigulla 2015-08-15 16:11:41 +02:00
commit 1c88793b88

View File

@ -123,7 +123,6 @@ static const char* get_filtered_ip(char* pszAddress, char* pszFilterMask, apr_po
} else { } else {
/* ok */ /* ok */
pIPSubNet->sub[0] &= 0x00FFFFFF; /* Zwangs-Filter: letztes Oktett maskieren */
pszFilteredIP = apr_pcalloc(pPool, sizeof("255.255.255.0")); pszFilteredIP = apr_pcalloc(pPool, sizeof("255.255.255.0"));
ipmask_inet_ntop4((char*)pIPSubNet->sub, pszFilteredIP); ipmask_inet_ntop4((char*)pIPSubNet->sub, pszFilteredIP);
} }