Skip to content

Fix error when using upstream for HTTP request #191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ImpostorKeanu wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix error when using upstream for HTTP request #191

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions forwardproxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,9 +245,9 @@ func (h *Handler) Provision(ctx caddy.Context) error {

func (h *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request, next caddyhttp.Handler) error {
// start by splitting the request host and port
reqHost, _, err := net.SplitHostPort(r.Host)
if err != nil {
reqHost = r.Host // OK; probably just didn't have a port
reqHost := r.Host
if h, _, err := net.SplitHostPort(r.Host); err == nil {
reqHost = h
}

var authErr error
Expand Down Expand Up @@ -360,7 +360,10 @@ func (h *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request, next caddyht
r.Header.Add("Via", strconv.Itoa(r.ProtoMajor)+"."+strconv.Itoa(r.ProtoMinor)+" caddy")
}

var response *http.Response
var (
response *http.Response
err error
)
if h.upstream == nil {
// non-upstream request uses httpTransport to reuse connections
if r.Body != nil &&
Expand Down