diff options
Diffstat (limited to 'sapi/cgi/cgi_main.c')
| -rw-r--r-- | sapi/cgi/cgi_main.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c index 3bd1d2d0d4..10f92d9fd3 100644 --- a/sapi/cgi/cgi_main.c +++ b/sapi/cgi/cgi_main.c @@ -913,9 +913,12 @@ static int sapi_cgi_activate(void) if (fcgi_is_fastcgi()) { fcgi_request *request = (fcgi_request*) SG(server_context); - doc_root = FCGI_GETENV(request, "DOCUMENT_ROOT"); + /* Prefer CONTEXT_DOCUMENT_ROOT if set */ + doc_root = FCGI_GETENV(request, "CONTEXT_DOCUMENT_ROOT"); + doc_root = doc_root ? doc_root : FCGI_GETENV(request, "DOCUMENT_ROOT"); } else { - doc_root = getenv("DOCUMENT_ROOT"); + doc_root = getenv("CONTEXT_DOCUMENT_ROOT"); + doc_root = doc_root ? doc_root : getenv("DOCUMENT_ROOT"); } /* DOCUMENT_ROOT should also be defined at this stage..but better check it anyway */ if (doc_root) { |