From 75793baae83123f890442c5d32e3dd38eb18ce1c Mon Sep 17 00:00:00 2001
From: Luca Casonato <hello@lcas.dev>
Date: Tue, 9 Nov 2021 12:10:21 +0100
Subject: Revert "refactor(ext/http): rewrite hyper integration and fix bug
 (#12332)" (#12704)

This reverts commit 5b1e537446454f6332de44adbeb6a15ff072c2fa.
---
 runtime/errors.rs   | 5 -----
 runtime/ops/http.rs | 5 ++---
 2 files changed, 2 insertions(+), 8 deletions(-)

(limited to 'runtime')

diff --git a/runtime/errors.rs b/runtime/errors.rs
index 1491161d3..fe6e71193 100644
--- a/runtime/errors.rs
+++ b/runtime/errors.rs
@@ -17,7 +17,6 @@ use deno_fetch::reqwest;
 use std::env;
 use std::error::Error;
 use std::io;
-use std::sync::Arc;
 
 fn get_dlopen_error_class(error: &dlopen::Error) -> &'static str {
   use dlopen::Error::*;
@@ -164,10 +163,6 @@ pub fn get_error_class_name(e: &AnyError) -> Option<&'static str> {
         .map(get_dlopen_error_class)
     })
     .or_else(|| e.downcast_ref::<hyper::Error>().map(get_hyper_error_class))
-    .or_else(|| {
-      e.downcast_ref::<Arc<hyper::Error>>()
-        .map(|e| get_hyper_error_class(&**e))
-    })
     .or_else(|| {
       e.downcast_ref::<deno_core::Canceled>().map(|e| {
         let io_err: io::Error = e.to_owned().into();
diff --git a/runtime/ops/http.rs b/runtime/ops/http.rs
index fddac9261..683dc1a57 100644
--- a/runtime/ops/http.rs
+++ b/runtime/ops/http.rs
@@ -6,7 +6,6 @@ use deno_core::op_sync;
 use deno_core::Extension;
 use deno_core::OpState;
 use deno_core::ResourceId;
-use deno_http::http_create_conn_resource;
 use deno_net::io::TcpStreamResource;
 use deno_net::ops_tls::TlsStreamResource;
 
@@ -30,7 +29,7 @@ fn op_http_start(
     let (read_half, write_half) = resource.into_inner();
     let tcp_stream = read_half.reunite(write_half)?;
     let addr = tcp_stream.local_addr()?;
-    return http_create_conn_resource(state, tcp_stream, addr, "http");
+    return deno_http::start_http(state, tcp_stream, addr, "http");
   }
 
   if let Ok(resource_rc) = state
@@ -42,7 +41,7 @@ fn op_http_start(
     let (read_half, write_half) = resource.into_inner();
     let tls_stream = read_half.reunite(write_half);
     let addr = tls_stream.get_ref().0.local_addr()?;
-    return http_create_conn_resource(state, tls_stream, addr, "https");
+    return deno_http::start_http(state, tls_stream, addr, "https");
   }
 
   Err(bad_resource_id())
-- 
cgit v1.2.3