Whenever I fly, I always take an empty water bottle through security and then fill it in the secure zone.