github/gPanel
2
0
Fork 0
mirror of https://github.com/donl/gPanel.git synced 2026-06-30 06:12:06 -06:00
Code Issues Projects Packages Wiki Activity Actions

Merge pull request #117 from george-e-shaw-iv/master

Browse source 
php-cgi instead of php
This commit is contained in:
George Shaw 2017-12-15 15:38:22 -06:00 • committed by GitHub
commit b96eab3b8a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 35 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

39
pkg/public/servehttp.go
View file

@ -7,11 +7,18 @@ import (
"strconv"
"time"
"github.com/Ennovar/gPanel/pkg/routing"
"strings"
"bufio"
"net/textproto"
"os/exec"
"strings"
"regexp"
"github.com/Ennovar/gPanel/pkg/routing"
)
var reg = regexp.MustCompile("[0-9]+")
// ServeHTTP function routes all requests for the public web server. It is used in the main
// function inside of the http.ListenAndServe() function for the public host.
func (con *Controller) ServeHTTP(res http.ResponseWriter, req *http.Request) {
@ -51,18 +58,42 @@ func (con *Controller) ServeHTTP(res http.ResponseWriter, req *http.Request) {
var out []byte
if strings.HasSuffix(path, ".php") {
if out, err = exec.Command("php", path).Output(); err != nil {
if out, err = exec.Command("php-cgi", path).Output(); err != nil {
con.PublicLogger.Println(path + "::" + strconv.Itoa(http.StatusInternalServerError) + "::" + err.Error())
routing.HttpThrowStatus(http.StatusInternalServerError, res)
return
}
cgiRes := string(out)
pos := strings.Index(cgiRes, "; charset=UTF-8") + len("; charset=UTF-8")
out = []byte(strings.Trim(cgiRes[pos:], "\n"))
headers := strings.Replace(cgiRes[0:pos], "\n", "\r\n", -1)
reader := bufio.NewReader(strings.NewReader(headers + "\r\n\r\n"))
tp := textproto.NewReader(reader)
mimeHeader, err := tp.ReadMIMEHeader()
if err != nil {
con.PublicLogger.Println(path + "::" + strconv.Itoa(http.StatusInternalServerError) + "::" + err.Error())
routing.HttpThrowStatus(http.StatusInternalServerError, res)
return
}
httpHeader := http.Header(mimeHeader)
for k, v := range httpHeader {
if k == "Status" {
if code, err := strconv.Atoi(string(reg.Find([]byte(v[0])))); err == nil {
res.WriteHeader(code)
}
continue
}
res.Header().Add(k, v[0])
}
} else {
con.PublicLogger.Println(path + "::" + strconv.Itoa(http.StatusUnsupportedMediaType) + "::" + err.Error())
routing.HttpThrowStatus(http.StatusUnsupportedMediaType, res)
return
}
res.Header().Add("Content-Type", "text/html")
res.Write(out)
} else {
f, err := os.Open(path)