Merge change 23266 into eclair

* changes:
  disable canceling until the http connection code is understood