Skip to content
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

deal with header Status of response from php-fpm #11

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

deal with header Status of response from php-fpm #11

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
60 changes: 39 additions & 21 deletions fcgiclient.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,27 +397,34 @@ func (this *FCGIClient) Request(p map[string]string, req io.Reader) (resp *http.
}
return nil, err
}
if i := strings.IndexByte(line, ' '); i == -1 {
err = &badStringError{"malformed HTTP response", line}
} else {
resp.Proto = line[:i]
resp.Status = strings.TrimLeft(line[i+1:], " ")
}
statusCode := resp.Status
if i := strings.IndexByte(resp.Status, ' '); i != -1 {
statusCode = resp.Status[:i]
}
if len(statusCode) != 3 {
err = &badStringError{"malformed HTTP status code", statusCode}
}
resp.StatusCode, err = strconv.Atoi(statusCode)
if err != nil || resp.StatusCode < 0 {
err = &badStringError{"malformed HTTP status code", statusCode}
}
var ok bool
if resp.ProtoMajor, resp.ProtoMinor, ok = http.ParseHTTPVersion(resp.Proto); !ok {
err = &badStringError{"malformed HTTP version", resp.Proto}
}

gotStatus := false

if strings.IndexByte(line, ':') == -1 {
gotStatus = true
if i := strings.IndexByte(line, ' '); i == -1 {
err = &badStringError{"malformed HTTP response", line}
} else {
resp.Proto = line[:i]
resp.Status = strings.TrimLeft(line[i+1:], " ")
}
statusCode := resp.Status
if i := strings.IndexByte(resp.Status, ' '); i != -1 {
statusCode = resp.Status[:i]
}
if len(statusCode) != 3 {
err = &badStringError{"malformed HTTP status code", statusCode}
}
resp.StatusCode, err = strconv.Atoi(statusCode)
if err != nil || resp.StatusCode < 0 {
err = &badStringError{"malformed HTTP status code", statusCode}
}
var ok bool
if resp.ProtoMajor, resp.ProtoMinor, ok = http.ParseHTTPVersion(resp.Proto); !ok {
err = &badStringError{"malformed HTTP version", resp.Proto}
}
}

// Parse the response headers.
mimeHeader, err := tp.ReadMIMEHeader()
if err != nil {
Expand All @@ -426,6 +433,17 @@ func (this *FCGIClient) Request(p map[string]string, req io.Reader) (resp *http.
}
return nil, err
}

if !gotStatus {
if i := strings.IndexByte(line, ':'); i!=-1 {
mimeHeader.Add(string(line[:i]), strings.TrimSpace(string(line[i+1:])))
}
if status := mimeHeader.Get("Status"); status!="" {
resp.StatusCode,_ = strconv.Atoi(status[:3])
resp.Status = status
}
}

resp.Header = http.Header(mimeHeader)
// TODO: fixTransferEncoding ?
resp.TransferEncoding = resp.Header["Transfer-Encoding"]
Expand Down