fixup! Net: add a simple HTTP client implementation.

Author: bavshin-f5

src/net/peer_conn.rs

@@ -8,8 +8,9 @@ use std::io;
 
 use nginx_sys::{
     ngx_addr_t, ngx_connection_t, ngx_destroy_pool, ngx_event_connect_peer, ngx_event_get_peer,
-    ngx_inet_set_port, ngx_int_t, ngx_log_t, ngx_peer_connection_t, ngx_pool_t, ngx_ssl_shutdown,
-    ngx_ssl_t, ngx_str_t, ngx_url_t, NGX_DEFAULT_POOL_SIZE, NGX_LOG_ERR, NGX_LOG_WARN,
+    ngx_inet_set_port, ngx_int_t, ngx_log_t, ngx_msec_t, ngx_peer_connection_t, ngx_pool_t,
+    ngx_ssl_shutdown, ngx_ssl_t, ngx_str_t, ngx_url_t, NGX_DEFAULT_POOL_SIZE, NGX_LOG_ERR,
+    NGX_LOG_WARN,
 };
 use ngx::collections::Vec;
 use ngx::core::Status;
@@ -20,6 +21,8 @@ use super::connection::{Connection, ConnectionLogError};
 use super::resolver::Resolver;
 use crate::util::OwnedPool;
 
+const ACME_DEFAULT_READ_TIMEOUT: ngx_msec_t = 60000;
+
 /// Async wrapper over an [ngx_peer_connection_t].
 pub struct PeerConnection {
     pub pool: OwnedPool,
@@ -56,7 +59,7 @@ impl hyper::rt::Read for PeerConnection {
         }
 
         if rev.active() != 0 {
-            unsafe { nginx_sys::ngx_add_timer(rev, 60000) };
+            unsafe { nginx_sys::ngx_add_timer(rev, ACME_DEFAULT_READ_TIMEOUT) };
         } else if rev.timer_set() != 0 {
             unsafe { nginx_sys::ngx_del_timer(rev) };
         }
@@ -116,6 +119,7 @@ impl PeerConnection {
         let mut pool = OwnedPool::new(NGX_DEFAULT_POOL_SIZE as _, log)
             .map_err(|_| io::ErrorKind::OutOfMemory)?;
 
+        // We need a copy of the log object to avoid modifying log.connection on a cycle log.
         let new_log = ngx::allocator::allocate(unsafe { log.read() }, &*pool)
             .map_err(|_| io::ErrorKind::OutOfMemory)?;
         (*pool).as_mut().log = new_log.as_ptr();
@@ -287,7 +291,8 @@ impl PeerConnection {
                 c.read().handler = Some(ngx_peer_conn_read_handler);
                 c.write().handler = Some(ngx_peer_conn_write_handler);
 
-                c.read().set_timer_set(60000);
+                unsafe { nginx_sys::ngx_add_timer(c.read(), ACME_DEFAULT_READ_TIMEOUT) };
+
                 self.rev = Some(cx.waker().clone());
                 self.wev = Some(cx.waker().clone());
 
@@ -459,6 +464,8 @@ unsafe extern "C" fn ngx_peer_conn_write_handler(ev: *mut nginx_sys::ngx_event_t
 
     if let Some(waker) = (*this).wev.take() {
         waker.wake();
+
+    // Handle write events posted from the ngx_event_openssl code.
     } else if Status(nginx_sys::ngx_handle_write_event(ev, 0)) != Status::NGX_OK {
         ngx_log_error!(
             NGX_LOG_WARN,