fix bad merge

Author: persiaAziz-zz

proxy/http/HttpTransact.cc

@@ -3571,7 +3571,11 @@ HttpTransact::handle_response_from_parent(State *s)
       ink_assert(s->hdr_info.server_request.valid());
 
       s->current.server->connect_result = ENOTCONN;
-      s->state_machine->do_hostdb_update_if_necessary();
+      // only mark the parent down in hostdb if the configuration allows it,
+      // see proxy.config.http.parent_proxy.mark_down_hostdb in records.config.
+      if (s->txn_conf->parent_failures_update_hostdb) {
+        s->state_machine->do_hostdb_update_if_necessary();
+      }
 
       char addrbuf[INET6_ADDRSTRLEN];
       DebugTxn("http_trans", "[%d] failed to connect to parent %s", s->current.attempts,
@@ -8291,6 +8295,7 @@ HttpTransact::build_redirect_response(State *s)
   //////////////////////////
   s->free_internal_msg_buffer();
   s->internal_msg_buffer_fast_allocator_size = -1;
+  // template redirect#temporarily can not be used here since there is no way to pass the computed url to the template.
   s->internal_msg_buffer = body_factory->getFormat(8192, &s->internal_msg_buffer_size, "%s <a href=\"%s\">%s</a>.  %s.",
                                                    "The document you requested is now", new_url, new_url,
                                                    "Please update your documents and bookmarks accordingly", NULL);