Merge r3982: rename socket since it collides with a osx header definition and therefore fails Werror



git-svn-id: http://www.varnish-cache.org/svn/branches/2.0@4000 d4fa192b-c00b-0410-8231-f00ffab90ce4