Merge pull request #87 from Gandi/master

Use the real socket if it's not HTTP