always use max-age header if exist, following 1.1 spec

correct formatting
merged