Revise altport support to avoid mixed content