Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 0 additions & 14 deletions cgi.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,20 +27,6 @@ import (
"github.com/dunglas/frankenphp/internal/phpheaders"
)

// cStringHTTPMethods caches C string versions of common HTTP methods
// to avoid allocations in pinCString on every request.
var cStringHTTPMethods = map[string]*C.char{
"GET": C.CString("GET"),
"HEAD": C.CString("HEAD"),
"POST": C.CString("POST"),
"PUT": C.CString("PUT"),
"DELETE": C.CString("DELETE"),
"CONNECT": C.CString("CONNECT"),
"OPTIONS": C.CString("OPTIONS"),
"TRACE": C.CString("TRACE"),
"PATCH": C.CString("PATCH"),
}

// computeKnownVariables returns a set of CGI environment variables for the request.
//
// TODO: handle this case https://github.com/caddyserver/caddy/issues/3718
Expand Down
27 changes: 27 additions & 0 deletions cgimethods.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
package frankenphp

// const char *frankenphp_method_get = "GET";
// const char *frankenphp_method_head = "HEAD";
// const char *frankenphp_method_post = "POST";
// const char *frankenphp_method_put = "PUT";
// const char *frankenphp_method_delete = "DELETE";
// const char *frankenphp_method_connect = "CONNECT";
// const char *frankenphp_method_options = "OPTIONS";
// const char *frankenphp_method_trace = "TRACE";
// const char *frankenphp_method_patch = "PATCH";
import "C"

// cStringHTTPMethods maps common HTTP methods to static C strings, avoiding a
// pinCString call per request. C literals, unlike C.CString, aren't reported as
// leaks by LeakSanitizer, which can't see pointers held in Go memory.
var cStringHTTPMethods = map[string]*C.char{
"GET": C.frankenphp_method_get,
"HEAD": C.frankenphp_method_head,
"POST": C.frankenphp_method_post,
"PUT": C.frankenphp_method_put,
"DELETE": C.frankenphp_method_delete,
"CONNECT": C.frankenphp_method_connect,
"OPTIONS": C.frankenphp_method_options,
"TRACE": C.frankenphp_method_trace,
"PATCH": C.frankenphp_method_patch,
}
Loading