fixing EINTR errors on r.http
Merge branch 'next' into sam_2353
Merge branch 'sam_2353' into sam_2353_ii