Re-allow http TOS/PP agreements.

@jedp, @jrgm, this is the same fix as #3485, but against dev.

fixes #3469